diff options
| author | Mike Rennie | 2013-07-31 16:44:16 +0000 |
|---|---|---|
| committer | Mike Rennie | 2013-07-31 16:44:16 +0000 |
| commit | d975f27f12707ae6598994c5e3c6bd5e271d46c4 (patch) | |
| tree | c7d1b2b1a202e19c0c2ccaaff959f4dd25286f0d /org.eclipse.debug.ui/ui/org/eclipse | |
| parent | 4fcde1ffaf34791bd406d47ce72d17e2801432a3 (diff) | |
| download | eclipse.platform.debug-d975f27f12707ae6598994c5e3c6bd5e271d46c4.tar.gz eclipse.platform.debug-d975f27f12707ae6598994c5e3c6bd5e271d46c4.tar.xz eclipse.platform.debug-d975f27f12707ae6598994c5e3c6bd5e271d46c4.zip | |
Bug 352626 - Move platform debug to Java 1.6 BREE
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse')
636 files changed, 13561 insertions, 9866 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugCheckboxSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugCheckboxSelectionDialog.java index 38f483cee..c79039ec2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugCheckboxSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugCheckboxSelectionDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -61,8 +61,9 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#initializeControls() */ + @Override protected void initializeControls() { - List selectedElements = getInitialElementSelections(); + List<?> selectedElements = getInitialElementSelections(); if (selectedElements != null && !selectedElements.isEmpty()){ getCheckBoxTableViewer().setCheckedElements(selectedElements.toArray()); getCheckBoxTableViewer().setSelection(StructuredSelection.EMPTY); @@ -73,6 +74,7 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#createViewer(org.eclipse.swt.widgets.Composite) */ + @Override protected StructuredViewer createViewer(Composite parent){ //by default return a checkbox table viewer Table table = new Table(parent, SWT.BORDER | SWT.SINGLE | SWT.CHECK); @@ -86,6 +88,7 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#addViewerListeners(org.eclipse.jface.viewers.StructuredViewer) */ + @Override protected void addViewerListeners(StructuredViewer viewer) { getCheckBoxTableViewer().addCheckStateListener(new DefaultCheckboxListener()); } @@ -96,6 +99,7 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug * */ private class DefaultCheckboxListener implements ICheckStateListener{ + @Override public void checkStateChanged(CheckStateChangedEvent event) { getButton(IDialogConstants.OK_ID).setEnabled(isValid()); } @@ -104,6 +108,7 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.AbstractDebugSelectionDialog#isValid() */ + @Override protected boolean isValid() { return getCheckBoxTableViewer().getCheckedElements().length > 0; } @@ -111,6 +116,7 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { Object[] elements = getCheckBoxTableViewer().getCheckedElements(); setResult(Arrays.asList(elements)); @@ -120,6 +126,7 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#addCustomFooterControls(org.eclipse.swt.widgets.Composite) */ + @Override protected void addCustomFooterControls(Composite parent) { if (fShowSelectButtons){ Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL); @@ -127,6 +134,7 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug gd.horizontalAlignment = SWT.END; Button button = SWTFactory.createPushButton(comp, DebugUIMessages.AbstractDebugCheckboxSelectionDialog_0, null); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { getCheckBoxTableViewer().setAllChecked(true); getButton(IDialogConstants.OK_ID).setEnabled(isValid()); @@ -134,6 +142,7 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug }); button = SWTFactory.createPushButton(comp, DebugUIMessages.AbstractDebugCheckboxSelectionDialog_1, null); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { getCheckBoxTableViewer().setAllChecked(false); getButton(IDialogConstants.OK_ID).setEnabled(isValid()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java index 068772088..9910e0c4e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java @@ -45,6 +45,7 @@ public abstract class AbstractDebugListSelectionDialog extends AbstractDebugSele /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.AbstractDebugSelectionDialog#createViewer(org.eclipse.swt.widgets.Composite) */ + @Override protected StructuredViewer createViewer(Composite parent){ //by default return a table viewer fListViewer = new TableViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); @@ -57,13 +58,16 @@ public abstract class AbstractDebugListSelectionDialog extends AbstractDebugSele /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#addViewerListeners(org.eclipse.jface.viewers.StructuredViewer) */ + @Override protected void addViewerListeners(StructuredViewer viewer) { viewer.addSelectionChangedListener(new ISelectionChangedListener(){ + @Override public void selectionChanged(SelectionChangedEvent event) { getButton(IDialogConstants.OK_ID).setEnabled(isValid()); } }); viewer.addDoubleClickListener(new IDoubleClickListener(){ + @Override public void doubleClick(DoubleClickEvent event) { if (isValid()){ okPressed(); @@ -75,6 +79,7 @@ public abstract class AbstractDebugListSelectionDialog extends AbstractDebugSele /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.AbstractDebugSelectionDialog#isValid() */ + @Override protected boolean isValid() { if(fListViewer != null) { ISelection sel = fListViewer.getSelection(); @@ -88,7 +93,8 @@ public abstract class AbstractDebugListSelectionDialog extends AbstractDebugSele /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ - protected void okPressed() { + @Override + protected void okPressed() { ISelection selection = fViewer.getSelection(); if (selection instanceof IStructuredSelection) { setResult(((IStructuredSelection) selection).toList()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java index e105846d1..fcbe5bd16 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -155,6 +155,7 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Composite comp = (Composite) super.createContents(parent); initializeControls(); @@ -164,6 +165,7 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { initializeDialogUnits(parent); Composite comp = (Composite) super.createDialogArea(parent); @@ -180,7 +182,7 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog { fViewer.setLabelProvider(getLabelProvider()); fViewer.setContentProvider(getContentProvider()); fViewer.setInput(getViewerInput()); - List selectedElements = getInitialElementSelections(); + List<?> selectedElements = getInitialElementSelections(); if (selectedElements != null && !selectedElements.isEmpty()){ fViewer.setSelection(new StructuredSelection(selectedElements)); } @@ -204,6 +206,7 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog { /* (non-Javadoc) * @see org.eclipse.ui.dialogs.SelectionDialog#getDialogBoundsSettings() */ + @Override protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsId()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointImageProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointImageProvider.java index 6f8b99ebc..91b5a2a07 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointImageProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointImageProvider.java @@ -29,6 +29,7 @@ public class BreakpointImageProvider implements IAnnotationImageProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getManagedImage(org.eclipse.jface.text.source.Annotation) */ + @Override public Image getManagedImage(Annotation annotation) { if (annotation instanceof MarkerAnnotation) { IMarker marker = ((MarkerAnnotation)annotation).getMarker(); @@ -44,12 +45,14 @@ public class BreakpointImageProvider implements IAnnotationImageProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptorId(org.eclipse.jface.text.source.Annotation) */ + @Override public String getImageDescriptorId(Annotation annotation) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptor(java.lang.String) */ + @Override public ImageDescriptor getImageDescriptor(String imageDescritporId) { return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ColorManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ColorManager.java index a09ae6d0b..c1255ac30 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ColorManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ColorManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.debug.internal.ui; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.eclipse.swt.graphics.Color; @@ -36,10 +35,10 @@ public class ColorManager { return fgColorManager; } - protected Map fColorTable= new HashMap(10); + protected Map<RGB, Color> fColorTable = new HashMap<RGB, Color>(10); public Color getColor(RGB rgb) { - Color color= (Color) fColorTable.get(rgb); + Color color= fColorTable.get(rgb); if (color == null) { color= new Color(Display.getCurrent(), rgb); fColorTable.put(rgb, color); @@ -48,9 +47,9 @@ public class ColorManager { } public void dispose() { - Iterator e= fColorTable.values().iterator(); - while (e.hasNext()) - ((Color) e.next()).dispose(); + for (Color color : fColorTable.values()) { + color.dispose(); + } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CompositeDebugImageDescriptor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CompositeDebugImageDescriptor.java index e43235ce7..53cb70276 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CompositeDebugImageDescriptor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CompositeDebugImageDescriptor.java @@ -46,6 +46,7 @@ public class CompositeDebugImageDescriptor extends CompositeImageDescriptor { /** * @see CompositeImageDescriptor#getSize() */ + @Override protected Point getSize() { if (fSize == null) { ImageData data= getBaseImage().getImageData(); @@ -57,6 +58,7 @@ public class CompositeDebugImageDescriptor extends CompositeImageDescriptor { /** * @see Object#equals(java.lang.Object) */ + @Override public boolean equals(Object object) { if (!(object instanceof CompositeDebugImageDescriptor)){ return false; @@ -68,6 +70,7 @@ public class CompositeDebugImageDescriptor extends CompositeImageDescriptor { /** * @see Object#hashCode() */ + @Override public int hashCode() { return getBaseImage().hashCode() | getFlags(); } @@ -75,6 +78,7 @@ public class CompositeDebugImageDescriptor extends CompositeImageDescriptor { /** * @see CompositeImageDescriptor#drawCompositeImage(int, int) */ + @Override protected void drawCompositeImage(int width, int height) { ImageData bg= getBaseImage().getImageData(); if (bg == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java index 39b92de65..37419aadb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java @@ -38,6 +38,7 @@ public class DebugModelPropertyTester extends PropertyTester { /* (non-Javadoc) * @see org.eclipse.core.expressions.PropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) */ + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { if (MODEL_TYPE_PROPERTY.equals(property)){ IDebugTarget target = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPerspectiveFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPerspectiveFactory.java index 12f0af24b..028ecc353 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPerspectiveFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPerspectiveFactory.java @@ -25,6 +25,7 @@ public class DebugPerspectiveFactory implements IPerspectiveFactory { /** * @see IPerspectiveFactory#createInitialLayout(IPageLayout) */ + @Override public void createInitialLayout(IPageLayout layout) { IFolderLayout consoleFolder = layout.createFolder(IInternalDebugUIConstants.ID_CONSOLE_FOLDER_VIEW, IPageLayout.BOTTOM, (float)0.75, layout.getEditorArea()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIAdapterFactory.java index f44a5243e..49b09b5bf 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIAdapterFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIAdapterFactory.java @@ -25,6 +25,7 @@ public class DebugUIAdapterFactory implements IAdapterFactory { /** * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(Object, Class) */ + @Override public Object getAdapter(Object obj, Class adapterType) { if (adapterType.isInstance(obj)) { return obj; @@ -54,6 +55,7 @@ public class DebugUIAdapterFactory implements IAdapterFactory { /** * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override public Class[] getAdapterList() { return new Class[] {IPersistableElement.class, IWorkbenchAdapter.class, IWorkbenchAdapter2.class}; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java index 0d3679b71..541a80d46 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java @@ -19,7 +19,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.HashSet; import java.util.Hashtable; -import java.util.Iterator; import java.util.Set; import javax.xml.parsers.DocumentBuilder; @@ -216,7 +215,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, * * @since 3.3 */ - private Set fSaveParticipants = new HashSet(); + private Set<ISaveParticipant> fSaveParticipants = new HashSet<ISaveParticipant>(); /** * Theme listener. @@ -240,11 +239,13 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, // Allow the user to terminate the dummy launch as a means to // cancel the launch while waiting for a build to finish. - public boolean canTerminate() { + @Override + public boolean canTerminate() { return true; } - public void terminate() throws DebugException { + @Override + public void terminate() throws DebugException { fJob.cancel(); } } @@ -398,6 +399,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, final Object [] ret = new Object[1]; final CoreException [] exc = new CoreException[1]; BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { try { ret[0] = element.createExecutableExtension(classAttribute); @@ -415,6 +417,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, /** * @see org.eclipse.ui.plugin.AbstractUIPlugin#createImageRegistry() */ + @Override protected ImageRegistry createImageRegistry() { return DebugPluginImages.initializeImageRegistry(); } @@ -422,6 +425,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, /* (non-Javadoc) * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { try { if (fProcessConsoleManager != null) { @@ -463,8 +467,9 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, ResourcesPlugin.getWorkspace().removeSaveParticipant(getUniqueIdentifier()); if (fThemeListener != null) { - if (PlatformUI.isWorkbenchRunning()) + if (PlatformUI.isWorkbenchRunning()) { PlatformUI.getWorkbench().getThemeManager().removePropertyChangeListener(fThemeListener); + } fThemeListener= null; } @@ -499,13 +504,15 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, /* (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); - Hashtable props = new Hashtable(2); + Hashtable<String, String> props = new Hashtable<String, String>(2); props.put(org.eclipse.osgi.service.debug.DebugOptions.LISTENER_SYMBOLICNAME, getUniqueIdentifier()); context.registerService(DebugOptionsListener.class.getName(), this, props); ResourcesPlugin.getWorkspace().addSaveParticipant(getUniqueIdentifier(), new ISaveParticipant() { + @Override public void saving(ISaveContext saveContext) throws CoreException { IEclipsePreferences node = InstanceScope.INSTANCE.getNode(getUniqueIdentifier()); if(node != null) { @@ -515,23 +522,26 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, log(e); } } - for(Iterator iter = fSaveParticipants.iterator(); iter.hasNext();) { - ((ISaveParticipant)iter.next()).saving(saveContext); + for (ISaveParticipant sp : fSaveParticipants) { + sp.saving(saveContext); } } + @Override public void rollback(ISaveContext saveContext) { - for(Iterator iter = fSaveParticipants.iterator(); iter.hasNext();) { - ((ISaveParticipant)iter.next()).rollback(saveContext); + for (ISaveParticipant sp : fSaveParticipants) { + sp.rollback(saveContext); } } + @Override public void prepareToSave(ISaveContext saveContext) throws CoreException { - for(Iterator iter = fSaveParticipants.iterator(); iter.hasNext();) { - ((ISaveParticipant)iter.next()).prepareToSave(saveContext); + for (ISaveParticipant sp : fSaveParticipants) { + sp.prepareToSave(saveContext); } } + @Override public void doneSaving(ISaveContext saveContext) { - for(Iterator iter = fSaveParticipants.iterator(); iter.hasNext();) { - ((ISaveParticipant)iter.next()).doneSaving(saveContext); + for (ISaveParticipant sp : fSaveParticipants) { + sp.doneSaving(saveContext); } } }); @@ -562,9 +572,11 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, if (PlatformUI.isWorkbenchRunning()) { fThemeListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { - if (IThemeManager.CHANGE_CURRENT_THEME.equals(event.getProperty())) + if (IThemeManager.CHANGE_CURRENT_THEME.equals(event.getProperty())) { DebugUIPreferenceInitializer.setThemeBasedPreferences(getPreferenceStore(), true); + } } }; PlatformUI.getWorkbench().getThemeManager().addPropertyChangeListener(fThemeListener); @@ -573,6 +585,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, // do the asynchronous exec last - see bug 209920 getStandardDisplay().asyncExec( new Runnable() { + @Override public void run() { //initialize the selected resource ` SelectedResourceManager.getDefault(); @@ -585,6 +598,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, /* (non-Javadoc) * @see org.eclipse.osgi.service.debug.DebugOptionsListener#optionsChanged(org.eclipse.osgi.service.debug.DebugOptions) */ + @Override public void optionsChanged(DebugOptions options) { fgDebugTrace = options.newDebugTrace(getUniqueIdentifier()); DEBUG = options.getBooleanOption(DEBUG_FLAG, false); @@ -740,7 +754,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, * @since 3.3 * */ - public static int openLaunchConfigurationPropertiesDialog(Shell shell, ILaunchConfiguration configuration, String groupIdentifier, Set reservednames, IStatus status, boolean setDefaults) { + public static int openLaunchConfigurationPropertiesDialog(Shell shell, ILaunchConfiguration configuration, String groupIdentifier, Set<String> reservednames, IStatus status, boolean setDefaults) { LaunchGroupExtension group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(groupIdentifier); if (group != null) { LaunchConfigurationPropertiesDialog dialog = new LaunchConfigurationPropertiesDialog(shell, configuration, group, reservednames); @@ -783,6 +797,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, * @deprecated Saving has been moved to the launch delegate <code>LaunchConfigurationDelegate</code> to allow for scoped saving * of resources that are only involved in the current launch, no longer the entire workspace */ + @Deprecated protected static boolean saveAllEditors(boolean confirm) { if (getActiveWorkbenchWindow() == null) { return false; @@ -798,6 +813,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, * @deprecated this method is no longer to be used. It is an artifact from 2.0, and all saving is now done with the * launch delegate <code>LaunchConfigurationDelegate</code> */ + @Deprecated public static boolean saveAndBuild() { boolean status = true; String saveDirty = getDefault().getPreferenceStore().getString(IInternalDebugUIConstants.PREF_SAVE_DIRTY_EDITORS_BEFORE_LAUNCH); @@ -821,6 +837,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, private static boolean doBuild() { try { PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException { try { ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor); @@ -897,6 +914,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, * * @see org.eclipse.debug.core.ILaunchListener#launchAdded(org.eclipse.debug.core.ILaunch) */ + @Override public void launchAdded(ILaunch launch) { DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this); initializeLaunchListeners(); @@ -929,11 +947,13 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, /** * @see org.eclipse.debug.core.ILaunchListener#launchChanged(org.eclipse.debug.core.ILaunch) */ + @Override public void launchChanged(ILaunch launch) {} /** * @see org.eclipse.debug.core.ILaunchListener#launchRemoved(org.eclipse.debug.core.ILaunch) */ + @Override public void launchRemoved(ILaunch launch) {} /** @@ -990,6 +1010,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, * @deprecated Saving has been moved to the launch delegate <code>LaunchConfigurationDelegate</code> to allow for scoped saving * of resources that are only involved in the current launch, no longer the entire workspace */ + @Deprecated public static boolean preLaunchSave() { String saveDirty = getDefault().getPreferenceStore().getString(IInternalDebugUIConstants.PREF_SAVE_DIRTY_EDITORS_BEFORE_LAUNCH); if (saveDirty.equals(MessageDialogWithToggle.NEVER)) { @@ -1056,6 +1077,8 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, case IDialogConstants.NO_ID: wait = true; break; + default: + break; } } else if (waitForBuild.equals(MessageDialogWithToggle.ALWAYS)) { wait = true; @@ -1066,6 +1089,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, IWorkbench workbench = DebugUIPlugin.getDefault().getWorkbench(); IProgressService progressService = workbench.getProgressService(); final IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException { /* Setup progress monitor * - Waiting for jobs to finish (2) @@ -1096,6 +1120,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, } } else { IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException { /* Setup progress monitor * - Build & launch (1) */ @@ -1172,6 +1197,8 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, case IDialogConstants.NO_ID: wait = false; break; + default: + break; } } else { @@ -1180,6 +1207,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, } final boolean waitInJob = wait; Job job = new Job(MessageFormat.format(DebugUIMessages.DebugUIPlugin_25, new Object[] {configuration.getName()})) { + @Override public IStatus run(final IProgressMonitor monitor) { /* Setup progress monitor * - Waiting for jobs to finish (2) @@ -1194,12 +1222,18 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, final ILaunch pendingLaunch = new PendingLaunch(workingCopy, mode, this); DebugPlugin.getDefault().getLaunchManager().addLaunch(pendingLaunch); IJobChangeListener listener= new IJobChangeListener() { - public void sleeping(IJobChangeEvent event) {} - public void scheduled(IJobChangeEvent event) {} - public void running(IJobChangeEvent event) {} - public void awake(IJobChangeEvent event) {} - public void aboutToRun(IJobChangeEvent event) {} - public void done(IJobChangeEvent event) { + @Override + public void sleeping(IJobChangeEvent event) {} + @Override + public void scheduled(IJobChangeEvent event) {} + @Override + public void running(IJobChangeEvent event) {} + @Override + public void awake(IJobChangeEvent event) {} + @Override + public void aboutToRun(IJobChangeEvent event) {} + @Override + public void done(IJobChangeEvent event) { DebugPlugin dp = DebugPlugin.getDefault(); if (dp != null) { dp.getLaunchManager().removeLaunch(pendingLaunch); @@ -1232,6 +1266,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener, return status; } Runnable r = new Runnable() { + @Override public void run() { DebugUITools.openLaunchConfigurationDialogOnGroup(DebugUIPlugin.getShell(), new StructuredSelection(configuration), group.getIdentifier(), status); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java index b575f8323..7a51a3239 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java @@ -31,6 +31,7 @@ public class DebugUIPreferenceInitializer extends AbstractPreferenceInitializer /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() */ + @Override public void initializeDefaultPreferences() { IPreferenceStore prefs = DebugUIPlugin.getDefault().getPreferenceStore(); // Debug PreferencePage 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 b3ebe63a9..7a80d996a 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.debug.internal.ui; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.eclipse.core.resources.IMarker; @@ -61,11 +60,12 @@ public class DefaultLabelProvider implements ILabelProvider { /** * Maps image descriptors to images. */ - private Map fImages = new HashMap(); + private Map<ImageDescriptor, Image> fImages = new HashMap<ImageDescriptor, Image>(); /** * @see ILabelProvider#getImage(Object) */ + @Override public Image getImage(Object element) { String key= getImageKey(element); if (key == null && element instanceof ILaunch) { @@ -95,7 +95,7 @@ public class DefaultLabelProvider implements ILabelProvider { * @return image or <code>null</code> */ private Image getImage(ImageDescriptor descriptor) { - Image image = (Image) fImages.get(descriptor); + Image image = fImages.get(descriptor); if (image != null) { return image; } @@ -197,6 +197,7 @@ public class DefaultLabelProvider implements ILabelProvider { /** * @see ILabelProvider#getText(Object) */ + @Override public String getText(Object element) { StringBuffer label= new StringBuffer(); try { @@ -254,7 +255,7 @@ public class DefaultLabelProvider implements ILabelProvider { if (element instanceof IProcess) { IProcess process = (IProcess)element; int exit = process.getExitValue(); - terminatedMessage= MessageFormat.format(DebugUIMessages.DefaultLabelProvider_16, new String[]{new Integer(exit).toString()}); + terminatedMessage = MessageFormat.format(DebugUIMessages.DefaultLabelProvider_16, new Object[] { new Integer(exit).toString() }); } else { terminatedMessage= DebugUIMessages.DefaultLabelProvider_1; } @@ -287,7 +288,7 @@ public class DefaultLabelProvider implements ILabelProvider { if (breakpoint instanceof ILineBreakpoint) { try { int lineNumber = ((ILineBreakpoint)breakpoint).getLineNumber(); - label.append(MessageFormat.format(DebugUIMessages.DefaultLabelProvider_17, new String[]{Integer.toString(lineNumber)})); + label.append(MessageFormat.format(DebugUIMessages.DefaultLabelProvider_17, new Object[] { Integer.toString(lineNumber) })); } catch (CoreException e) { } } @@ -475,16 +476,16 @@ public class DefaultLabelProvider implements ILabelProvider { /** * @see IBaseLabelProvider#addListener(ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { } /** * @see IBaseLabelProvider#dispose() */ + @Override public void dispose() { - Iterator iterator = fImages.values().iterator(); - while (iterator.hasNext()) { - Image image = (Image) iterator.next(); + for (Image image : fImages.values()) { image.dispose(); } fImages.clear(); @@ -493,6 +494,7 @@ public class DefaultLabelProvider implements ILabelProvider { /** * @see IBaseLabelProvider#isLabelProperty(Object, String) */ + @Override public boolean isLabelProperty(Object element, String property) { return false; } @@ -500,6 +502,7 @@ public class DefaultLabelProvider implements ILabelProvider { /** * @see IBaseLabelProvider#removeListener(ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java index 8f3425e57..994ca765a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.debug.internal.ui; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.eclipse.core.resources.IMarker; @@ -35,6 +34,7 @@ import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.IInstructionPointerPresentation; import org.eclipse.debug.ui.IValueDetailListener; import org.eclipse.jface.text.source.Annotation; +import org.eclipse.jface.viewers.IBaseLabelProvider; import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.IFontProvider; import org.eclipse.jface.viewers.ILabelProvider; @@ -59,15 +59,16 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe * A mapping of attribute ids to their values * @see IDebugModelPresentation#setAttribute */ - private HashMap fAttributes= new HashMap(3); + private HashMap<String, Object> fAttributes = new HashMap<String, Object>(3); /** * A table of label providers keyed by debug model identifiers. */ - private HashMap fLabelProviders= new HashMap(5); + private HashMap<String, IDebugModelPresentation> fLabelProviders = new HashMap<String, IDebugModelPresentation>(5); /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugEditorPresentation#removeAnnotations(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IThread) */ + @Override public void removeAnnotations(IEditorPart editorPart, IThread thread) { IDebugModelPresentation presentation = getConfiguredPresentation(thread); if (presentation instanceof IDebugEditorPresentation) { @@ -78,6 +79,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugEditorPresentation#addAnnotations(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame) */ + @Override public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) { IDebugModelPresentation presentation = getConfiguredPresentation(frame); if (presentation instanceof IDebugEditorPresentation) { @@ -114,10 +116,10 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe * * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { - Iterator i= getLabelProviders().values().iterator(); - while (i.hasNext()) { - ((ILabelProvider) i.next()).addListener(listener); + for (ILabelProvider p : fLabelProviders.values()) { + p.addListener(listener); } } @@ -126,16 +128,17 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe * * @see IBaseLabelProvider#dispose() */ + @Override public void dispose() { - Iterator i= getLabelProviders().values().iterator(); - while (i.hasNext()) { - ((ILabelProvider) i.next()).dispose(); + for (ILabelProvider p : fLabelProviders.values()) { + p.dispose(); } } /** * @see IDebugModelPresentation#getImage(Object) */ + @Override public Image getImage(Object item) { // Attempt to delegate IDebugModelPresentation lp= getConfiguredPresentation(item); @@ -152,7 +155,8 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /** * @see IDebugModelPresentation#getText(Object) */ - public String getText(Object item) { + @Override + public String getText(Object item) { IDebugModelPresentation lp= getConfiguredPresentation(item); if (lp != null) { return lp.getText(item); @@ -163,6 +167,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.debug.ui.ISourcePresentation#getEditorInput(java.lang.Object) */ + @Override public IEditorInput getEditorInput(Object item) { IDebugModelPresentation lp= getConfiguredPresentation(item); if (lp != null) { @@ -174,6 +179,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.debug.ui.ISourcePresentation#getEditorId(org.eclipse.ui.IEditorInput, java.lang.Object) */ + @Override public String getEditorId(IEditorInput input, Object objectInput) { IDebugModelPresentation lp= getConfiguredPresentation(objectInput); if (lp != null) { @@ -200,6 +206,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugModelPresentation#computeDetail(org.eclipse.debug.core.model.IValue, org.eclipse.debug.ui.IValueDetailListener) */ + @Override public void computeDetail(IValue value, IValueDetailListener listener) { IDebugModelPresentation lp= getConfiguredPresentation(value); if (lp != null) { @@ -214,10 +221,10 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe * * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { - Iterator i= getLabelProviders().values().iterator(); - while (i.hasNext()) { - ((ILabelProvider) i.next()).removeListener(listener); + for (ILabelProvider p : fLabelProviders.values()) { + p.removeListener(listener); } } @@ -226,6 +233,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe * * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) */ + @Override public boolean isLabelProperty(Object element, String property) { if (element instanceof IDebugElement) { IDebugModelPresentation lp= getConfiguredPresentation(element); @@ -267,20 +275,20 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe * of nothing is registered for the id. */ public IDebugModelPresentation getPresentation(String id) { - return (IDebugModelPresentation) getLabelProviders().get(id); + return getLabelProviders().get(id); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugModelPresentation#setAttribute(java.lang.String, java.lang.Object) */ + @Override public void setAttribute(String id, Object value) { if (value == null) { return; } basicSetAttribute(id, value); - Iterator presentations = fLabelProviders.values().iterator(); - while (presentations.hasNext()) { - ((IDebugModelPresentation)presentations.next()).setAttribute(id, value); + for (IDebugModelPresentation p : fLabelProviders.values()) { + p.setAttribute(id, value); } } @@ -291,7 +299,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe * @param value value */ protected void basicSetAttribute(String id, Object value) { - getAttributes().put(id, value); + fAttributes.put(id, value); } /** @@ -309,7 +317,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe * Returns the raw attribute map * @return the raw attribute map */ - public HashMap getAttributes() { + public HashMap<String, Object> getAttributes() { return fAttributes; } @@ -319,18 +327,24 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe * @return a copy of the attribute map for this presentation * @since 3.0 */ - public Map getAttributeMap() { - return (Map) getAttributes().clone(); + public Map<String, Object> getAttributeMap() { + return new HashMap<String, Object>(fAttributes); } - protected HashMap getLabelProviders() { + /** + * Returns the live-list of registered {@link ILabelProvider}s + * + * @return the live list of label providers + */ + protected HashMap<String, IDebugModelPresentation> getLabelProviders() { return fLabelProviders; } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) */ - public Color getForeground(Object element) { + @Override + public Color getForeground(Object element) { IDebugModelPresentation presentation = getConfiguredPresentation(element); if (presentation instanceof IColorProvider) { IColorProvider colorProvider = (IColorProvider) presentation; @@ -342,7 +356,8 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) */ - public Color getBackground(Object element) { + @Override + public Color getBackground(Object element) { IDebugModelPresentation presentation = getConfiguredPresentation(element); if (presentation instanceof IColorProvider) { IColorProvider colorProvider = (IColorProvider) presentation; @@ -354,7 +369,8 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object) */ - public Font getFont(Object element) { + @Override + public Font getFont(Object element) { IDebugModelPresentation presentation = getConfiguredPresentation(element); if (presentation instanceof IFontProvider) { IFontProvider fontProvider = (IFontProvider) presentation; @@ -366,6 +382,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerAnnotation(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame) */ + @Override public Annotation getInstructionPointerAnnotation(IEditorPart editorPart, IStackFrame frame) { IDebugModelPresentation presentation = getConfiguredPresentation(frame); Annotation annotation = null; @@ -431,6 +448,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getMarkerAnnotationSpecificationId(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame) */ + @Override public String getInstructionPointerAnnotationType(IEditorPart editorPart, IStackFrame frame) { IDebugModelPresentation presentation = getConfiguredPresentation(frame); if (presentation instanceof IInstructionPointerPresentation) { @@ -442,6 +460,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerImage(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame) */ + @Override public Image getInstructionPointerImage(IEditorPart editorPart, IStackFrame frame) { IDebugModelPresentation presentation = getConfiguredPresentation(frame); if (presentation instanceof IInstructionPointerPresentation) { @@ -453,6 +472,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerText(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame) */ + @Override public String getInstructionPointerText(IEditorPart editorPart, IStackFrame frame) { IDebugModelPresentation presentation = getConfiguredPresentation(frame); if (presentation instanceof IInstructionPointerPresentation) { @@ -464,6 +484,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugModelPresentationExtension#requiresUIThread(java.lang.Object) */ + @Override public boolean requiresUIThread(Object element) { IDebugModelPresentation presentation = getConfiguredPresentation(element); if (presentation == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DynamicInstructionPointerAnnotation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DynamicInstructionPointerAnnotation.java index 6ca45c424..8d377a251 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DynamicInstructionPointerAnnotation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DynamicInstructionPointerAnnotation.java @@ -39,6 +39,7 @@ public class DynamicInstructionPointerAnnotation extends Annotation { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object other) { if (other instanceof DynamicInstructionPointerAnnotation) { return getStackFrame().equals(((DynamicInstructionPointerAnnotation)other).getStackFrame()); @@ -49,6 +50,7 @@ public class DynamicInstructionPointerAnnotation extends Annotation { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return getStackFrame().hashCode(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java index a6e697a96..df92d2657 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -37,7 +37,8 @@ public interface IInternalDebugUIConstants { /** * @deprecated Use IDebugUIConstants#IMG_LCL_ADD */ - public static final String IMG_LCL_MONITOR_EXPRESSION= IDebugUIConstants.IMG_LCL_ADD; + @Deprecated + public static final String IMG_LCL_MONITOR_EXPRESSION= IDebugUIConstants.IMG_LCL_ADD; public static final String IMG_LCL_REMOVE_MEMORY= "IMG_LCL_REMOVE_MEMORY"; //$NON-NLS-1$ public static final String IMG_LCL_RESET_MEMORY= "IMG_LCL_RESET_MEMORY";//$NON-NLS-1$ public static final String IMG_LCL_COPY_VIEW_TO_CLIPBOARD = "IMG_LCL_COPY_VIEW_TO_CLIPBOARD"; //$NON-NLS-1$ @@ -361,7 +362,8 @@ public interface IInternalDebugUIConstants { * @deprecated There is an API equivalent constant that should be used, see * {@link IDebugUIConstants#BREAKPOINT_WORKINGSET_ID} */ - public static final String ID_BREAKPOINT_WORKINGSET = "org.eclipse.debug.ui.breakpointWorkingSet"; //$NON-NLS-1$ + @Deprecated + public static final String ID_BREAKPOINT_WORKINGSET = "org.eclipse.debug.ui.breakpointWorkingSet"; //$NON-NLS-1$ /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ImageDescriptorRegistry.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ImageDescriptorRegistry.java index 83e340315..e2d19e2c0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ImageDescriptorRegistry.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ImageDescriptorRegistry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.debug.internal.ui; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.eclipse.core.runtime.Assert; @@ -27,7 +26,7 @@ import org.eclipse.swt.widgets.Display; */ public class ImageDescriptorRegistry { - private Map fRegistry= Collections.synchronizedMap(new HashMap(10)); + private Map<ImageDescriptor, Image> fRegistry = Collections.synchronizedMap(new HashMap<ImageDescriptor, Image>(10)); private Display fDisplay; /** @@ -58,17 +57,20 @@ public class ImageDescriptorRegistry { * if the image descriptor can't create the requested image. */ public Image get(ImageDescriptor descriptor) { - if (descriptor == null) + if (descriptor == null) { descriptor= ImageDescriptor.getMissingImageDescriptor(); + } - Image result= (Image)fRegistry.get(descriptor); - if (result != null) + Image result= fRegistry.get(descriptor); + if (result != null) { return result; + } Assert.isTrue(fDisplay == DebugUIPlugin.getStandardDisplay(), DebugUIMessages.ImageDescriptorRegistry_0); result= descriptor.createImage(); - if (result != null) + if (result != null) { fRegistry.put(descriptor, result); + } return result; } @@ -76,8 +78,7 @@ public class ImageDescriptorRegistry { * Disposes all images managed by this registry. */ public void dispose() { - for (Iterator iter= fRegistry.values().iterator(); iter.hasNext(); ) { - Image image= (Image)iter.next(); + for (Image image : fRegistry.values()) { image.dispose(); } fRegistry.clear(); @@ -85,9 +86,11 @@ public class ImageDescriptorRegistry { private void hookDisplay() { fDisplay.asyncExec(new Runnable() { + @Override public void run() { fDisplay.disposeExec(new Runnable() { + @Override public void run() { dispose(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerContext.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerContext.java index e7ca30e7f..7a8216f25 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerContext.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerContext.java @@ -52,6 +52,7 @@ public class InstructionPointerContext { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object other) { if (other instanceof InstructionPointerContext) { InstructionPointerContext otherContext = (InstructionPointerContext) other; @@ -65,6 +66,7 @@ public class InstructionPointerContext { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return getAnnotation().hashCode() + getEditor().hashCode(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java index 93a5ef7ee..da3e4857c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java @@ -21,6 +21,7 @@ public class InstructionPointerImageProvider implements IAnnotationImageProvider /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getManagedImage(org.eclipse.jface.text.source.Annotation) */ + @Override public Image getManagedImage(Annotation annotation) { return ((InstructionPointerAnnotation)annotation).getImage(); } @@ -28,6 +29,7 @@ public class InstructionPointerImageProvider implements IAnnotationImageProvider /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptorId(org.eclipse.jface.text.source.Annotation) */ + @Override public String getImageDescriptorId(Annotation annotation) { return null; } @@ -35,6 +37,7 @@ public class InstructionPointerImageProvider implements IAnnotationImageProvider /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptor(java.lang.String) */ + @Override public ImageDescriptor getImageDescriptor(String imageDescritporId) { return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java index 51a6ab472..19401b008 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -50,12 +50,12 @@ public class InstructionPointerManager{ /** * Set containing all instruction pointer contexts this class manages */ - private Set fIPCSet = new HashSet(); + private Set<InstructionPointerContext> fIPCSet = new HashSet<InstructionPointerContext>(); /** * Maps ITextEditors to the set of instruction pointer contexts that are displayed in the editor */ - private Map fEditorMap = new HashMap(); + private Map<ITextEditor, Set<InstructionPointerContext>> fEditorMap = new HashMap<ITextEditor, Set<InstructionPointerContext>>(); /** * Part listener added to editors that contain annotations. Allows instruction pointer contexts to @@ -142,9 +142,9 @@ public class InstructionPointerManager{ InstructionPointerContext ipc = new InstructionPointerContext(frame.getDebugTarget(), frame.getThread(), textEditor, annotation); // Add the IPC to the set and map - Set editorIPCs = (Set)fEditorMap.get(textEditor); + Set<InstructionPointerContext> editorIPCs = fEditorMap.get(textEditor); if (editorIPCs == null){ - editorIPCs = new HashSet(); + editorIPCs = new HashSet<InstructionPointerContext>(); fEditorMap.put(textEditor, editorIPCs); } else { editorIPCs.remove(ipc); @@ -165,9 +165,9 @@ public class InstructionPointerManager{ */ public void removeAnnotations(IDebugTarget debugTarget) { synchronized (fIPCSet) { - Iterator ipcIter = fIPCSet.iterator(); + Iterator<InstructionPointerContext> ipcIter = fIPCSet.iterator(); while (ipcIter.hasNext()) { - InstructionPointerContext currentIPC = (InstructionPointerContext) ipcIter.next(); + InstructionPointerContext currentIPC = ipcIter.next(); if (currentIPC.getDebugTarget().equals(debugTarget)){ removeAnnotationFromModel(currentIPC); ipcIter.remove(); @@ -183,9 +183,9 @@ public class InstructionPointerManager{ */ public void removeAnnotations(IThread thread) { synchronized (fIPCSet) { - Iterator ipcIter = fIPCSet.iterator(); + Iterator<InstructionPointerContext> ipcIter = fIPCSet.iterator(); while (ipcIter.hasNext()) { - InstructionPointerContext currentIPC = (InstructionPointerContext) ipcIter.next(); + InstructionPointerContext currentIPC = ipcIter.next(); if (currentIPC.getThread().equals(thread)){ removeAnnotationFromModel(currentIPC); ipcIter.remove(); @@ -201,11 +201,11 @@ public class InstructionPointerManager{ */ public void removeAnnotations(ITextEditor editor) { synchronized (fIPCSet) { - Set editorIPCs = (Set)fEditorMap.get(editor); + Set<InstructionPointerContext> editorIPCs = fEditorMap.get(editor); if (editorIPCs != null){ - Iterator ipcIter = editorIPCs.iterator(); + Iterator<InstructionPointerContext> ipcIter = editorIPCs.iterator(); while (ipcIter.hasNext()) { - InstructionPointerContext currentIPC = (InstructionPointerContext) ipcIter.next(); + InstructionPointerContext currentIPC = ipcIter.next(); removeAnnotationFromModel(currentIPC); fIPCSet.remove(currentIPC); } @@ -218,7 +218,7 @@ public class InstructionPointerManager{ * Remove the given ipc from the mapping of editors. */ private void removeAnnotationFromEditorMapping(InstructionPointerContext ipc) { - Set editorIPCs = (Set)fEditorMap.get(ipc.getEditor()); + Set<InstructionPointerContext> editorIPCs = fEditorMap.get(ipc.getEditor()); if (editorIPCs != null){ editorIPCs.remove(ipc); if (editorIPCs.isEmpty()){ @@ -288,16 +288,23 @@ public class InstructionPointerManager{ * the input containing instruction pointer annotations. */ class PartListener implements IPartListener2{ + @Override public void partActivated(IWorkbenchPartReference partRef) {} + @Override public void partDeactivated(IWorkbenchPartReference partRef) {} + @Override public void partHidden(IWorkbenchPartReference partRef) {} + @Override public void partOpened(IWorkbenchPartReference partRef) {} + @Override public void partVisible(IWorkbenchPartReference partRef) {} + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) {} /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partClosed(IWorkbenchPartReference partRef) { IWorkbenchPart part = partRef.getPart(false); if (part instanceof ITextEditor){ @@ -309,6 +316,7 @@ public class InstructionPointerManager{ /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partInputChanged(IWorkbenchPartReference partRef) { IWorkbenchPart part = partRef.getPart(false); if (part instanceof ITextEditor){ @@ -322,12 +330,15 @@ public class InstructionPointerManager{ */ class PageListener implements IPageListener{ + @Override public void pageActivated(IWorkbenchPage page) {} + @Override public void pageOpened(IWorkbenchPage page) {} /* (non-Javadoc) * @see org.eclipse.ui.IPageListener#pageClosed(org.eclipse.ui.IWorkbenchPage) */ + @Override public void pageClosed(IWorkbenchPage page) { page.removePartListener(getPartListener()); page.getWorkbenchWindow().removePageListener(getPageListener()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchConfigurationTabExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchConfigurationTabExtension.java index fbede662f..ba0aaac3e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchConfigurationTabExtension.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchConfigurationTabExtension.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,7 +29,7 @@ public final class LaunchConfigurationTabExtension { * The configuration element backing this proxy */ IConfigurationElement fElement = null; - private Set fDelegates = null; + private Set<String> fDelegates = null; /** * Constructor @@ -102,9 +102,9 @@ public final class LaunchConfigurationTabExtension { * Returns a set of strings of the launch delegates that this tab contribution is associated with * @return the set of strings of the associated launch delegates, which can be an empty collection, never <code>null</code>. */ - public Set getDelegateSet() { + public Set<String> getDelegateSet() { if(fDelegates == null) { - fDelegates = new HashSet(); + fDelegates = new HashSet<String>(); IConfigurationElement[] children = fElement.getChildren(IConfigurationElementConstants.ASSOCIATED_DELEGATE); String id = null; for(int i = 0; i < children.length; i++) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java index 0ef0b2f4c..5337908f8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,8 +12,8 @@ package org.eclipse.debug.internal.ui; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -31,9 +31,11 @@ import org.eclipse.debug.ui.IDebugEditorPresentation; import org.eclipse.debug.ui.IDebugModelPresentation; import org.eclipse.debug.ui.IDebugModelPresentationExtension; import org.eclipse.debug.ui.IInstructionPointerPresentation; +import org.eclipse.debug.ui.ISourcePresentation; import org.eclipse.debug.ui.IValueDetailListener; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.SourceViewerConfiguration; +import org.eclipse.jface.viewers.IBaseLabelProvider; import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.IFontProvider; import org.eclipse.jface.viewers.ILabelProviderListener; @@ -55,7 +57,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi * A temporary mapping of attribute ids to their values * @see IDebugModelPresentation#setAttribute */ - protected HashMap fAttributes= new HashMap(3); + protected HashMap<String, Object> fAttributes = new HashMap<String, Object>(3); /** * The config element that defines the extension @@ -82,6 +84,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugEditorPresentation#removeAnntations(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IThread) */ + @Override public void removeAnnotations(IEditorPart editorPart, IThread thread) { IDebugModelPresentation presentation = getPresentation(); if (presentation instanceof IDebugEditorPresentation) { @@ -92,6 +95,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugEditorPresentation#addAnnotations(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame) */ + @Override public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) { IDebugModelPresentation presentation = getPresentation(); if (presentation instanceof IDebugEditorPresentation) { @@ -122,6 +126,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /** * @see IDebugModelPresentation#getImage(Object) */ + @Override public Image getImage(Object element) { initImageRegistry(); Image image = getPresentation().getImage(element); @@ -179,6 +184,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /** * @see IDebugModelPresentation#getText(Object) */ + @Override public String getText(Object element) { if (!(element instanceof IndexedVariablePartition)) { // Attempt to delegate @@ -218,14 +224,15 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi * This allows this option to be set per view, for example. */ protected boolean showVariableTypeNames() { - Boolean show= (Boolean) fAttributes.get(DISPLAY_VARIABLE_TYPE_NAMES); - show= show == null ? Boolean.FALSE : show; + Boolean show = (Boolean) fAttributes.get(DISPLAY_VARIABLE_TYPE_NAMES); + show = show == null ? Boolean.FALSE : show; return show.booleanValue(); } /** * @see IDebugModelPresentation#computeDetail(IValue, IValueDetailListener) */ + @Override public void computeDetail(IValue value, IValueDetailListener listener) { getPresentation().computeDetail(value, listener); } @@ -233,6 +240,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /** * @see ISourcePresentation#getEditorInput(Object) */ + @Override public IEditorInput getEditorInput(Object element) { return getPresentation().getEditorInput(element); } @@ -240,6 +248,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /** * @see ISourcePresentation#getEditorId(IEditorInput, Object) */ + @Override public String getEditorId(IEditorInput input, Object inputObject) { return getPresentation().getEditorId(input, inputObject); } @@ -247,6 +256,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /** * @see IBaseLabelProvider#addListener(ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { if (fPresentation != null) { getPresentation().addListener(listener); @@ -257,6 +267,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /** * @see IBaseLabelProvider#dispose() */ + @Override public void dispose() { if (fPresentation != null) { getPresentation().dispose(); @@ -267,6 +278,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /** * @see IBaseLabelProvider#isLabelProperty(Object, String) */ + @Override public boolean isLabelProperty(Object element, String property) { if (fPresentation != null) { return getPresentation().isLabelProperty(element, property); @@ -277,6 +289,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /** * @see IBaseLabelProvider#removeListener(ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { if (fPresentation != null) { getPresentation().removeListener(listener); @@ -307,10 +320,8 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi tempPresentation.addListener((ILabelProviderListener)list[i]); } } - Iterator keys= fAttributes.keySet().iterator(); - while (keys.hasNext()) { - String key= (String)keys.next(); - tempPresentation.setAttribute(key, fAttributes.get(key)); + for (Entry<String, Object> entry : fAttributes.entrySet()) { + tempPresentation.setAttribute(entry.getKey(), entry.getValue()); } // Only assign to the instance variable after it's been configured. Otherwise, // the synchronization is defeated (a thread could return the presentation before @@ -327,6 +338,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /** * @see IDebugModelPresentation#setAttribute(String, Object) */ + @Override public void setAttribute(String id, Object value) { if (value == null) { return; @@ -373,22 +385,24 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi * @return a copy of the attributes in this model presentation * @since 3.0 */ - public Map getAttributeMap() { - return (Map) fAttributes.clone(); + public Map<String, Object> getAttributeMap() { + return new HashMap<String, Object>(fAttributes); } /** * Returns the raw attribute map + * * @return the raw attribute map */ - public Map getAttributes() { + public Map<String, Object> getAttributes() { return fAttributes; } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) */ - public Color getForeground(Object element) { + @Override + public Color getForeground(Object element) { IDebugModelPresentation presentation = getPresentation(); if (presentation instanceof IColorProvider) { IColorProvider colorProvider = (IColorProvider) presentation; @@ -400,7 +414,8 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) */ - public Color getBackground(Object element) { + @Override + public Color getBackground(Object element) { IDebugModelPresentation presentation = getPresentation(); if (presentation instanceof IColorProvider) { IColorProvider colorProvider = (IColorProvider) presentation; @@ -412,7 +427,8 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /* (non-Javadoc) * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object) */ - public Font getFont(Object element) { + @Override + public Font getFont(Object element) { IDebugModelPresentation presentation = getPresentation(); if (presentation instanceof IFontProvider) { IFontProvider fontProvider = (IFontProvider) presentation; @@ -424,6 +440,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /* (non-Javadoc) * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerAnnotation(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame) */ + @Override public Annotation getInstructionPointerAnnotation(IEditorPart editorPart, IStackFrame frame) { IDebugModelPresentation presentation = getPresentation(); if (presentation instanceof IInstructionPointerPresentation) { @@ -436,6 +453,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /* (non-Javadoc) * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getMarkerAnnotationSpecificationId(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame) */ + @Override public String getInstructionPointerAnnotationType(IEditorPart editorPart, IStackFrame frame) { IDebugModelPresentation presentation = getPresentation(); if (presentation instanceof IInstructionPointerPresentation) { @@ -448,6 +466,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /* (non-Javadoc) * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerImage(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame) */ + @Override public Image getInstructionPointerImage(IEditorPart editorPart, IStackFrame frame) { IDebugModelPresentation presentation = getPresentation(); if (presentation instanceof IInstructionPointerPresentation) { @@ -460,6 +479,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /* (non-Javadoc) * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerText(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame) */ + @Override public String getInstructionPointerText(IEditorPart editorPart, IStackFrame frame) { IDebugModelPresentation presentation = getPresentation(); if (presentation instanceof IInstructionPointerPresentation) { @@ -472,6 +492,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugModelPresentationExtension#requiresUIThread(java.lang.Object) */ + @Override public boolean requiresUIThread(Object element) { if (!DebugPluginImages.isInitialized()) { // need UI thread for breakpoint adornment and default images diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java index 640ec2f2a..d02ea8404 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2012 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.debug.internal.ui; import java.io.File; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -48,10 +47,10 @@ public class MultipleInputDialog extends Dialog { protected Composite panel; - protected List fieldList = new ArrayList(); - protected List controlList = new ArrayList(); - protected List validators = new ArrayList(); - protected Map valueMap = new HashMap(); + protected List<FieldSummary> fieldList = new ArrayList<FieldSummary>(); + protected List<Text> controlList = new ArrayList<Text>(); + protected List<Validator> validators = new ArrayList<Validator>(); + protected Map<Object, String> valueMap = new HashMap<Object, String>(); private String title; @@ -66,6 +65,7 @@ public class MultipleInputDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); if (title != null) { @@ -77,6 +77,7 @@ public class MultipleInputDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createButtonBar(Composite parent) { Control bar = super.createButtonBar(parent); validateFields(); @@ -86,6 +87,7 @@ public class MultipleInputDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite container = (Composite)super.createDialogArea(parent); container.setLayout(new GridLayout(2, false)); @@ -95,9 +97,7 @@ public class MultipleInputDialog extends Dialog { GridLayout layout = new GridLayout(2, false); panel.setLayout(layout); panel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - for (Iterator i = fieldList.iterator(); i.hasNext();) { - FieldSummary field = (FieldSummary)i.next(); + for (FieldSummary field : fieldList) { switch(field.type) { case TEXT: createTextField(field.name, field.initialValue, field.allowsEmpty); @@ -111,6 +111,8 @@ public class MultipleInputDialog extends Dialog { case MULTILINE_VARIABLE: createMultilineVariablesField(field.name, field.initialValue, field.allowsEmpty); break; + default: + break; } } @@ -150,11 +152,13 @@ public class MultipleInputDialog extends Dialog { if (!allowEmpty) { validators.add(new Validator() { + @Override public boolean validate() { return !text.getText().equals(IInternalDebugCoreConstants.EMPTY_STRING); } }); text.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { validateFields(); } @@ -191,12 +195,14 @@ public class MultipleInputDialog extends Dialog { if (!allowEmpty) { validators.add(new Validator() { + @Override public boolean validate() { return !text.getText().equals(IInternalDebugCoreConstants.EMPTY_STRING); } }); text.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { validateFields(); } @@ -205,6 +211,7 @@ public class MultipleInputDialog extends Dialog { Button button = createButton(comp, IDialogConstants.IGNORE_ID, DebugUIMessages.MultipleInputDialog_6, false); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { DirectoryDialog dialog = new DirectoryDialog(getShell()); dialog.setMessage(DebugUIMessages.MultipleInputDialog_7); @@ -255,12 +262,14 @@ public class MultipleInputDialog extends Dialog { if (!allowEmpty) { validators.add(new Validator() { + @Override public boolean validate() { return !text.getText().equals(IInternalDebugCoreConstants.EMPTY_STRING); } }); text.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { validateFields(); } @@ -269,6 +278,7 @@ public class MultipleInputDialog extends Dialog { Button button = createButton(comp, IDialogConstants.IGNORE_ID, DebugUIMessages.MultipleInputDialog_8, false); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell()); int code = dialog.open(); @@ -301,7 +311,8 @@ public class MultipleInputDialog extends Dialog { text.setData(FIELD_NAME, labelText); text.addTraverseListener(new TraverseListener () { - public void keyTraversed(TraverseEvent e) { + @Override + public void keyTraversed(TraverseEvent e) { if(e.detail == SWT.TRAVERSE_RETURN && e.stateMask == SWT.SHIFT) { e.doit = true; } @@ -317,12 +328,14 @@ public class MultipleInputDialog extends Dialog { if (!allowEmpty) { validators.add(new Validator() { + @Override public boolean validate() { return !text.getText().equals(IInternalDebugCoreConstants.EMPTY_STRING); } }); text.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { validateFields(); } @@ -336,6 +349,7 @@ public class MultipleInputDialog extends Dialog { Button button = createButton(comp, IDialogConstants.IGNORE_ID, DebugUIMessages.MultipleInputDialog_8, false); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell()); int code = dialog.open(); @@ -354,12 +368,10 @@ public class MultipleInputDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { - for (Iterator i = controlList.iterator(); i.hasNext(); ) { - Control control = (Control)i.next(); - if (control instanceof Text) { - valueMap.put(control.getData(FIELD_NAME), ((Text)control).getText()); - } + for (Text control : controlList) { + valueMap.put(control.getData(FIELD_NAME), control.getText()); } controlList = null; super.okPressed(); @@ -369,6 +381,7 @@ public class MultipleInputDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#open() */ + @Override public int open() { applyDialogFont(panel); return super.open(); @@ -383,8 +396,7 @@ public class MultipleInputDialog extends Dialog { } public void validateFields() { - for(Iterator i = validators.iterator(); i.hasNext(); ) { - Validator validator = (Validator) i.next(); + for (Validator validator : validators) { if (!validator.validate()) { getButton(IDialogConstants.OK_ID).setEnabled(false); return; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java index fca1043e4..1b8b97e1e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java @@ -46,7 +46,8 @@ public class ResourceExtender extends PropertyTester { /* (non-Javadoc) * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) */ - public boolean test(Object receiver, String method, Object[] args, Object expectedValue) { + @Override + public boolean test(Object receiver, String method, Object[] args, Object expectedValue) { IResource resource = (IResource) ((IAdaptable) receiver).getAdapter(IResource.class); if (resource == null) { if (PROPERTY_MATCHES_CONTENT_TYPE.equals(method)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariableValueEditorManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariableValueEditorManager.java index c02ac4d54..b1fda8424 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariableValueEditorManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariableValueEditorManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -37,7 +37,7 @@ public class VariableValueEditorManager { * which are replaced by IVariableValueEditors as the editors * are instantiated (editors are loaded lazily, then cached). */ - private Map fEditorMap= new HashMap(); + private Map<String, Object> fEditorMap = new HashMap<String, Object>(); /** * The singleton instance of this manager. diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariablesViewModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariablesViewModelPresentation.java index 2084afc7d..eb01c255e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariablesViewModelPresentation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariablesViewModelPresentation.java @@ -20,6 +20,7 @@ public class VariablesViewModelPresentation extends DelegatingModelPresentation * * Strips out control characters and replaces them with string representations */ + @Override public String getText(Object element) { StringBuffer string= new StringBuffer(); StringTokenizer tokenizer= new StringTokenizer(super.getText(element), "\b\f\n\r\t\\", true); //$NON-NLS-1$ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/WorkingDirectoryStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/WorkingDirectoryStatusHandler.java index 8b257588d..94e4cede3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/WorkingDirectoryStatusHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/WorkingDirectoryStatusHandler.java @@ -24,9 +24,11 @@ public class WorkingDirectoryStatusHandler implements IStatusHandler { /** * @see IStatusHandler#handleStatus(IStatus, Object) */ + @Override public Object handleStatus(IStatus status, Object source) { final boolean[] result = new boolean[1]; DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() { + @Override public void run() { String title= DebugUIMessages.WorkingDirectoryStatusHandler_Eclipse_Runtime_1; String message= DebugUIMessages.WorkingDirectoryStatusHandler_0; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java index 1e4de1297..0a7e13f05 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -68,6 +68,7 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose(){ fSelection= null; } @@ -75,6 +76,7 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action){ if (action.isEnabled()) { IStructuredSelection selection = getSelection(); @@ -93,16 +95,18 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate final MultiStatus status= new MultiStatus(DebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, getStatusMessage(), null); BusyIndicator.showWhile(Display.getCurrent(), new Runnable() { + @Override public void run() { - Iterator selectionIter = selection.iterator(); + Iterator<?> selectionIter = selection.iterator(); while (selectionIter.hasNext()) { Object element= selectionIter.next(); try { // Action's enablement could have been changed since // it was last enabled. Check that the action is still // enabled before running the action. - if (isEnabledFor(element)) + if (isEnabledFor(element)) { doAction(element); + } } catch (DebugException e) { status.merge(e.getStatus()); } @@ -130,6 +134,7 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection s) { boolean wasInitialized= initialize(action, s); if (!wasInitialized) { @@ -202,6 +207,7 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fViewPart = view; } @@ -295,7 +301,7 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate if (selection.size() == 0) { return false; } - Iterator itr= selection.iterator(); + Iterator<?> itr = selection.iterator(); while (itr.hasNext()) { Object element= itr.next(); if (!isEnabledFor(element)) { @@ -317,6 +323,7 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } @@ -324,6 +331,7 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractRemoveAllActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractRemoveAllActionDelegate.java index 67b9f5250..c32ae9b09 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractRemoveAllActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractRemoveAllActionDelegate.java @@ -43,6 +43,7 @@ public abstract class AbstractRemoveAllActionDelegate implements IViewActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { fAction = null; } @@ -50,6 +51,7 @@ public abstract class AbstractRemoveAllActionDelegate implements IViewActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; } @@ -66,6 +68,7 @@ public abstract class AbstractRemoveAllActionDelegate implements IViewActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } @@ -73,6 +76,7 @@ public abstract class AbstractRemoveAllActionDelegate implements IViewActionDele /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { initialize(); update(); @@ -81,6 +85,7 @@ public abstract class AbstractRemoveAllActionDelegate implements IViewActionDele /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { initialize(); update(); @@ -111,6 +116,7 @@ public abstract class AbstractRemoveAllActionDelegate implements IViewActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection s) { // do nothing } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java index 5008a7331..ebe3fbc8c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -70,6 +70,7 @@ public abstract class AbstractSelectionActionDelegate implements IViewActionDele * * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { fSelection = null; } @@ -77,6 +78,7 @@ public abstract class AbstractSelectionActionDelegate implements IViewActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection s) { if (s instanceof IStructuredSelection) { IStructuredSelection ss = (IStructuredSelection) s; @@ -115,6 +117,7 @@ public abstract class AbstractSelectionActionDelegate implements IViewActionDele * * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { setView(view); fProgressService = (IWorkbenchSiteProgressService) view.getAdapter(IWorkbenchSiteProgressService.class); @@ -184,7 +187,7 @@ public abstract class AbstractSelectionActionDelegate implements IViewActionDele if (selection.size() == 0) { return false; } - Iterator itr = selection.iterator(); + Iterator<?> itr = selection.iterator(); while (itr.hasNext()) { Object element = itr.next(); if (!isEnabledFor(element)) { @@ -207,6 +210,7 @@ public abstract class AbstractSelectionActionDelegate implements IViewActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } @@ -214,6 +218,7 @@ public abstract class AbstractSelectionActionDelegate implements IViewActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { setAction(action); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java index b1378b869..8de05528a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,9 +11,9 @@ package org.eclipse.debug.internal.ui.actions; -import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.List; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.debug.core.ILaunch; @@ -33,6 +33,8 @@ import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.SelectionListenerAction; +import com.ibm.icu.text.MessageFormat; + /** * Adds the selected launch configuration to the launch favorites. */ @@ -54,6 +56,7 @@ public class AddToFavoritesAction extends SelectionListenerAction { /** * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { setLaunchConfiguration(null); setMode(null); @@ -83,7 +86,7 @@ public class AddToFavoritesAction extends SelectionListenerAction { setGroup(group); setLaunchConfiguration(configuration); setMode(launch.getLaunchMode()); - setText(MessageFormat.format(ActionMessages.AddToFavoritesAction_1, new String[]{DebugUIPlugin.removeAccelerators(getGroup().getLabel())})); + setText(MessageFormat.format(ActionMessages.AddToFavoritesAction_1, new Object[] { DebugUIPlugin.removeAccelerators(getGroup().getLabel()) })); } } } @@ -99,7 +102,7 @@ public class AddToFavoritesAction extends SelectionListenerAction { if (getGroup() != null) { try { - List groups = config.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List)null); + List<String> groups = config.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List<String>) null); if (groups != null) { return !groups.contains(getGroup().getIdentifier()); } @@ -163,14 +166,16 @@ public class AddToFavoritesAction extends SelectionListenerAction { /** * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { final CoreException[] ex = new CoreException[1]; BusyIndicator.showWhile(DebugUIPlugin.getStandardDisplay(), new Runnable() { + @Override public void run() { try { - List list = getLaunchConfiguration().getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List)null); + List<String> list = getLaunchConfiguration().getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List<String>) null); if (list == null) { - list = new ArrayList(); + list = new ArrayList<String>(); } list.add(getGroup().getIdentifier()); ILaunchConfigurationWorkingCopy copy = getLaunchConfiguration().getWorkingCopy(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java index f5e90fd4a..be528d019 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java @@ -37,10 +37,12 @@ public class CollapseAllAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { fViewer.collapseAll(); } + @Override public void update() { setEnabled( fViewer.getInput() != null && fViewer.getChildCount(TreePath.EMPTY) > 0 ); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java index 61161732c..d2721208b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.debug.internal.ui.actions; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -45,6 +44,7 @@ public class ConfigureColumnsAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { return ((IColumnPresentation)inputElement).getAvailableColumns(); } @@ -52,12 +52,14 @@ public class ConfigureColumnsAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -65,12 +67,13 @@ public class ConfigureColumnsAction extends Action implements IUpdate { class ColumnLabelProvider extends LabelProvider { - private Map fImages = new HashMap(); + private Map<ImageDescriptor, Image> fImages = new HashMap<ImageDescriptor, Image>(); + @Override public Image getImage(Object element) { ImageDescriptor imageDescriptor = fViewer.getColumnPresentation().getImageDescriptor((String)element); if (imageDescriptor != null) { - Image image = (Image) fImages.get(imageDescriptor); + Image image = fImages.get(imageDescriptor); if (image == null) { image = imageDescriptor.createImage(); fImages.put(imageDescriptor, image); @@ -80,15 +83,15 @@ public class ConfigureColumnsAction extends Action implements IUpdate { return null; } + @Override public String getText(Object element) { return fViewer.getColumnPresentation().getHeader((String)element); } + @Override public void dispose() { super.dispose(); - Iterator iterator = fImages.values().iterator(); - while (iterator.hasNext()) { - Image image = (Image) iterator.next(); + for (Image image : fImages.values()) { image.dispose(); } fImages.clear(); @@ -108,6 +111,7 @@ public class ConfigureColumnsAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IUpdate#update() */ + @Override public void update() { setEnabled(fViewer.isShowColumns()); } @@ -115,6 +119,7 @@ public class ConfigureColumnsAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { ListSelectionDialog dialog = new ListSelectionDialog( fViewer.getControl().getShell(), @@ -124,7 +129,7 @@ public class ConfigureColumnsAction extends Action implements IUpdate { ActionMessages.ConfigureColumnsAction_1); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONFIGURE_COLUMNS_DIALOG); String[] visibleColumns = fViewer.getVisibleColumns(); - List initialSelection = new ArrayList(visibleColumns.length); + List<String> initialSelection = new ArrayList<String>(visibleColumns.length); for (int i = 0; i < visibleColumns.length; i++) { initialSelection.add(visibleColumns[i]); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java index 7e5ee495a..8a46b096f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java @@ -31,6 +31,7 @@ public class DebugLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.RelaunchLastAction#getMode() */ + @Override public String getMode() { return ILaunchManager.DEBUG_MODE; } @@ -38,6 +39,7 @@ public class DebugLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getLaunchGroupId() */ + @Override public String getLaunchGroupId() { return IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP; } @@ -45,6 +47,7 @@ public class DebugLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.RelaunchLastAction#getText() */ + @Override protected String getText() { if(LaunchingResourceManager.isContextLaunchEnabled()) { return ActionMessages.DebugLastAction_1; @@ -57,6 +60,7 @@ public class DebugLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.RelaunchLastAction#getTooltipText() */ + @Override protected String getTooltipText() { return IInternalDebugCoreConstants.EMPTY_STRING; } @@ -64,6 +68,7 @@ public class DebugLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getCommandId() */ + @Override protected String getCommandId() { return "org.eclipse.debug.ui.commands.DebugLast"; //$NON-NLS-1$ } @@ -71,6 +76,7 @@ public class DebugLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getDescription() */ + @Override protected String getDescription() { if(LaunchingResourceManager.isContextLaunchEnabled()) { return ActionMessages.DebugLastAction_2; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java index 8edf58c1a..0bfbb4b55 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,6 @@ package org.eclipse.debug.internal.ui.actions; -import com.ibm.icu.text.MessageFormat; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.debug.core.DebugPlugin; @@ -30,6 +29,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.SelectionListenerAction; +import com.ibm.icu.text.MessageFormat; + /** * Opens the launch configuration dialog on a single launch configuration, based * on the the launch associated with the selected element. @@ -52,6 +53,7 @@ public class EditLaunchConfigurationAction extends SelectionListenerAction { /** * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { setLaunchConfiguration(null); setMode(null); @@ -90,7 +92,7 @@ public class EditLaunchConfigurationAction extends SelectionListenerAction { setLaunchConfiguration(configuration); setMode(launch.getLaunchMode()); setIsTerminated(launch.isTerminated()); - setText(MessageFormat.format(ActionMessages.EditLaunchConfigurationAction_1, new String[]{configuration.getName()})); + setText(MessageFormat.format(ActionMessages.EditLaunchConfigurationAction_1, new Object[] { configuration.getName() })); ImageDescriptor descriptor = null; try { descriptor = DebugPluginImages.getImageDescriptor(configuration.getType().getIdentifier()); @@ -137,6 +139,7 @@ public class EditLaunchConfigurationAction extends SelectionListenerAction { /** * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { ILaunchGroup group = DebugUITools.getLaunchGroup(getLaunchConfiguration(), getMode()); if (group != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ExecutionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ExecutionAction.java index 8ffc08db5..d6659102c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ExecutionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ExecutionAction.java @@ -36,6 +36,7 @@ public abstract class ExecutionAction implements IActionDelegate2 { /** * @see IActionDelegate2#runWithEvent(IAction, Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } @@ -63,18 +64,21 @@ public abstract class ExecutionAction implements IActionDelegate2 { /** * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { } /** * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { } /** * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { ILaunchConfiguration configuration = getLaunchConfigurationManager().getLastLaunch(fLaunchGroupIdentifier); if (configuration == null) { @@ -87,6 +91,7 @@ public abstract class ExecutionAction implements IActionDelegate2 { /** * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchConfigurationAction.java index 2eb957e54..e318c0b53 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchConfigurationAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -41,7 +41,8 @@ public class LaunchConfigurationAction extends Action { * @param image the image for the action */ public LaunchConfigurationAction(ILaunchConfiguration config, String mode, String text, ImageDescriptor image, int accelerator) { - super(MessageFormat.format(ActionMessages.LaunchConfigurationAction_0, new String[] {Integer.toString(accelerator), text}), image); + super(MessageFormat.format(ActionMessages.LaunchConfigurationAction_0, new Object[] { + Integer.toString(accelerator), text }), image); fConfig = config; fMode = mode; } @@ -57,6 +58,7 @@ public class LaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { DebugUITools.launch(fConfig, fMode); } @@ -64,6 +66,7 @@ public class LaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(Event event) { if ((event.stateMask & SWT.MOD1) > 0) { try { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchShortcutAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchShortcutAction.java index 5affdaa8a..ff296338c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchShortcutAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchShortcutAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -63,6 +63,7 @@ public class LaunchShortcutAction extends Action { * * @see IAction#run() */ + @Override public void run() { IStructuredSelection ss = SelectedResourceManager.getDefault().getCurrentSelection(); Object o = ss.getFirstElement(); @@ -77,19 +78,20 @@ public class LaunchShortcutAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(Event event) { if ((event.stateMask & SWT.MOD1) > 0) { - Set types = fShortcut.getAssociatedConfigurationTypes(); + Set<String> types = fShortcut.getAssociatedConfigurationTypes(); if(!types.isEmpty()) { LaunchingResourceManager lrm = DebugUIPlugin.getDefault().getLaunchingResourceManager(); IStructuredSelection selection = SelectedResourceManager.getDefault().getCurrentSelection(); - ArrayList shortcuts = new ArrayList(); + ArrayList<LaunchShortcutExtension> shortcuts = new ArrayList<LaunchShortcutExtension>(); shortcuts.add(fShortcut); IResource resource = SelectedResourceManager.getDefault().getSelectedResource(); if(resource == null) { resource = lrm.getLaunchableResource(shortcuts, selection); } - List configs = lrm.getParticipatingLaunchConfigurations(selection, resource, shortcuts, fMode); + List<ILaunchConfiguration> configs = lrm.getParticipatingLaunchConfigurations(selection, resource, shortcuts, fMode); LaunchConfigurationManager lcm = DebugUIPlugin.getDefault().getLaunchConfigurationManager(); ILaunchConfigurationType type = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType((String) types.toArray()[0]); String groupid = null; @@ -100,7 +102,7 @@ public class LaunchShortcutAction extends Action { ILaunchConfiguration config = lcm.getMRUConfiguration(configs, group, resource); if(config == null) { if(configs.size() > 0) { - config = (ILaunchConfiguration) configs.get(0); + config = configs.get(0); } } if(config != null) { @@ -140,7 +142,7 @@ public class LaunchShortcutAction extends Action { if (expression == null) { enabled = !ss.isEmpty(); } else { - List list = ss.toList(); + List<?> list = ss.toList(); IEvaluationContext context = DebugUIPlugin.createEvaluationContext(list); context.addVariable("selection", list); //$NON-NLS-1$ enabled = fShortcut.evalEnablementExpression(context, expression); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchablePropertyTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchablePropertyTester.java index 6a28f7d3f..02c03f87f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchablePropertyTester.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchablePropertyTester.java @@ -27,6 +27,7 @@ public class LaunchablePropertyTester extends PropertyTester { /** * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) */ + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { if ("launchable".equals(property)) { //$NON-NLS-1$ if (DebugUIPlugin.getDefault().getLaunchConfigurationManager().launchModeAvailable((String)expectedValue)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java index 9e1c56ea9..fcb010d7c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java @@ -32,6 +32,7 @@ public class ProfileLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.RelaunchLastAction#getMode() */ + @Override public String getMode() { return ILaunchManager.PROFILE_MODE; } @@ -39,6 +40,7 @@ public class ProfileLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getLaunchGroupId() */ + @Override public String getLaunchGroupId() { return IDebugUIConstants.ID_PROFILE_LAUNCH_GROUP; } @@ -46,6 +48,7 @@ public class ProfileLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.RelaunchLastAction#getText() */ + @Override protected String getText() { if(LaunchingResourceManager.isContextLaunchEnabled()) { return ActionMessages.ProfileLastAction_1; @@ -58,6 +61,7 @@ public class ProfileLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.RelaunchLastAction#getTooltipText() */ + @Override protected String getTooltipText() { return IInternalDebugCoreConstants.EMPTY_STRING; } @@ -65,6 +69,7 @@ public class ProfileLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getCommandId() */ + @Override protected String getCommandId() { return "org.eclipse.debug.ui.commands.ProfileLast"; //$NON-NLS-1$ } @@ -72,6 +77,7 @@ public class ProfileLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getDescription() */ + @Override protected String getDescription() { if(LaunchingResourceManager.isContextLaunchEnabled()) { return ActionMessages.ProfileLastAction_2; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java index ca18fc06b..3b0f1a059 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,6 +28,7 @@ public class RelaunchActionDelegate extends AbstractDebugActionDelegate { /** * @see AbstractDebugActionDelegate#doAction(Object) */ + @Override protected void doAction(Object object) { ILaunch launch= DebugUIPlugin.getLaunch(object); if (launch != null) { @@ -45,6 +46,7 @@ public class RelaunchActionDelegate extends AbstractDebugActionDelegate { /** * @see AbstractDebugActionDelegate#isEnabledFor(Object) */ + @Override protected boolean isEnabledFor(Object element) { ILaunch launch= DebugUIPlugin.getLaunch(element); return launch != null && launch.getLaunchConfiguration() != null && LaunchConfigurationManager.isVisible(launch.getLaunchConfiguration()); @@ -53,12 +55,13 @@ public class RelaunchActionDelegate extends AbstractDebugActionDelegate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.AbstractDebugActionDelegate#getTargetSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected IStructuredSelection getTargetSelection(IStructuredSelection s) { if (s.isEmpty()) { return s; } - Set dups = new LinkedHashSet(); - Iterator iterator = s.iterator(); + Set<ILaunch> dups = new LinkedHashSet<ILaunch>(); + Iterator<?> iterator = s.iterator(); while (iterator.hasNext()) { Object object = iterator.next(); ILaunch launch = DebugUIPlugin.getLaunch(object); @@ -73,6 +76,7 @@ public class RelaunchActionDelegate extends AbstractDebugActionDelegate { /** * @see AbstractDebugActionDelegate#getErrorDialogMessage() */ + @Override protected String getErrorDialogMessage() { return ActionMessages.RelaunchActionDelegate_Launch_Failed_1; } @@ -80,6 +84,7 @@ public class RelaunchActionDelegate extends AbstractDebugActionDelegate { /** * @see AbstractDebugActionDelegate#getStatusMessage() */ + @Override protected String getStatusMessage() { return ActionMessages.RelaunchActionDelegate_An_exception_occurred_while_launching_2; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java index 785dbfa49..b89310db6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,6 +27,7 @@ import org.eclipse.debug.internal.ui.contextlaunching.ContextRunner; * @deprecated This class has been promoted to API as <code>org.eclipse.debug.ui.actions.RelaunchLastAction</code>. Clients
* should discontinue use of this class and use the new API version.
*/
+@Deprecated
public abstract class RelaunchLastAction extends org.eclipse.debug.ui.actions.RelaunchLastAction {
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllTerminatedAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllTerminatedAction.java index 70a349337..7f542dbf3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllTerminatedAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllTerminatedAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,6 +29,7 @@ public class RemoveAllTerminatedAction extends AbstractRemoveAllActionDelegate i /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#isEnabled() */ + @Override protected boolean isEnabled() { ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches(); if (launches != null) { @@ -42,7 +43,7 @@ public class RemoveAllTerminatedAction extends AbstractRemoveAllActionDelegate i } public static void removeTerminatedLaunches(ILaunch[] elements) { - List removed = new ArrayList(); + List<ILaunch> removed = new ArrayList<ILaunch>(); for (int i = 0; i < elements.length; i++) { ILaunch launch = elements[i]; if (launch.isTerminated()) { @@ -51,13 +52,14 @@ public class RemoveAllTerminatedAction extends AbstractRemoveAllActionDelegate i } if (!removed.isEmpty()) { ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager(); - manager.removeLaunches((ILaunch[])removed.toArray(new ILaunch[removed.size()])); + manager.removeLaunches(removed.toArray(new ILaunch[removed.size()])); } } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#initialize() */ + @Override protected void initialize() { DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this); } @@ -65,6 +67,7 @@ public class RemoveAllTerminatedAction extends AbstractRemoveAllActionDelegate i /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#dispose() */ + @Override public void dispose() { super.dispose(); DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this); @@ -73,18 +76,21 @@ public class RemoveAllTerminatedAction extends AbstractRemoveAllActionDelegate i /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesAdded(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesChanged(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesRemoved(ILaunch[] launches) { IAction action = getAction(); if (action != null) { @@ -97,6 +103,7 @@ public class RemoveAllTerminatedAction extends AbstractRemoveAllActionDelegate i /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesTerminated(ILaunch[] launches) { update(); } @@ -104,6 +111,7 @@ public class RemoveAllTerminatedAction extends AbstractRemoveAllActionDelegate i /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches(); removeTerminatedLaunches(launches); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java index 0d430b362..fc047374d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -50,6 +50,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.jface.viewers.ISelection#isEmpty() */ + @Override public boolean isEmpty() { return true; } @@ -78,6 +79,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { fWindow.getPartService().removePartListener(this); fActivePart = null; @@ -87,6 +89,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { this.fWindow = window; IPartService partService = window.getPartService(); @@ -99,6 +102,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fTargetAdapter != null) { try { @@ -136,6 +140,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { // if the active part did not provide an adapter, see if the selection does if (fTargetAdapter == null && selection instanceof IStructuredSelection) { @@ -153,6 +158,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partActivated(IWorkbenchPart part) { fActivePart = part; IResource resource = (IResource) part.getAdapter(IResource.class); @@ -186,16 +192,18 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, * * @return the type of adapter this action works on */ - protected abstract Class getAdapterClass(); + protected abstract Class<?> getAdapterClass(); /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partBroughtToTop(IWorkbenchPart part) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partClosed(IWorkbenchPart part) { clearPart(part); } @@ -215,12 +223,14 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partDeactivated(IWorkbenchPart part) { clearPart(part); } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partOpened(IWorkbenchPart part) { } @@ -251,6 +261,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; } @@ -258,6 +269,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetRunToLineAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetRunToLineAction.java index ad243b984..759d55e5d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetRunToLineAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetRunToLineAction.java @@ -52,6 +52,7 @@ public class RetargetRunToLineAction extends RetargetAction { } } + @Override public void debugContextChanged(DebugContextEvent event) { contextActivated(event.getContext()); } @@ -62,6 +63,7 @@ public class RetargetRunToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { DebugUITools.getDebugContextManager().getContextService(fWindow).removeDebugContextListener(fContextListener); super.dispose(); @@ -69,6 +71,7 @@ public class RetargetRunToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { super.init(window); IDebugContextService service = DebugUITools.getDebugContextManager().getContextService(window); @@ -77,6 +80,7 @@ public class RetargetRunToLineAction extends RetargetAction { fContextListener.contextActivated(activeContext); } + @Override public void init(IAction action) { super.init(action); action.setActionDefinitionId("org.eclipse.debug.ui.commands.RunToLine"); //$NON-NLS-1$ @@ -85,6 +89,7 @@ public class RetargetRunToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#canPerformAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected boolean canPerformAction(Object target, ISelection selection, IWorkbenchPart part) { return fTargetElement != null && ((IRunToLineTarget)target).canRunToLine(part, selection, fTargetElement); @@ -93,12 +98,14 @@ public class RetargetRunToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getAdapterClass() */ - protected Class getAdapterClass() { + @Override + protected Class<IRunToLineTarget> getAdapterClass() { return IRunToLineTarget.class; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#performAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected void performAction(Object target, ISelection selection, IWorkbenchPart part) throws CoreException { ((IRunToLineTarget)target).runToLine(part, selection, fTargetElement); } @@ -106,6 +113,7 @@ public class RetargetRunToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getOperationUnavailableMessage() */ + @Override protected String getOperationUnavailableMessage() { return ActionMessages.RetargetRunToLineAction_0; } @@ -113,6 +121,7 @@ public class RetargetRunToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (fTargetElement == null) { action.setEnabled(false); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java index 3cf1daf48..f3635497d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java @@ -31,6 +31,7 @@ public class RunLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.RelaunchLastAction#getMode() */ + @Override public String getMode() { return ILaunchManager.RUN_MODE; } @@ -38,6 +39,7 @@ public class RunLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getLaunchGroupId() */ + @Override public String getLaunchGroupId() { return IDebugUIConstants.ID_RUN_LAUNCH_GROUP; } @@ -45,6 +47,7 @@ public class RunLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.RelaunchLastAction#getText() */ + @Override protected String getText() { if(LaunchingResourceManager.isContextLaunchEnabled()) { return ActionMessages.RunLastAction_1; @@ -57,6 +60,7 @@ public class RunLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.RelaunchLastAction#getTooltipText() */ + @Override protected String getTooltipText() { return IInternalDebugCoreConstants.EMPTY_STRING; } @@ -64,6 +68,7 @@ public class RunLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getCommandId() */ + @Override protected String getCommandId() { return "org.eclipse.debug.ui.commands.RunLast"; //$NON-NLS-1$ } @@ -71,6 +76,7 @@ public class RunLastAction extends RelaunchLastAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getDescription() */ + @Override protected String getDescription() { if(LaunchingResourceManager.isContextLaunchEnabled()) { return ActionMessages.RunLastAction_2; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SelectAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SelectAllAction.java index 466aa55e7..1baa069a2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SelectAllAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SelectAllAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,6 +19,7 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IViewPart; public abstract class SelectAllAction extends AbstractRemoveAllActionDelegate { @@ -28,6 +29,7 @@ public abstract class SelectAllAction extends AbstractRemoveAllActionDelegate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractSelectionActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fView = view; IDebugView debugView = (IDebugView) getView().getAdapter(IDebugView.class); @@ -43,7 +45,7 @@ public abstract class SelectAllAction extends AbstractRemoveAllActionDelegate { protected abstract String getActionId(); - private void collectExpandedAndVisible(TreeItem[] items, List result) { + private void collectExpandedAndVisible(TreeItem[] items, List<TreeItem> result) { for (int i= 0; i < items.length; i++) { TreeItem item= items[i]; result.add(item); @@ -56,16 +58,17 @@ public abstract class SelectAllAction extends AbstractRemoveAllActionDelegate { /** * @see IActionDelegate#run(IAction) */ + @Override public void run(IAction action){ if (!(getView() instanceof IDebugView)) { return; } Viewer viewer = ((IDebugView) getView()).getViewer(); if (viewer instanceof TreeViewer) { - ArrayList allVisible= new ArrayList(); + ArrayList<TreeItem> allVisible= new ArrayList<TreeItem>(); Tree tree= ((TreeViewer) viewer).getTree(); collectExpandedAndVisible(tree.getItems(), allVisible); - tree.setSelection((TreeItem[]) allVisible.toArray(new TreeItem[allVisible.size()])); + tree.setSelection(allVisible.toArray(new TreeItem[allVisible.size()])); // force viewer selection change viewer.setSelection(viewer.getSelection()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StatusInfo.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StatusInfo.java index 6263e6d98..11aa17932 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StatusInfo.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StatusInfo.java @@ -45,6 +45,7 @@ public class StatusInfo implements IStatus { /** * Returns if the status' severity is OK. */ + @Override public boolean isOK() { return fSeverity == IStatus.OK; } @@ -73,6 +74,7 @@ public class StatusInfo implements IStatus { /** * @see IStatus#getMessage */ + @Override public String getMessage() { return fStatusMessage; } @@ -118,6 +120,7 @@ public class StatusInfo implements IStatus { /* * @see IStatus#matches(int) */ + @Override public boolean matches(int severityMask) { return (fSeverity & severityMask) != 0; } @@ -126,6 +129,7 @@ public class StatusInfo implements IStatus { * Returns always <code>false</code>. * @see IStatus#isMultiStatus() */ + @Override public boolean isMultiStatus() { return false; } @@ -133,6 +137,7 @@ public class StatusInfo implements IStatus { /* * @see IStatus#getSeverity() */ + @Override public int getSeverity() { return fSeverity; } @@ -140,6 +145,7 @@ public class StatusInfo implements IStatus { /* * @see IStatus#getPlugin() */ + @Override public String getPlugin() { return DebugUIPlugin.getUniqueIdentifier(); } @@ -148,6 +154,7 @@ public class StatusInfo implements IStatus { * Returns always <code>null</code>. * @see IStatus#getException() */ + @Override public Throwable getException() { return null; } @@ -156,6 +163,7 @@ public class StatusInfo implements IStatus { * Returns always the error severity. * @see IStatus#getCode() */ + @Override public int getCode() { return fSeverity; } @@ -164,6 +172,7 @@ public class StatusInfo implements IStatus { * Returns always <code>null</code>. * @see IStatus#getChildren() */ + @Override public IStatus[] getChildren() { return new IStatus[0]; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleBreakpointsTargetManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleBreakpointsTargetManager.java index c4a99df8d..19789ebd7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleBreakpointsTargetManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleBreakpointsTargetManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2013 Wind River Systems and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,6 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.actions; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -54,6 +53,7 @@ import org.eclipse.debug.ui.actions.IToggleBreakpointsTargetManagerListener; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.IVerticalRulerInfo; import org.eclipse.jface.viewers.ISelection; @@ -80,7 +80,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM */ public static String DEFAULT_TOGGLE_TARGET_ID = "default"; //$NON-NLS-1$ - private static Set DEFAULT_TOGGLE_TARGET_ID_SET = new TreeSet(); + private static Set<String> DEFAULT_TOGGLE_TARGET_ID_SET = new TreeSet<String>(); static { DEFAULT_TOGGLE_TARGET_ID_SET.add(DEFAULT_TOGGLE_TARGET_ID); } @@ -104,7 +104,9 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @return Returns the instantiated factory specified by the class property. */ private IToggleBreakpointsTargetFactory getFactory() { - if (fFactory != null) return fFactory; + if (fFactory != null) { + return fFactory; + } try{ Object obj = fConfigElement.createExecutableExtension(IConfigurationElementConstants.CLASS); if(obj instanceof IToggleBreakpointsTargetFactory) { @@ -165,11 +167,11 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM private boolean evalEnablementExpression(IWorkbenchPart part, ISelection selection, Expression exp) { if (exp != null){ IEvaluationContext context = DebugUIPlugin.createEvaluationContext(part); - List debugContextList = getDebugContext(part).toList(); + List<Object> debugContextList = getDebugContext(part).toList(); context.addVariable(IConfigurationElementConstants.DEBUG_CONTEXT, debugContextList); if (selection instanceof IStructuredSelection) { - List selectionList = ((IStructuredSelection)selection).toList(); + List<Object> selectionList = ((IStructuredSelection) selection).toList(); context.addVariable(IConfigurationElementConstants.SELECTION, selectionList); } @@ -190,9 +192,9 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM } /** - * @return Returns an expression that represents the enablement logic for the - * breakpiont toggle target. - */ + * @return Returns an expression that represents the enablement logic + * for the breakpoint toggle target. + */ private Expression getEnablementExpression(){ if (fEnablementExpression == null) { try{ @@ -215,7 +217,8 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @param targetID ID to create toggle target for * @return The created toggle target, or null. */ - public IToggleBreakpointsTarget createToggleTarget(String targetID) { + @Override + public IToggleBreakpointsTarget createToggleTarget(String targetID) { IToggleBreakpointsTargetFactory factory = getFactory(); if (factory != null) { return factory.createToggleTarget(targetID); @@ -231,7 +234,8 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @return Set of <code>String</code> IDs for possible toggle breakpoint * targets, possibly empty */ - public Set getToggleTargets(IWorkbenchPart part, ISelection selection) { + @Override + public Set<String> getToggleTargets(IWorkbenchPart part, ISelection selection) { IToggleBreakpointsTargetFactory factory = getFactory(); if (factory != null) { return factory.getToggleTargets(part, selection); @@ -245,7 +249,8 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @param targetID toggle breakpoints target identifier * @return toggle target name */ - public String getToggleTargetName(String targetID) { + @Override + public String getToggleTargetName(String targetID) { IToggleBreakpointsTargetFactory factory = getFactory(); if (factory != null) { return factory.getToggleTargetName(targetID); @@ -259,7 +264,8 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @param targetID toggle breakpoints target identifier * @return toggle target name or <code>null</code> if none */ - public String getToggleTargetDescription(String targetID) { + @Override + public String getToggleTargetDescription(String targetID) { IToggleBreakpointsTargetFactory factory = getFactory(); if (factory != null) { return factory.getToggleTargetDescription(targetID); @@ -274,7 +280,8 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @param selection The current selection * @return a breakpoint toggle target identifier or <code>null</code> */ - public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) { + @Override + public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) { IToggleBreakpointsTargetFactory factory = getFactory(); if (factory != null) { return factory.getDefaultToggleTarget(part, selection); @@ -361,7 +368,8 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @param targetID not used * @return always returns null */ - public IToggleBreakpointsTarget createToggleTarget(String targetID) { + @Override + public IToggleBreakpointsTarget createToggleTarget(String targetID) { return null; } @@ -375,22 +383,26 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM return getToggleBreakpointsTarget(part, getSelectionElement(selection)); } - public Set getToggleTargets(IWorkbenchPart part, ISelection selection) { + @Override + public Set<String> getToggleTargets(IWorkbenchPart part, ISelection selection) { if (isEnabled(part, selection)) { return DEFAULT_TOGGLE_TARGET_ID_SET; } return Collections.EMPTY_SET; } - public String getToggleTargetName(String targetID) { + @Override + public String getToggleTargetName(String targetID) { return ActionMessages.ToggleBreakpointsTargetManager_defaultToggleTarget_name; } - public String getToggleTargetDescription(String targetID) { + @Override + public String getToggleTargetDescription(String targetID) { return ActionMessages.ToggleBreakpointsTargetManager_defaultToggleTarget_description; } - public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) { + @Override + public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) { return DEFAULT_TOGGLE_TARGET_ID; } } @@ -410,7 +422,9 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM private static ToggleBreakpointsTargetManager fgSingleton; public static ToggleBreakpointsTargetManager getDefault(){ - if (fgSingleton == null) fgSingleton = new ToggleBreakpointsTargetManager(); + if (fgSingleton == null) { + fgSingleton = new ToggleBreakpointsTargetManager(); + } return fgSingleton; } @@ -418,18 +432,18 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * Maps the IDs of toggle breakpoint targets to their instances. The target * IDs must be unique. */ - private Map fKnownFactories; + private Map<String, IToggleBreakpointsTargetFactory> fKnownFactories; /** * Maps a Set of target id's to the one target id that is preferred. */ - private Map fPreferredTargets; + private Map<Set<String>, String> fPreferredTargets; /** * Maps the IDs of toggle targets to the factory that can create them. * There can currently only be one factory for a given toggle target. */ - private Map fFactoriesByTargetID = new HashMap(); + private Map<String, IToggleBreakpointsTargetFactory> fFactoriesByTargetID = new HashMap<String, IToggleBreakpointsTargetFactory>(); /** * List of listeners to changes in the preferred toggle targets list. @@ -440,7 +454,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * Initializes the collection of known factories from extension point contributions. */ private void initializeFactories() { - fKnownFactories = new LinkedHashMap(); + fKnownFactories = new LinkedHashMap<String, IToggleBreakpointsTargetFactory>(); fKnownFactories.put(DEFAULT_TOGGLE_TARGET_ID, new ToggleBreakpointsTargetAdapterFactory()); IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_TOGGLE_BREAKPOINTS_TARGET_FACTORIES); IConfigurationElement[] elements = ep.getConfigurationElements(); @@ -475,13 +489,13 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @return The factories enabled for the part and selection or an empty * collection. */ - private Set getEnabledFactories(IWorkbenchPart part, ISelection selection) { - if (fKnownFactories == null) initializeFactories(); - - Set set = new HashSet(); - for (Iterator itr = fKnownFactories.keySet().iterator(); itr.hasNext(); ) { - String id = (String)itr.next(); - IToggleBreakpointsTargetFactory factory = (IToggleBreakpointsTargetFactory)fKnownFactories.get(id); + private Set<IToggleBreakpointsTargetFactory> getEnabledFactories(IWorkbenchPart part, ISelection selection) { + if (fKnownFactories == null) { + initializeFactories(); + } + Set<IToggleBreakpointsTargetFactory> set = new HashSet<IToggleBreakpointsTargetFactory>(); + for (Entry<String, IToggleBreakpointsTargetFactory> entry : fKnownFactories.entrySet()) { + IToggleBreakpointsTargetFactory factory = entry.getValue(); if (factory instanceof ToggleTargetFactory && ((ToggleTargetFactory)factory).isEnabled(part, selection)) { set.add(factory); @@ -502,14 +516,10 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @param selection active selection in part * @return Set of toggle target IDs or an empty set */ - private Set getEnabledTargetIDs(Collection factoriesToQuery, IWorkbenchPart part, ISelection selection){ - Set idsForSelection = new TreeSet(); - Iterator factoriesItr = factoriesToQuery.iterator(); - while (factoriesItr.hasNext()) { - IToggleBreakpointsTargetFactory factory = (IToggleBreakpointsTargetFactory) factoriesItr.next(); - Iterator targetIDsItr = factory.getToggleTargets(part, selection).iterator(); - while (targetIDsItr.hasNext()) { - String targetID = (String) targetIDsItr.next(); + private Set<String> getEnabledTargetIDs(Set<IToggleBreakpointsTargetFactory> factoriesToQuery, IWorkbenchPart part, ISelection selection) { + Set<String> idsForSelection = new TreeSet<String>(); + for (IToggleBreakpointsTargetFactory factory : factoriesToQuery) { + for(String targetID : factory.getToggleTargets(part, selection)) { fFactoriesByTargetID.put(targetID, factory); idsForSelection.add(targetID); } @@ -517,19 +527,28 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM return idsForSelection; } - public Set getEnabledToggleBreakpointsTargetIDs(IWorkbenchPart part, ISelection selection) { + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetManager# + * getEnabledToggleBreakpointsTargetIDs(org.eclipse.ui.IWorkbenchPart, + * org.eclipse.jface.viewers.ISelection) + */ + @Override + public Set<String> getEnabledToggleBreakpointsTargetIDs(IWorkbenchPart part, ISelection selection) { return getEnabledTargetIDs(getEnabledFactories(part, selection), part, selection); } - public String getPreferredToggleBreakpointsTargetID(IWorkbenchPart part, ISelection selection) { - Set factories = getEnabledFactories(part, selection); - Set possibleIDs = getEnabledTargetIDs(factories, part, selection); + @Override + public String getPreferredToggleBreakpointsTargetID(IWorkbenchPart part, ISelection selection) { + Set<IToggleBreakpointsTargetFactory> factories = getEnabledFactories(part, selection); + Set<String> possibleIDs = getEnabledTargetIDs(factories, part, selection); return chooseToggleTargetIDInSet(possibleIDs, part, selection); } - public IToggleBreakpointsTarget getToggleBreakpointsTarget(IWorkbenchPart part, ISelection selection) { + @Override + public IToggleBreakpointsTarget getToggleBreakpointsTarget(IWorkbenchPart part, ISelection selection) { String id = getPreferredToggleBreakpointsTargetID(part, selection); - IToggleBreakpointsTargetFactory factory = (IToggleBreakpointsTargetFactory)fFactoriesByTargetID.get(id); + IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(id); if (factory != null) { if (DEFAULT_TOGGLE_TARGET_ID.equals(id)) { return ((ToggleBreakpointsTargetAdapterFactory)factory).createDefaultToggleTarget(part, selection); @@ -540,27 +559,31 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM return null; } - public String getToggleBreakpointsTargetName(String id) { - IToggleBreakpointsTargetFactory factory = (IToggleBreakpointsTargetFactory)fFactoriesByTargetID.get(id); + @Override + public String getToggleBreakpointsTargetName(String id) { + IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(id); if (factory != null) { return factory.getToggleTargetName(id); } return null; } - public String getToggleBreakpointsTargetDescription(String id) { - IToggleBreakpointsTargetFactory factory = (IToggleBreakpointsTargetFactory)fFactoriesByTargetID.get(id); + @Override + public String getToggleBreakpointsTargetDescription(String id) { + IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(id); if (factory != null) { return factory.getToggleTargetDescription(id); } return null; } - public void addChangedListener(IToggleBreakpointsTargetManagerListener listener) { + @Override + public void addChangedListener(IToggleBreakpointsTargetManagerListener listener) { fChangedListners.add(listener); } - public void removeChangedListener(IToggleBreakpointsTargetManagerListener listener) { + @Override + public void removeChangedListener(IToggleBreakpointsTargetManagerListener listener) { fChangedListners.remove(listener); } @@ -574,12 +597,8 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM */ private void storePreferredTargets() { StringBuffer buffer= new StringBuffer(); - Iterator iter = fPreferredTargets.entrySet().iterator(); - while (iter.hasNext()) { - Entry entry = (Entry) iter.next(); - Iterator setIter = ((Set)entry.getKey()).iterator(); - while (setIter.hasNext()) { - String currentID = (String) setIter.next(); + for (Entry<Set<String>, String> entry : fPreferredTargets.entrySet()) { + for (String currentID : entry.getKey()) { buffer.append(currentID); buffer.append(','); } @@ -600,7 +619,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @see #storePreferredTargets() */ private void loadPreferredTargets() { - fPreferredTargets = new HashMap(); + fPreferredTargets = new HashMap<Set<String>, String>(); String preferenceValue = Platform.getPreferencesService().getString( DebugUIPlugin.getUniqueIdentifier(), PREF_TARGETS, @@ -614,7 +633,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM String token = entryTokenizer.nextToken(); int valueStart = token.indexOf(':'); StringTokenizer keyTokenizer = new StringTokenizer(token.substring(0,valueStart),","); //$NON-NLS-1$ - Set keys = new TreeSet(); + Set<String> keys = new TreeSet<String>(); while (keyTokenizer.hasMoreTokens()){ keys.add(keyTokenizer.nextToken()); } @@ -629,15 +648,19 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @param possibleIDs The set of possible IDs * @param preferredID The preferred ID in the set. */ - public void setPreferredTarget(Set possibleIDs, String preferredID) { - if (possibleIDs == null) return; + public void setPreferredTarget(Set<String> possibleIDs, String preferredID) { + if (possibleIDs == null) { + return; + } - if (fKnownFactories == null) initializeFactories(); + if (fKnownFactories == null) { + initializeFactories(); + } if (fPreferredTargets == null){ loadPreferredTargets(); } - String currentKey = (String)fPreferredTargets.get(possibleIDs); + String currentKey = fPreferredTargets.get(possibleIDs); if (currentKey == null || !currentKey.equals(preferredID)){ fPreferredTargets.put(possibleIDs, preferredID); storePreferredTargets(); @@ -651,11 +674,11 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @param possibleTargetIDs The set of possible toggle target IDs * @return The preferred ID or null */ - private String getUserPreferredTarget(Set possibleTargetIDs){ + private String getUserPreferredTarget(Set<String> possibleTargetIDs) { if (fPreferredTargets == null){ loadPreferredTargets(); } - return (String)fPreferredTargets.get(possibleTargetIDs); + return fPreferredTargets.get(possibleTargetIDs); } /** @@ -668,7 +691,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM * @param selection The active selection to use with toggle target * @return The preferred toggle target ID or null */ - private String chooseToggleTargetIDInSet(Set possibleTargetIDs, IWorkbenchPart part, ISelection selection){ + private String chooseToggleTargetIDInSet(Set<String> possibleTargetIDs, IWorkbenchPart part, ISelection selection) { if (possibleTargetIDs == null || possibleTargetIDs.isEmpty()){ return null; } @@ -677,10 +700,9 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM if (preferredID == null){ // If there is no preferred pane already set, check the factories to see there is a default target - Iterator possibleIDsIterator = possibleTargetIDs.iterator(); + Iterator<String> possibleIDsIterator = possibleTargetIDs.iterator(); while (preferredID == null && possibleIDsIterator.hasNext()) { - IToggleBreakpointsTargetFactory factory = (IToggleBreakpointsTargetFactory) - fFactoriesByTargetID.get(possibleIDsIterator.next()); + IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(possibleIDsIterator.next()); if (factory != null) { preferredID = factory.getDefaultToggleTarget(part, selection); } @@ -689,7 +711,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM // Also make sure that the default is among the available toggle target // IDs (bug 352502). if (preferredID == null || !possibleTargetIDs.contains(preferredID)) { - preferredID= (String)possibleTargetIDs.iterator().next(); + preferredID= possibleTargetIDs.iterator().next(); } setPreferredTarget(possibleTargetIDs, preferredID); } @@ -716,11 +738,11 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM IAnnotationModel annotationModel = provider.getAnnotationModel(input); if (annotationModel != null) { IDocument document = provider.getDocument(input); - Iterator iterator = annotationModel.getAnnotationIterator(); + Iterator<Annotation> iterator = annotationModel.getAnnotationIterator(); while (iterator.hasNext()) { - Object object = iterator.next(); - if (object instanceof SimpleMarkerAnnotation) { - SimpleMarkerAnnotation markerAnnotation = (SimpleMarkerAnnotation) object; + Annotation annot = iterator.next(); + if (annot instanceof SimpleMarkerAnnotation) { + SimpleMarkerAnnotation markerAnnotation = (SimpleMarkerAnnotation) annot; IMarker marker = markerAnnotation.getMarker(); try { if (marker.isSubtypeOf(IBreakpoint.BREAKPOINT_MARKER)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleFilterAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleFilterAction.java index b2ba81cd0..2257d2553 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleFilterAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleFilterAction.java @@ -32,6 +32,7 @@ public abstract class ToggleFilterAction extends Action { */ private ViewerFilter fViewerFilter; + @Override public void run() { valueChanged(isChecked()); } @@ -44,6 +45,7 @@ public abstract class ToggleFilterAction extends Action { return; } BusyIndicator.showWhile(getViewer().getControl().getDisplay(), new Runnable() { + @Override public void run() { if (on) { ViewerFilter filter= getViewerFilter(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ViewManagementAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ViewManagementAction.java index 7bd91d627..32233132e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ViewManagementAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ViewManagementAction.java @@ -24,6 +24,7 @@ public class ViewManagementAction extends ActionDelegate implements IViewActionD /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { SWTFactory.showPreferencePage("org.eclipse.debug.ui.ViewManagementPreferencePage"); //$NON-NLS-1$ } @@ -31,6 +32,7 @@ public class ViewManagementAction extends ActionDelegate implements IViewActionD /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AbstractBreakpointsViewAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AbstractBreakpointsViewAction.java index b396f7922..10df93524 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AbstractBreakpointsViewAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AbstractBreakpointsViewAction.java @@ -31,32 +31,37 @@ public abstract class AbstractBreakpointsViewAction implements IViewActionDelega /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ - public void init(IViewPart view) { + @Override + public void init(IViewPart view) { fView= (BreakpointsView) view; } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ - public void dispose() { + @Override + public void dispose() { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ - public void init(IAction action) { + @Override + public void init(IAction action) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ - public void runWithEvent(IAction action, Event event) { + @Override + public void runWithEvent(IAction action, Event event) { run(action); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java index 243c140bb..f6fe350d6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java @@ -33,6 +33,7 @@ public class AdvancedGroupBreakpointsByAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { if (isChecked()) { GroupBreakpointsByDialog dialog = new GroupBreakpointsByDialog(fView); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointWorkingSetAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointWorkingSetAction.java index fc6baaa51..40fae5d62 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointWorkingSetAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointWorkingSetAction.java @@ -28,14 +28,16 @@ public abstract class BreakpointWorkingSetAction extends AbstractBreakpointsView /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ - public void selectionChanged(IAction action, ISelection selection) { + @Override + public void selectionChanged(IAction action, ISelection selection) { update(); } /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ - public void init(IViewPart view) { + @Override + public void init(IViewPart view) { super.init(view); DebugUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this); } @@ -43,14 +45,16 @@ public abstract class BreakpointWorkingSetAction extends AbstractBreakpointsView /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ - public void dispose() { + @Override + public void dispose() { DebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this); super.dispose(); } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ - public void init(IAction action) { + @Override + public void init(IAction action) { fAction = action; super.init(action); update(); @@ -59,7 +63,8 @@ public abstract class BreakpointWorkingSetAction extends AbstractBreakpointsView /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(IInternalDebugUIConstants.MEMENTO_BREAKPOINT_WORKING_SET_NAME)) { update(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ClearDefaultBreakpointGroupAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ClearDefaultBreakpointGroupAction.java index 70446b413..3e3704a00 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ClearDefaultBreakpointGroupAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ClearDefaultBreakpointGroupAction.java @@ -21,11 +21,13 @@ public class ClearDefaultBreakpointGroupAction extends BreakpointWorkingSetActio /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ - public void run(IAction action) { + @Override + public void run(IAction action) { BreakpointSetOrganizer.setDefaultWorkingSet(null); } - protected void update() { + @Override + protected void update() { fAction.setEnabled(BreakpointSetOrganizer.getDefaultWorkingSet() != null); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsActionDelegate.java index a37a520d9..5f084105c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsActionDelegate.java @@ -41,6 +41,7 @@ public class CopyBreakpointsActionDelegate extends VirtualCopyToClipboardActionD /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.VirtualCopyToClipboardActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { super.run(action); LocalSelectionTransfer.getTransfer().setSelection(getSelection()); @@ -60,6 +61,7 @@ public class CopyBreakpointsActionDelegate extends VirtualCopyToClipboardActionD /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.AbstractDebugActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { super.init(view); DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this); @@ -68,6 +70,7 @@ public class CopyBreakpointsActionDelegate extends VirtualCopyToClipboardActionD /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.AbstractDebugActionDelegate#dispose() */ + @Override public void dispose() { DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this); super.dispose(); @@ -76,25 +79,27 @@ public class CopyBreakpointsActionDelegate extends VirtualCopyToClipboardActionD /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[]) */ + @Override public void breakpointsAdded(IBreakpoint[] breakpoints) { } /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) */ + @Override public void breakpointsRemoved(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { // remove deleted breakpoints from drag/drop clipboard if (fStamp == LocalSelectionTransfer.getTransfer().getSelectionSetTime()) { ISelection selection = LocalSelectionTransfer.getTransfer().getSelection(); if (selection instanceof IStructuredSelection) { - Set removed = new HashSet(); + Set<IBreakpoint> removed = new HashSet<IBreakpoint>(); for (int i = 0; i < breakpoints.length; i++) { removed.add(breakpoints[i]); } boolean modified = false; - List remain = new ArrayList(); + List<Object> remain = new ArrayList<Object>(); IStructuredSelection ss = (IStructuredSelection) selection; - Iterator iterator = ss.iterator(); + Iterator<?> iterator = ss.iterator(); while (iterator.hasNext()) { Object bp = iterator.next(); if (removed.contains(bp)) { @@ -115,6 +120,7 @@ public class CopyBreakpointsActionDelegate extends VirtualCopyToClipboardActionD /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) */ + @Override public void breakpointsChanged(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/EditBreakpointGroupAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/EditBreakpointGroupAction.java index 6bcce2775..8303511e3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/EditBreakpointGroupAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/EditBreakpointGroupAction.java @@ -36,6 +36,7 @@ public class EditBreakpointGroupAction extends AbstractBreakpointsViewAction { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IWorkingSetEditWizard editWizard = PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetEditWizard(fSet); WizardDialog dialog = new WizardDialog(DebugUIPlugin.getShell(), editWizard); @@ -45,6 +46,7 @@ public class EditBreakpointGroupAction extends AbstractBreakpointsViewAction { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection sel) { fSet = null; if (sel instanceof IStructuredSelection) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java index 40bd2a9ae..647fc0276 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java @@ -42,7 +42,8 @@ public class GroupBreakpointsAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ - public void run() { + @Override + public void run() { if (isChecked()) { if (fOrganzier == null) { fView.setBreakpointOrganizers(null); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java index 6f5a29e2b..717ff3d54 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -43,19 +43,22 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { } /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#dispose() */ - public void dispose() { + @Override + public void dispose() { } /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control) */ - public Menu getMenu(Control parent) { + @Override + public Menu getMenu(Control parent) { // Never called return null; } @@ -63,9 +66,11 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu) */ - public Menu getMenu(Menu parent) { + @Override + public Menu getMenu(Menu parent) { Menu menu = new Menu(parent); menu.addMenuListener(new MenuAdapter() { + @Override public void menuShown(MenuEvent e) { Menu m = (Menu)e.widget; MenuItem[] items = m.getItems(); @@ -107,9 +112,9 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl item.fill(menu, -1); // Add actions for each contributed organizer - List actions = getActions(accel); + List<IAction> actions = getActions(accel); accel = accel + actions.size(); - Iterator actionIter = actions.iterator(); + Iterator<IAction> actionIter = actions.iterator(); while (actionIter.hasNext()) { GroupBreakpointsAction bpAction = (GroupBreakpointsAction) actionIter.next(); bpAction.setChecked(bpAction.getOrganizer().equals(organizer)); @@ -126,8 +131,8 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl item.fill(menu, -1); } - public List getActions(int accel) { - List actions= new ArrayList(); + public List<IAction> getActions(int accel) { + List<IAction> actions = new ArrayList<IAction>(); IBreakpointOrganizer[] organizers = BreakpointOrganizerManager.getDefault().getOrganizers(); for (int i = 0; i < organizers.length; i++) { IBreakpointOrganizer organizer = organizers[i]; @@ -160,6 +165,7 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (action != fAction) { action.setMenuCreator(this); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java index 49c776dd6..19adea573 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2009 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -67,7 +67,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { private TreeViewer fSelectedViewer; private SelectedOrganizerProvider fSelectedOrganizersProvider= new SelectedOrganizerProvider(); - private List fResult= new ArrayList(); + private List<Object> fResult = new ArrayList<Object>(); private Button fAddButton; private Button fRemoveButton; @@ -79,6 +79,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { * dialog. */ private SelectionAdapter fSelectionListener= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { Object source= e.getSource(); if (source == fAddButton) { @@ -102,6 +103,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { ILabelProvider labelProvider= new BreakpointOrganzierLabelProvider(); @@ -135,6 +137,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Control contents = super.createContents(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getDialogArea(), IDebugHelpContextIds.GROUP_BREAKPOINTS_DIALOG); @@ -186,11 +189,13 @@ public class GroupBreakpointsByDialog extends TrayDialog { table.setLayoutData(new GridData(GridData.FILL_BOTH)); table.setFont(parent.getFont()); fAvailableViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { handleAddPressed(); } }); fAvailableViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { updateAddButton(); } @@ -227,11 +232,13 @@ public class GroupBreakpointsByDialog extends TrayDialog { tree.setLayoutData(new GridData(GridData.FILL_BOTH)); tree.setFont(parent.getFont()); fSelectedViewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { + @Override + public void doubleClick(DoubleClickEvent event) { handleRemovePressed(); } }); fSelectedViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { updateSelectedButtons(); } @@ -265,12 +272,13 @@ public class GroupBreakpointsByDialog extends TrayDialog { * @return the breakpoint organizers chosen by the user */ public IBreakpointOrganizer[] getOrganizers() { - return (IBreakpointOrganizer[]) fResult.toArray(new IBreakpointOrganizer[fResult.size()]); + return fResult.toArray(new IBreakpointOrganizer[fResult.size()]); } /** * When the user presses OK, convert the tree selection into a list. */ + @Override protected void okPressed() { Object[] factories= fSelectedOrganizersProvider.getElements(null); while (factories.length > 0) { @@ -290,7 +298,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { if (selection.size() < 1) { return; } - Iterator iter= selection.iterator(); + Iterator<?> iter = selection.iterator(); while (iter.hasNext()) { fSelectedOrganizersProvider.addSelected((IBreakpointOrganizer) iter.next()); } @@ -306,7 +314,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { if (selection.size() < 1) { return; } - Iterator iter= selection.iterator(); + Iterator<?> iter = selection.iterator(); while (iter.hasNext()) { fAvailableOrganizersProvider.addAvailable((IBreakpointOrganizer) iter.next()); } @@ -318,7 +326,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { */ public void handleMoveUpPressed() { IStructuredSelection selection = (IStructuredSelection) fSelectedViewer.getSelection(); - Iterator iter = selection.iterator(); + Iterator<?> iter = selection.iterator(); while (iter.hasNext()) { fSelectedOrganizersProvider.moveUp(iter.next()); } @@ -402,19 +410,22 @@ public class GroupBreakpointsByDialog extends TrayDialog { * that are available but not currently selected. */ private class AvailableOrganizersProvider implements IStructuredContentProvider { - protected List availableOrganziers= new ArrayList(); + protected List<IBreakpointOrganizer> availableOrganziers = new ArrayList<IBreakpointOrganizer>(); public void addAvailable(IBreakpointOrganizer organizer) { availableOrganziers.add(organizer); fSelectedOrganizersProvider.selectedOrganizers.remove(organizer); } + @Override public Object[] getElements(Object inputElement) { return availableOrganziers.toArray(); } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } @@ -425,7 +436,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { * appear in the breakpoints view. */ private class SelectedOrganizerProvider implements ITreeContentProvider { - protected List selectedOrganizers= new ArrayList(); + protected List<Object> selectedOrganizers = new ArrayList<Object>(); public void addSelected(IBreakpointOrganizer organizer) { selectedOrganizers.add(organizer); @@ -448,6 +459,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { } } + @Override public Object[] getChildren(Object parentElement) { // A factory's "child" is the next factory in the list int index = selectedOrganizers.indexOf(parentElement); @@ -457,6 +469,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { return new Object[0]; } + @Override public Object getParent(Object element) { // A factory's "parent" is the factory before it int index = selectedOrganizers.indexOf(element); @@ -466,6 +479,7 @@ public class GroupBreakpointsByDialog extends TrayDialog { return selectedOrganizers.get(index - 1); } + @Override public boolean hasChildren(Object element) { // A factory has "children" if there are more // factories after it. @@ -473,14 +487,17 @@ public class GroupBreakpointsByDialog extends TrayDialog { return index != -1 && index < selectedOrganizers.size() - 1; } + @Override public Object[] getElements(Object inputElement) { if (selectedOrganizers.size() > 0) { return new Object[] { selectedOrganizers.get(0) }; } return new Object[0]; } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } @@ -489,19 +506,21 @@ public class GroupBreakpointsByDialog extends TrayDialog { * Label provider which provides text and images for breakpoint container factories */ private class BreakpointOrganzierLabelProvider extends LabelProvider { - private HashMap fImageCache= new HashMap(); + private HashMap<ImageDescriptor, Image> fImageCache = new HashMap<ImageDescriptor, Image>(); + @Override public String getText(Object element) { if (element instanceof IBreakpointOrganizer) { return ((IBreakpointOrganizer) element).getLabel(); } return super.getText(element); } + @Override public Image getImage(Object element) { if (element instanceof IBreakpointOrganizer) { ImageDescriptor imageDescriptor = ((IBreakpointOrganizer) element).getImageDescriptor(); if (imageDescriptor != null) { - Image image = (Image) fImageCache.get(imageDescriptor); + Image image = fImageCache.get(imageDescriptor); if (image == null) { image= imageDescriptor.createImage(); if (image != null) { @@ -513,10 +532,10 @@ public class GroupBreakpointsByDialog extends TrayDialog { } return super.getImage(element); } + @Override public void dispose() { - Iterator imageIter = fImageCache.values().iterator(); - while (imageIter.hasNext()) { - ((Image) imageIter.next()).dispose(); + for (Image image : fImageCache.values()) { + image.dispose(); } super.dispose(); } @@ -527,7 +546,8 @@ public class GroupBreakpointsByDialog extends TrayDialog { * * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ - protected void configureShell(Shell shell) { + @Override + protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_7); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java index aca918e3c..be8b4a7ba 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -48,7 +48,7 @@ public class PasteBreakpointsAction extends BreakpointSelectionAction { * @return the actual target of the paste action */ private Object getTarget() { - List selectedNonResources = getSelectedNonResources(); + List<?> selectedNonResources = getSelectedNonResources(); if (selectedNonResources.size() == 1) { Object target = selectedNonResources.get(0); if (target instanceof IBreakpointContainer) { @@ -61,7 +61,8 @@ public class PasteBreakpointsAction extends BreakpointSelectionAction { /** * Implementation of method defined on <code>IAction</code>. */ - public void run() { + @Override + public void run() { if (getBreakpointsView().canPaste(getTarget(), LocalSelectionTransfer.getTransfer().getSelection())) { getBreakpointsView().performPaste(getTarget(), LocalSelectionTransfer.getTransfer().getSelection()); } @@ -71,7 +72,8 @@ public class PasteBreakpointsAction extends BreakpointSelectionAction { * Returns whether this action should be enabled based on the selection * in the clipboard. Only updates when the breakpoints view has focus. */ - protected boolean updateSelection(IStructuredSelection selection) { + @Override + protected boolean updateSelection(IStructuredSelection selection) { // can't paste into "Others" (only move) Object target = getTarget(); if (target instanceof IBreakpointContainer) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java index a1d94b34c..d47318f68 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java @@ -44,7 +44,8 @@ public class RemoveFromWorkingSetAction extends BreakpointSelectionAction { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ - public void run() { + @Override + public void run() { if (fBreakpoints != null) { for (int i = 0; i < fBreakpoints.length; i++) { fBreakpoints[i].container.getOrganizer().removeBreakpoint(fBreakpoints[i].breakpoint, fBreakpoints[i].container.getCategory()); @@ -68,7 +69,7 @@ public class RemoveFromWorkingSetAction extends BreakpointSelectionAction { * @return */ protected BreakpointSetElement[] getRemovableBreakpoints(IStructuredSelection selection) { - List res = new ArrayList(); + List<BreakpointSetElement> res = new ArrayList<BreakpointSetElement>(); if (selection instanceof ITreeSelection) { ITreeSelection tSel = (ITreeSelection)selection; @@ -99,13 +100,14 @@ public class RemoveFromWorkingSetAction extends BreakpointSelectionAction { } } } - return (BreakpointSetElement[])res.toArray(new BreakpointSetElement[res.size()]); + return res.toArray(new BreakpointSetElement[res.size()]); } /* (non-Javadoc) * @see org.eclipse.jface.action.Action#isEnabled() */ - public boolean isEnabled() { + @Override + public boolean isEnabled() { if(fBreakpoints != null) { return fBreakpoints.length > 0; } @@ -115,7 +117,8 @@ public class RemoveFromWorkingSetAction extends BreakpointSelectionAction { /* (non-Javadoc) * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ - protected boolean updateSelection(IStructuredSelection selection) { + @Override + protected boolean updateSelection(IStructuredSelection selection) { fBreakpoints = getRemovableBreakpoints(selection); return fBreakpoints.length > 0; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SelectBreakpointWorkingsetDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SelectBreakpointWorkingsetDialog.java index a0ea4f275..8f34d4dc9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SelectBreakpointWorkingsetDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SelectBreakpointWorkingsetDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -48,10 +48,12 @@ public class SelectBreakpointWorkingsetDialog extends AbstractDebugCheckboxSelec /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugCheckboxSelectionDialog#addViewerListeners(org.eclipse.jface.viewers.StructuredViewer) */ + @Override protected void addViewerListeners(StructuredViewer viewer) { CheckboxTableViewer checkViewer = getCheckBoxTableViewer(); if (checkViewer != null){ checkViewer.addCheckStateListener(new ICheckStateListener(){ + @Override public void checkStateChanged(CheckStateChangedEvent event) { getCheckBoxTableViewer().setCheckedElements(new Object[] {event.getElement()}); getButton(IDialogConstants.OK_ID).setEnabled(true); @@ -66,18 +68,19 @@ public class SelectBreakpointWorkingsetDialog extends AbstractDebugCheckboxSelec */ private IWorkingSet[] getBreakpointWorkingSets() { IWorkingSet[] ws = PlatformUI.getWorkbench().getWorkingSetManager().getAllWorkingSets(); - ArrayList list = new ArrayList(); + ArrayList<IWorkingSet> list = new ArrayList<IWorkingSet>(); for(int i = 0; i < ws.length; i++) { if(IDebugUIConstants.BREAKPOINT_WORKINGSET_ID.equals(ws[i].getId())) { list.add(ws[i]); } } - return (IWorkingSet[]) list.toArray(new IWorkingSet[list.size()]); + return list.toArray(new IWorkingSet[list.size()]); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerInput() */ + @Override protected Object getViewerInput() { return fWorkingSetList; } @@ -85,6 +88,7 @@ public class SelectBreakpointWorkingsetDialog extends AbstractDebugCheckboxSelec /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getDialogSettingsId() */ + @Override protected String getDialogSettingsId() { return SETTINGS_ID; } @@ -92,6 +96,7 @@ public class SelectBreakpointWorkingsetDialog extends AbstractDebugCheckboxSelec /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SELECT_DEFAULT_WORKINGSET_DIALOG; } @@ -99,6 +104,7 @@ public class SelectBreakpointWorkingsetDialog extends AbstractDebugCheckboxSelec /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerLabel() */ + @Override protected String getViewerLabel() { return BreakpointGroupMessages.SelectBreakpointWorkingsetDialog_0; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SetDefaultBreakpointGroupAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SetDefaultBreakpointGroupAction.java index f30a8cefb..a1d7400eb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SetDefaultBreakpointGroupAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SetDefaultBreakpointGroupAction.java @@ -25,7 +25,8 @@ public class SetDefaultBreakpointGroupAction extends AbstractBreakpointsViewActi /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ - public void run(IAction action) { + @Override + public void run(IAction action) { SelectBreakpointWorkingsetDialog sbwsd = new SelectBreakpointWorkingsetDialog(DebugUIPlugin.getShell()); sbwsd.setTitle(BreakpointGroupMessages.SetDefaultBreakpointGroupAction_0); IWorkingSet workingSet = BreakpointSetOrganizer.getDefaultWorkingSet(); @@ -40,6 +41,7 @@ public class SetDefaultBreakpointGroupAction extends AbstractBreakpointsViewActi /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ - public void selectionChanged(IAction action, ISelection selection) {} + @Override + public void selectionChanged(IAction action, ISelection selection) {} } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ToggleDefaultGroupAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ToggleDefaultGroupAction.java index f236c2e1a..ab11a7580 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ToggleDefaultGroupAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ToggleDefaultGroupAction.java @@ -29,7 +29,8 @@ public class ToggleDefaultGroupAction extends AbstractBreakpointsViewAction { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ - public void run(IAction action) { + @Override + public void run(IAction action) { IWorkingSet defaultWorkingSet = BreakpointSetOrganizer.getDefaultWorkingSet(); IWorkingSet set = null; if (!fSelectedSet.equals(defaultWorkingSet)) { @@ -41,7 +42,8 @@ public class ToggleDefaultGroupAction extends AbstractBreakpointsViewAction { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ - public void selectionChanged(IAction action, ISelection sel) { + @Override + public void selectionChanged(IAction action, ISelection sel) { fSelectedSet = null; if (sel instanceof IStructuredSelection) { IStructuredSelection selection = (IStructuredSelection) sel; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/WorkingSetsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/WorkingSetsAction.java index 341770534..e9f1b2524 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/WorkingSetsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/WorkingSetsAction.java @@ -24,7 +24,8 @@ public class WorkingSetsAction extends AbstractBreakpointsViewAction { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ - public void run(IAction action) { + @Override + public void run(IAction action) { IWorkingSetSelectionDialog selectionDialog = PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetSelectionDialog( DebugUIPlugin.getShell(), false, diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/AccessWatchpointToggleAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/AccessWatchpointToggleAction.java index 64b98f929..eaf4a3efc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/AccessWatchpointToggleAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/AccessWatchpointToggleAction.java @@ -21,21 +21,24 @@ public class AccessWatchpointToggleAction extends ModifyWatchpointAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.ModifyWatchpointAction#isEnabled(org.eclipse.debug.core.model.IWatchpoint) */ - protected boolean isEnabled(IWatchpoint watchpoint) { + @Override + protected boolean isEnabled(IWatchpoint watchpoint) { return watchpoint.supportsAccess(); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.ModifyWatchpointAction#toggleWatchpoint(org.eclipse.debug.core.model.IWatchpoint, boolean) */ - protected void toggleWatchpoint(IWatchpoint watchpoint, boolean b) throws CoreException { + @Override + protected void toggleWatchpoint(IWatchpoint watchpoint, boolean b) throws CoreException { watchpoint.setAccess(b); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.ModifyWatchpointAction#isChecked(org.eclipse.debug.core.model.IWatchpoint) */ - protected boolean isChecked(IWatchpoint watchpoint) { + @Override + protected boolean isChecked(IWatchpoint watchpoint) { try { return watchpoint.isAccess(); } catch (CoreException e) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java index ebd76f4a3..557f84eff 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java @@ -41,6 +41,7 @@ public class BreakpointsCollapseAllAction implements IViewActionDelegate, IActio /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fView = (AbstractDebugView) view; IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)fView.getViewer(); @@ -53,6 +54,7 @@ public class BreakpointsCollapseAllAction implements IViewActionDelegate, IActio /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { ((TreeViewer) fView.getViewer()).collapseAll(); } @@ -60,12 +62,14 @@ public class BreakpointsCollapseAllAction implements IViewActionDelegate, IActio /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { ITreeModelViewer viewer = (ITreeModelViewer)fView.getViewer(); if (viewer != null) { @@ -77,6 +81,7 @@ public class BreakpointsCollapseAllAction implements IViewActionDelegate, IActio /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; action.setActionDefinitionId(CollapseAllHandler.COMMAND_ID); @@ -85,20 +90,25 @@ public class BreakpointsCollapseAllAction implements IViewActionDelegate, IActio /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } - public void viewerUpdatesBegin() { + @Override + public void viewerUpdatesBegin() { } - public void viewerUpdatesComplete() { + @Override + public void viewerUpdatesComplete() { } - public void updateStarted(IViewerUpdate update) { + @Override + public void updateStarted(IViewerUpdate update) { } - public void updateComplete(IViewerUpdate update) { + @Override + public void updateComplete(IViewerUpdate update) { if (!update.isCanceled()) { if (TreePath.EMPTY.equals(update.getElementPath())) { update(); @@ -113,7 +123,8 @@ public class BreakpointsCollapseAllAction implements IViewActionDelegate, IActio } } - public void modelChanged(IModelDelta delta, IModelProxy proxy) { + @Override + public void modelChanged(IModelDelta delta, IModelProxy proxy) { update(); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsExpandAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsExpandAllAction.java index a22be2fa8..ed7834a04 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsExpandAllAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsExpandAllAction.java @@ -35,13 +35,15 @@ public class BreakpointsExpandAllAction implements IViewActionDelegate, IActionD private IAction fAction; private BreakpointsView fView; - public void init(IAction action) { + @Override + public void init(IAction action) { fAction = action; } /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fView = (BreakpointsView) view; IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)fView.getViewer(); @@ -51,13 +53,15 @@ public class BreakpointsExpandAllAction implements IViewActionDelegate, IActionD } } - public void runWithEvent(IAction action, Event event) { + @Override + public void runWithEvent(IAction action, Event event) { run(action); } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { fView.expandAllElementsInViewer(); } @@ -65,11 +69,13 @@ public class BreakpointsExpandAllAction implements IViewActionDelegate, IActionD /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { } - public void dispose() { + @Override + public void dispose() { ITreeModelViewer viewer = (ITreeModelViewer)fView.getViewer(); if (viewer != null) { viewer.removeViewerUpdateListener(this); @@ -77,16 +83,20 @@ public class BreakpointsExpandAllAction implements IViewActionDelegate, IActionD } } - public void viewerUpdatesBegin() { + @Override + public void viewerUpdatesBegin() { } - public void viewerUpdatesComplete() { + @Override + public void viewerUpdatesComplete() { } - public void updateStarted(IViewerUpdate update) { + @Override + public void updateStarted(IViewerUpdate update) { } - public void updateComplete(IViewerUpdate update) { + @Override + public void updateComplete(IViewerUpdate update) { if (!update.isCanceled()) { if (TreePath.EMPTY.equals(update.getElementPath())) { update(); @@ -101,7 +111,8 @@ public class BreakpointsExpandAllAction implements IViewActionDelegate, IActionD } } - public void modelChanged(IModelDelta delta, IModelProxy proxy) { + @Override + public void modelChanged(IModelDelta delta, IModelProxy proxy) { update(); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DeleteWorkingsetsMessageDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DeleteWorkingsetsMessageDialog.java index 90b1748ab..8ba1149f9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DeleteWorkingsetsMessageDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DeleteWorkingsetsMessageDialog.java @@ -62,6 +62,7 @@ public class DeleteWorkingsetsMessageDialog extends MessageDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.MessageDialog#createCustomArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createCustomArea(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); comp.setLayout(new GridLayout()); @@ -70,7 +71,9 @@ public class DeleteWorkingsetsMessageDialog extends MessageDialog { fDeleteWS.setText(ActionMessages.DeleteWorkingsetsMessageDialog_0); fDeleteWS.setFont(font); fDeleteWS.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { getButton(0).setEnabled(fDeleteWS.getSelection() || fDeleteBPS.getSelection()); } @@ -80,7 +83,9 @@ public class DeleteWorkingsetsMessageDialog extends MessageDialog { fDeleteBPS.setText(ActionMessages.DeleteWorkingsetsMessageDialog_1); fDeleteBPS.setFont(font); fDeleteBPS.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { getButton(0).setEnabled(fDeleteWS.getSelection() || fDeleteBPS.getSelection()); } @@ -94,6 +99,7 @@ public class DeleteWorkingsetsMessageDialog extends MessageDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.MessageDialog#buttonPressed(int) */ + @Override protected void buttonPressed(int buttonId) { if(buttonId == OK) { fDeleteBreakpoints = fDeleteBPS.getSelection(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DisableBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DisableBreakpointsAction.java index 7c6428415..9479fdd85 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DisableBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DisableBreakpointsAction.java @@ -17,6 +17,7 @@ public class DisableBreakpointsAction extends EnableBreakpointsAction { * If this action can enable breakpoints * @return always <code>false</code> */ + @Override protected boolean isEnableAction() { return false; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/EnableBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/EnableBreakpointsAction.java index 250897166..bcd689102 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/EnableBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/EnableBreakpointsAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -56,6 +56,7 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen /** * @see IViewActionDelegate#init(IViewPart) */ + @Override public void init(IViewPart view) { setView(view); DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this); @@ -77,6 +78,7 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IStructuredSelection selection= getSelection(); final int size= selection.size(); @@ -84,9 +86,10 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen return; } - final Iterator itr= selection.iterator(); + final Iterator<?> itr = selection.iterator(); final MultiStatus ms= new MultiStatus(DebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, ActionMessages.EnableBreakpointAction_Enable_breakpoint_s__failed_2, null); IWorkspaceRunnable runnable = new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) { while (itr.hasNext()) { Object element= itr.next(); @@ -137,6 +140,7 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { setAction(action); if (!(selection instanceof IStructuredSelection)) { @@ -144,7 +148,7 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen } IStructuredSelection sel= (IStructuredSelection)selection; - Iterator itr= sel.iterator(); + Iterator<?> itr = sel.iterator(); boolean allEnabled= true; boolean allDisabled= true; while (itr.hasNext()) { @@ -209,12 +213,14 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen /** * @see IBreakpointsListener#breakpointsAdded(IBreakpoint[]) */ + @Override public void breakpointsAdded(IBreakpoint[] breakpoints) { } /** * @see IBreakpointsListener#breakpointsRemoved(IBreakpoint[], IMarkerDelta[]) */ + @Override public void breakpointsRemoved(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { asynchUpdate(); } @@ -222,6 +228,7 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen /** * @see IBreakpointsListener#breakpointsChanged(IBreakpoint[], IMarkerDelta[]) */ + @Override public void breakpointsChanged(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { asynchUpdate(); } @@ -239,6 +246,7 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen return; } Runnable r= new Runnable() { + @Override public void run() { IWorkbenchWindow ww= getView().getViewSite().getPage().getWorkbenchWindow(); if (ww == null) { @@ -265,18 +273,21 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen /** * @see IPartListener#partActivated(IWorkbenchPart) */ + @Override public void partActivated(IWorkbenchPart part) { } /** * @see IPartListener#partBroughtToTop(IWorkbenchPart) */ + @Override public void partBroughtToTop(IWorkbenchPart part) { } /** * @see IPartListener#partClosed(IWorkbenchPart) */ + @Override public void partClosed(IWorkbenchPart part) { if (part.equals(getView())) { dispose(); @@ -286,12 +297,14 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen /** * @see IPartListener#partDeactivated(IWorkbenchPart) */ + @Override public void partDeactivated(IWorkbenchPart part) { } /** * @see IPartListener#partOpened(IWorkbenchPart) */ + @Override public void partOpened(IWorkbenchPart part) { } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/LinkBreakpointsWithDebugViewAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/LinkBreakpointsWithDebugViewAction.java index e7b5454c8..70febda6b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/LinkBreakpointsWithDebugViewAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/LinkBreakpointsWithDebugViewAction.java @@ -31,6 +31,7 @@ public class LinkBreakpointsWithDebugViewAction implements IViewActionDelegate { /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fView= (BreakpointsView) view; } @@ -38,6 +39,7 @@ public class LinkBreakpointsWithDebugViewAction implements IViewActionDelegate { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { fView.setTrackSelection(action.isChecked()); } @@ -45,6 +47,7 @@ public class LinkBreakpointsWithDebugViewAction implements IViewActionDelegate { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (fAction == null) { action.setChecked(fView.isTrackingSelection()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModificationWatchpointToggleAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModificationWatchpointToggleAction.java index 632590e69..2f25ee1d7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModificationWatchpointToggleAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModificationWatchpointToggleAction.java @@ -21,21 +21,24 @@ public class ModificationWatchpointToggleAction extends ModifyWatchpointAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.ModifyWatchpointAction#isEnabled(org.eclipse.debug.core.model.IWatchpoint) */ - protected boolean isEnabled(IWatchpoint watchpoint) { + @Override + protected boolean isEnabled(IWatchpoint watchpoint) { return watchpoint.supportsModification(); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.ModifyWatchpointAction#toggleWatchpoint(org.eclipse.debug.core.model.IWatchpoint, boolean) */ - protected void toggleWatchpoint(IWatchpoint watchpoint, boolean b) throws CoreException { + @Override + protected void toggleWatchpoint(IWatchpoint watchpoint, boolean b) throws CoreException { watchpoint.setModification(b); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.ModifyWatchpointAction#isChecked(org.eclipse.debug.core.model.IWatchpoint) */ - protected boolean isChecked(IWatchpoint watchpoint) { + @Override + protected boolean isChecked(IWatchpoint watchpoint) { try { return watchpoint.isModification(); } catch (CoreException e) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModifyWatchpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModifyWatchpointAction.java index bb5818f43..0f146617b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModifyWatchpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModifyWatchpointAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,10 +34,11 @@ public abstract class ModifyWatchpointAction implements IObjectActionDelegate, I /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ - public void run(IAction action) { + @Override + public void run(IAction action) { try { if (fWatchpoints != null) { - Iterator iterator = fWatchpoints.iterator(); + Iterator<?> iterator = fWatchpoints.iterator(); while (iterator.hasNext()) { IWatchpoint watchpoint = (IWatchpoint)iterator.next(); toggleWatchpoint(watchpoint, action.isChecked()); @@ -61,17 +62,19 @@ public abstract class ModifyWatchpointAction implements IObjectActionDelegate, I /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ - public void setActivePart(IAction action, IWorkbenchPart targetPart) { + @Override + public void setActivePart(IAction action, IWorkbenchPart targetPart) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ - public void selectionChanged(IAction action, ISelection selection) { + @Override + public void selectionChanged(IAction action, ISelection selection) { if (selection instanceof IStructuredSelection) { fWatchpoints = (IStructuredSelection) selection; if (!selection.isEmpty()) { - Iterator iterator = fWatchpoints.iterator(); + Iterator<?> iterator = fWatchpoints.iterator(); while (iterator.hasNext()) { Object next = iterator.next(); if (next instanceof IWatchpoint) { @@ -109,20 +112,23 @@ public abstract class ModifyWatchpointAction implements IObjectActionDelegate, I /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ - public void init(IAction action) { + @Override + public void init(IAction action) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ - public void dispose() { + @Override + public void dispose() { fWatchpoints = null; } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ - public void runWithEvent(IAction action, Event event) { + @Override + public void runWithEvent(IAction action, Event event) { run(action); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/OpenBreakpointMarkerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/OpenBreakpointMarkerAction.java index 32f01bf9f..85947e71d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/OpenBreakpointMarkerAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/OpenBreakpointMarkerAction.java @@ -48,6 +48,7 @@ public class OpenBreakpointMarkerAction extends SelectionProviderAction { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { IWorkbenchWindow dwindow= DebugUIPlugin.getActiveWorkbenchWindow(); if (dwindow == null) { @@ -83,6 +84,7 @@ public class OpenBreakpointMarkerAction extends SelectionProviderAction { /* (non-Javadoc) * @see org.eclipse.ui.actions.SelectionProviderAction#selectionChanged(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public void selectionChanged(IStructuredSelection sel) { if (sel.size() == 1) { breakpoint = (IBreakpoint)DebugPlugin.getAdapter(sel.getFirstElement(), IBreakpoint.class); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveAllBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveAllBreakpointsAction.java index 930aaabdd..ba21d1a6c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveAllBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveAllBreakpointsAction.java @@ -51,6 +51,7 @@ public class RemoveAllBreakpointsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#isEnabled() */ + @Override protected boolean isEnabled() { return DebugPlugin.getDefault().getBreakpointManager().hasBreakpoints(); } @@ -58,6 +59,7 @@ public class RemoveAllBreakpointsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[]) */ + @Override public void breakpointsAdded(IBreakpoint[] breakpoints) { update(); } @@ -65,12 +67,14 @@ public class RemoveAllBreakpointsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) */ + @Override public void breakpointsChanged(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { } /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) */ + @Override public void breakpointsRemoved(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { if (getAction() != null) { update(); @@ -80,6 +84,7 @@ public class RemoveAllBreakpointsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#initialize() */ + @Override protected void initialize() { DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this); } @@ -87,6 +92,7 @@ public class RemoveAllBreakpointsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this); super.dispose(); @@ -95,6 +101,7 @@ public class RemoveAllBreakpointsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { final IBreakpointManager breakpointManager= DebugPlugin.getDefault().getBreakpointManager(); final IBreakpoint[] breakpoints = breakpointManager.getBreakpoints(); @@ -120,6 +127,7 @@ public class RemoveAllBreakpointsAction extends AbstractRemoveAllActionDelegate } if (proceed) { new Job(ActionMessages.RemoveAllBreakpointsAction_2) { + @Override protected IStatus run(IProgressMonitor monitor) { try { DebugUITools.deleteBreakpoints(breakpoints, fShell, monitor); @@ -137,6 +145,7 @@ public class RemoveAllBreakpointsAction extends AbstractRemoveAllActionDelegate * @see org.eclipse.debug.internal.ui.actions.AbstractRemoveAllActionDelegate#init(org.eclipse.ui.IViewPart) * @since 3.7 */ + @Override public void init(IViewPart view) { super.init(view); fShell= view.getSite().getShell(); @@ -146,6 +155,7 @@ public class RemoveAllBreakpointsAction extends AbstractRemoveAllActionDelegate * @see org.eclipse.debug.internal.ui.actions.AbstractRemoveAllActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) * @since 3.7 */ + @Override public void init(IWorkbenchWindow window) { super.init(window); fShell= window.getShell(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java index 1bd6031bd..ca66a268c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -49,17 +49,19 @@ public class RemoveBreakpointAction extends AbstractSelectionActionDelegate { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IStructuredSelection selection = getSelection(); if (selection.isEmpty()) { return; } - final Iterator itr= selection.iterator(); + final Iterator<?> itr = selection.iterator(); final CoreException[] exception= new CoreException[1]; IWorkspaceRunnable runnable= new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) { - ArrayList breakpointsToDelete = new ArrayList(); - ArrayList groupsToDelete = new ArrayList(); + ArrayList<IBreakpoint> breakpointsToDelete = new ArrayList<IBreakpoint>(); + ArrayList<IWorkingSet> groupsToDelete = new ArrayList<IWorkingSet>(); boolean deleteAll = false; boolean deleteContainer = false; boolean prompted = false; @@ -120,13 +122,14 @@ public class RemoveBreakpointAction extends AbstractSelectionActionDelegate { } } } - final IBreakpoint[] breakpoints = (IBreakpoint[]) breakpointsToDelete.toArray(new IBreakpoint[0]); - final IWorkingSet[] sets = (IWorkingSet[])groupsToDelete.toArray(new IWorkingSet[groupsToDelete.size()]); + final IBreakpoint[] breakpoints = breakpointsToDelete.toArray(new IBreakpoint[0]); + final IWorkingSet[] sets = groupsToDelete.toArray(new IWorkingSet[groupsToDelete.size()]); if(breakpoints.length > 0) { ((BreakpointsView)getView()).preserveSelection(getSelection()); } new Job(ActionMessages.RemoveBreakpointAction_2) { - protected IStatus run(IProgressMonitor pmonitor) { + @Override + protected IStatus run(IProgressMonitor pmonitor) { try { Shell shell= getView() != null ? getView().getSite().getShell() : null; DebugUITools.deleteBreakpoints(breakpoints, shell, pmonitor); @@ -161,6 +164,7 @@ public class RemoveBreakpointAction extends AbstractSelectionActionDelegate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.AbstractSelectionActionDelegate#isEnabledFor(java.lang.Object) */ + @Override protected boolean isEnabledFor(Object element) { if (element instanceof IBreakpointContainer) { if(((IBreakpointContainer)element).getCategory() instanceof WorkingSetCategory) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java index be62a45ae..ef20e9e9d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,11 +36,13 @@ public abstract class RetargetBreakpointAction extends RetargetAction implements /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getAdapterClass() */ - protected Class getAdapterClass() { + @Override + protected Class<?> getAdapterClass() { return IToggleBreakpointsTarget.class; } - protected Object getAdapter(IAdaptable adaptable) { + @Override + protected Object getAdapter(IAdaptable adaptable) { IToggleBreakpointsTargetManager manager = DebugUITools.getToggleBreakpointsTargetManager(); IWorkbenchPart activePart = getActivePart(); if (activePart != null) { @@ -49,27 +51,32 @@ public abstract class RetargetBreakpointAction extends RetargetAction implements return null; } - public void init(IWorkbenchWindow window) { + @Override + public void init(IWorkbenchWindow window) { super.init(window); DebugUITools.getToggleBreakpointsTargetManager().addChangedListener(this); } - public void init(IAction action) { + @Override + public void init(IAction action) { super.init(action); DebugUITools.getToggleBreakpointsTargetManager().addChangedListener(this); } - public void dispose() { + @Override + public void dispose() { DebugUITools.getToggleBreakpointsTargetManager().removeChangedListener(this); super.dispose(); } - public void selectionChanged(IAction action, ISelection selection) { + @Override + public void selectionChanged(IAction action, ISelection selection) { fAction = action; super.selectionChanged(action, selection); } - public void preferredTargetsChanged() { + @Override + public void preferredTargetsChanged() { if (fAction != null) { IWorkbenchPart activePart = getActivePart(); if (activePart != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetMethodBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetMethodBreakpointAction.java index 9c2e6ce8d..c9a01b9e7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetMethodBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetMethodBreakpointAction.java @@ -26,18 +26,21 @@ public class RetargetMethodBreakpointAction extends RetargetBreakpointAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetBreakpointAction#performAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected void performAction(Object target, ISelection selection, IWorkbenchPart part) throws CoreException { ((IToggleBreakpointsTarget)target).toggleMethodBreakpoints(part, selection); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetBreakpointAction#canPerformAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected boolean canPerformAction(Object target, ISelection selection, IWorkbenchPart part) { return ((IToggleBreakpointsTarget)target).canToggleMethodBreakpoints(part, selection); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getOperationUnavailableMessage() */ + @Override protected String getOperationUnavailableMessage() { return Messages.RetargetMethodBreakpointAction_0; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetToggleBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetToggleBreakpointAction.java index 201b1c86b..22a018e26 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetToggleBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetToggleBreakpointAction.java @@ -27,6 +27,7 @@ public class RetargetToggleBreakpointAction extends RetargetBreakpointAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetBreakpointAction#performAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected void performAction(Object target, ISelection selection, IWorkbenchPart part) throws CoreException { if (target instanceof IToggleBreakpointsTargetExtension) { IToggleBreakpointsTargetExtension ext = (IToggleBreakpointsTargetExtension) target; @@ -38,6 +39,7 @@ public class RetargetToggleBreakpointAction extends RetargetBreakpointAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetBreakpointAction#canPerformAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected boolean canPerformAction(Object target, ISelection selection, IWorkbenchPart part) { if (target instanceof IToggleBreakpointsTargetExtension) { IToggleBreakpointsTargetExtension ext = (IToggleBreakpointsTargetExtension) target; @@ -49,6 +51,7 @@ public class RetargetToggleBreakpointAction extends RetargetBreakpointAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getOperationUnavailableMessage() */ + @Override protected String getOperationUnavailableMessage() { return Messages.RetargetToggleBreakpointAction_0; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetToggleLineBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetToggleLineBreakpointAction.java index a117419ed..58d5ed5c0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetToggleLineBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetToggleLineBreakpointAction.java @@ -26,18 +26,21 @@ public class RetargetToggleLineBreakpointAction extends RetargetBreakpointAction /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetBreakpointAction#performAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected void performAction(Object target, ISelection selection, IWorkbenchPart part) throws CoreException { ((IToggleBreakpointsTarget)target).toggleLineBreakpoints(part, selection); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetBreakpointAction#canPerformAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected boolean canPerformAction(Object target, ISelection selection, IWorkbenchPart part) { return ((IToggleBreakpointsTarget)target).canToggleLineBreakpoints(part, selection); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getOperationUnavailableMessage() */ + @Override protected String getOperationUnavailableMessage() { return Messages.RetargetToggleLineBreakpointAction_0; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetWatchpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetWatchpointAction.java index 38466f41b..49fdb0a81 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetWatchpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetWatchpointAction.java @@ -26,18 +26,21 @@ public class RetargetWatchpointAction extends RetargetBreakpointAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetBreakpointAction#performAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected void performAction(Object target, ISelection selection, IWorkbenchPart part) throws CoreException { ((IToggleBreakpointsTarget)target).toggleWatchpoints(part, selection); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetBreakpointAction#canPerformAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected boolean canPerformAction(Object target, ISelection selection, IWorkbenchPart part) { return ((IToggleBreakpointsTarget)target).canToggleWatchpoints(part, selection); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getOperationUnavailableMessage() */ + @Override protected String getOperationUnavailableMessage() { return Messages.RetargetWatchpointAction_0; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RulerEnableDisableBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RulerEnableDisableBreakpointAction.java index a37f31e09..777f08a49 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RulerEnableDisableBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RulerEnableDisableBreakpointAction.java @@ -35,6 +35,7 @@ public class RulerEnableDisableBreakpointAction extends RulerBreakpointAction im /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { if (fBreakpoint != null) { try { @@ -48,6 +49,7 @@ public class RulerEnableDisableBreakpointAction extends RulerBreakpointAction im /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IUpdate#update() */ + @Override public void update() { fBreakpoint = getBreakpoint(); setEnabled(fBreakpoint != null); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/SelectAllBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/SelectAllBreakpointsAction.java index f68b4fe17..34f7b05c8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/SelectAllBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/SelectAllBreakpointsAction.java @@ -27,10 +27,12 @@ public class SelectAllBreakpointsAction extends SelectAllAction implements IBrea /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#isEnabled() */ + @Override protected boolean isEnabled() { return DebugPlugin.getDefault().getBreakpointManager().hasBreakpoints(); } + @Override public void run(IAction action) { Viewer viewer = ((AbstractDebugView) getView()).getViewer(); ((Tree) viewer.getControl()).selectAll(); @@ -41,6 +43,7 @@ public class SelectAllBreakpointsAction extends SelectAllAction implements IBrea /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[]) */ + @Override public void breakpointsAdded(IBreakpoint[] breakpoints) { if (getAction() != null && !getAction().isEnabled()) { update(); @@ -50,12 +53,14 @@ public class SelectAllBreakpointsAction extends SelectAllAction implements IBrea /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) */ + @Override public void breakpointsChanged(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { } /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) */ + @Override public void breakpointsRemoved(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { if (getAction() != null) { update(); @@ -65,6 +70,7 @@ public class SelectAllBreakpointsAction extends SelectAllAction implements IBrea /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#initialize() */ + @Override protected void initialize() { DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this); } @@ -72,6 +78,7 @@ public class SelectAllBreakpointsAction extends SelectAllAction implements IBrea /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#dispose() */ + @Override public void dispose() { DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this); super.dispose(); @@ -80,6 +87,7 @@ public class SelectAllBreakpointsAction extends SelectAllAction implements IBrea /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.SelectAllAction#getActionId() */ + @Override protected String getActionId() { return IDebugView.SELECT_ALL_ACTION; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowSupportedBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowSupportedBreakpointsAction.java index b12fb49e0..29697f14c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowSupportedBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowSupportedBreakpointsAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -58,7 +58,7 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement /** * The list of identifiers for the current state */ - private List fDebugTargets= new ArrayList(2); + private List<IDebugTarget> fDebugTargets= new ArrayList<IDebugTarget>(2); /** * A viewer filter that selects breakpoints that have @@ -69,6 +69,7 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement /** * @see ViewerFilter#select(Viewer, Object, Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof IBreakpointContainer) { // Breakpoint containers are visible if any of their children are visible. @@ -84,9 +85,7 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement if (fDebugTargets.isEmpty()) { return true; } - Iterator iterator= fDebugTargets.iterator(); - while (iterator.hasNext()) { - IDebugTarget target = (IDebugTarget) iterator.next(); + for (IDebugTarget target : fDebugTargets) { if (target.supportsBreakpoint(breakpoint)) { return true; } @@ -125,10 +124,11 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement /** * @see ISelectionListener#selectionChanged(IWorkbenchPart, ISelection) */ + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { if (selection instanceof IStructuredSelection) { IStructuredSelection ss= (IStructuredSelection)selection; - List debugTargets= getDebugTargets(ss); + List<IDebugTarget> debugTargets= getDebugTargets(ss); if (!isChecked()) { fDebugTargets= debugTargets; return; @@ -146,13 +146,11 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement } if (debugTargets.size() == fDebugTargets.size()) { - List copy= new ArrayList(debugTargets.size()); - Iterator iter= fDebugTargets.iterator(); - while (iter.hasNext()) { - IDebugTarget target = (IDebugTarget) iter.next(); - Iterator newDebugTargets= debugTargets.iterator(); + List<IDebugTarget> copy= new ArrayList<IDebugTarget>(debugTargets.size()); + for (IDebugTarget target : fDebugTargets) { + Iterator<IDebugTarget> newDebugTargets= debugTargets.iterator(); while (newDebugTargets.hasNext()) { - IDebugTarget newTarget= (IDebugTarget)newDebugTargets.next(); + IDebugTarget newTarget= newDebugTargets.next(); copy.add(newTarget); if (target.equals(newTarget)) { newDebugTargets.remove(); @@ -174,7 +172,7 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement * need to re-apply the filters. * @param debugTargets the new set of {@link IDebugTarget}s */ - protected void reapplyFilters(List debugTargets) { + protected void reapplyFilters(List<IDebugTarget> debugTargets) { fDebugTargets= debugTargets; getViewer().refresh(); } @@ -187,9 +185,9 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement fView = (AbstractDebugView) view; } - protected List getDebugTargets(IStructuredSelection ss) { - List debugTargets= new ArrayList(2); - Iterator i= ss.iterator(); + protected List<IDebugTarget> getDebugTargets(IStructuredSelection ss) { + List<IDebugTarget> debugTargets= new ArrayList<IDebugTarget>(2); + Iterator<?> i= ss.iterator(); while (i.hasNext()) { Object next= i.next(); if (next instanceof IDebugElement) { @@ -214,6 +212,7 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement * on the value of the parameter. * @param on flag to indicate if viewer filtering should be added or removed */ + @Override protected void valueChanged(boolean on) { if (getViewer().getControl().isDisposed()) { return; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowTargetBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowTargetBreakpointsAction.java index c9f0bff4e..c043a359f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowTargetBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowTargetBreakpointsAction.java @@ -54,6 +54,7 @@ public class ShowTargetBreakpointsAction extends Action { * (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { if (fView.getViewer().getControl().isDisposed()) { return; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/SkipAllBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/SkipAllBreakpointsAction.java index 0abe3797c..16ca3786a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/SkipAllBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/SkipAllBreakpointsAction.java @@ -77,6 +77,7 @@ public class SkipAllBreakpointsAction extends Action implements IWorkbenchWindow /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run(){ IWorkbenchSiteProgressService progressService = null; if (fPart != null) { @@ -85,6 +86,7 @@ public class SkipAllBreakpointsAction extends Action implements IWorkbenchWindow } final boolean enabled = !getBreakpointManager().isEnabled(); Job job = new Job(getText()) { + @Override protected IStatus run(IProgressMonitor monitor) { if (!monitor.isCanceled()) { IBreakpointManager bm = getBreakpointManager(); @@ -124,6 +126,7 @@ public class SkipAllBreakpointsAction extends Action implements IWorkbenchWindow /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { getBreakpointManager().removeBreakpointManagerListener(this); } @@ -131,6 +134,7 @@ public class SkipAllBreakpointsAction extends Action implements IWorkbenchWindow /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { updateActionCheckedState(); getBreakpointManager().addBreakpointManagerListener(this); @@ -139,6 +143,7 @@ public class SkipAllBreakpointsAction extends Action implements IWorkbenchWindow /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { setChecked(action.isChecked()); run(); @@ -151,6 +156,7 @@ public class SkipAllBreakpointsAction extends Action implements IWorkbenchWindow /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { fAction = action; } @@ -158,6 +164,7 @@ public class SkipAllBreakpointsAction extends Action implements IWorkbenchWindow /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointManagerListener#breakpointManagerEnablementChanged(boolean) */ + @Override public void breakpointManagerEnablementChanged(boolean enabled) { if (fAction != null) { fAction.setChecked(!enabled); @@ -167,6 +174,7 @@ public class SkipAllBreakpointsAction extends Action implements IWorkbenchWindow /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; updateActionCheckedState(); @@ -175,6 +183,7 @@ public class SkipAllBreakpointsAction extends Action implements IWorkbenchWindow /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ToggleBreakpointObjectActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ToggleBreakpointObjectActionDelegate.java index 920cc6593..67c176de8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ToggleBreakpointObjectActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ToggleBreakpointObjectActionDelegate.java @@ -39,12 +39,14 @@ public abstract class ToggleBreakpointObjectActionDelegate implements IObjectAct /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { fPart = targetPart; } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IToggleBreakpointsTarget target = DebugUITools.getToggleBreakpointsTargetManager().getToggleBreakpointsTarget(fPart, fSelection); @@ -70,6 +72,7 @@ public abstract class ToggleBreakpointObjectActionDelegate implements IObjectAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { boolean enabled = false; if (selection instanceof IStructuredSelection) { @@ -88,12 +91,14 @@ public abstract class ToggleBreakpointObjectActionDelegate implements IObjectAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { fSelection = null; fPart = null; @@ -101,6 +106,7 @@ public abstract class ToggleBreakpointObjectActionDelegate implements IObjectAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java index a458d9e06..4eb881fd3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java @@ -30,12 +30,14 @@ public class AddWatchExpressionAction extends WatchExpressionAction implements I /** * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { } /** * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { // create a watch expression IWatchExpression watchExpression= DebugPlugin.getDefault().getExpressionManager().newWatchExpression(IInternalDebugCoreConstants.EMPTY_STRING); @@ -50,6 +52,7 @@ public class AddWatchExpressionAction extends WatchExpressionAction implements I /** * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ConvertToWatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ConvertToWatchExpressionAction.java index bfa6c941b..7c72b9ff8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ConvertToWatchExpressionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ConvertToWatchExpressionAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,10 +29,11 @@ public class ConvertToWatchExpressionAction extends WatchExpressionAction { /** * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IStructuredSelection selection= getCurrentSelection(); IExpressionManager expressionManager= DebugPlugin.getDefault().getExpressionManager(); - for (Iterator iter= selection.iterator(); iter.hasNext();) { + for (Iterator<?> iter = selection.iterator(); iter.hasNext();) { IExpression expression= (IExpression) iter.next(); // create the new watch expression IWatchExpression watchExpression= expressionManager.newWatchExpression(expression.getExpressionText()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java index 3cd1c2754..084ac1384 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java @@ -40,7 +40,8 @@ public class EditWatchExpressinInPlaceAction extends Action implements ISelectio fEditActionDelegate.selectionChanged(this, selectionProvider.getSelection()); } - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = fEditActionDelegate.getCurrentSelection(); setEnabled(selection != null && selection.size() == 1); } @@ -49,7 +50,8 @@ public class EditWatchExpressinInPlaceAction extends Action implements ISelectio fView.getSite().getSelectionProvider().removeSelectionChangedListener(this); } - public void run() { + @Override + public void run() { IStructuredSelection selelection = fEditActionDelegate.getCurrentSelection(); if (selelection.size() != 1) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressionAction.java index c858ca31c..fb21f03c3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressionAction.java @@ -26,12 +26,14 @@ public class EditWatchExpressionAction extends WatchExpressionAction { /** * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IWatchExpression watchExpression= getSelectedExpressions()[0]; // display the watch expression dialog for the currently selected watch expression new WatchExpressionDialog(DebugUIPlugin.getShell(), watchExpression, true).open(); } + @Override public void selectionChanged(IAction action, ISelection sel) { action.setEnabled(getSelectedExpressions().length == 1); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EnableWatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EnableWatchExpressionAction.java index 096d2a73c..9e2edc535 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EnableWatchExpressionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EnableWatchExpressionAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,6 +38,7 @@ public class EnableWatchExpressionAction implements IViewActionDelegate, IAction /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { DebugPlugin.getDefault().addDebugEventListener(this); } @@ -45,9 +46,10 @@ public class EnableWatchExpressionAction implements IViewActionDelegate, IAction /** * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fSelection instanceof IStructuredSelection) { - Iterator iter= ((IStructuredSelection) fSelection).iterator(); + Iterator<?> iter = ((IStructuredSelection) fSelection).iterator(); IWatchExpression expression; while (iter.hasNext()) { expression= getWatchExpression(iter.next()); @@ -74,11 +76,12 @@ public class EnableWatchExpressionAction implements IViewActionDelegate, IAction /** * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { fSelection= selection; if (fSelection instanceof IStructuredSelection) { boolean enabled= false; - Iterator iter= ((IStructuredSelection) selection).iterator(); + Iterator<?> iter = ((IStructuredSelection) selection).iterator(); while (iter.hasNext()) { IWatchExpression expression = getWatchExpression(iter.next()); if (expression != null && expression.isEnabled() != fEnable) { @@ -106,6 +109,7 @@ public class EnableWatchExpressionAction implements IViewActionDelegate, IAction /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { DebugPlugin.getDefault().removeDebugEventListener(this); } @@ -113,6 +117,7 @@ public class EnableWatchExpressionAction implements IViewActionDelegate, IAction /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; } @@ -120,6 +125,7 @@ public class EnableWatchExpressionAction implements IViewActionDelegate, IAction /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } @@ -127,6 +133,7 @@ public class EnableWatchExpressionAction implements IViewActionDelegate, IAction /* (non-Javadoc) * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ + @Override public void handleDebugEvents(DebugEvent[] events) { for (int i = 0; i < events.length; i++) { DebugEvent event = events[i]; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/PasteWatchExpressionsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/PasteWatchExpressionsAction.java index 36e8ad6b5..a474de8dc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/PasteWatchExpressionsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/PasteWatchExpressionsAction.java @@ -31,6 +31,7 @@ public class PasteWatchExpressionsAction extends SelectionListenerAction { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run() { if (fExpressionView.canPaste()) { fExpressionView.performPaste(); @@ -40,6 +41,7 @@ public class PasteWatchExpressionsAction extends SelectionListenerAction { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#isEnabled() */ + @Override public boolean isEnabled() { return fExpressionView.canPaste(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ReevaluateWatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ReevaluateWatchExpressionAction.java index 003024845..b20041e7e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ReevaluateWatchExpressionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ReevaluateWatchExpressionAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -33,9 +33,8 @@ import org.eclipse.ui.IWorkbenchPart; */ public class ReevaluateWatchExpressionAction implements IObjectActionDelegate { - public void setActivePart(IAction action, IWorkbenchPart targetPart) { - // TODO Auto-generated method stub - + @Override + public void setActivePart(IAction action, IWorkbenchPart targetPart) { } /** @@ -67,9 +66,10 @@ public class ReevaluateWatchExpressionAction implements IObjectActionDelegate { /** * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IDebugElement context = getContext(); - for (Iterator iter= getCurrentSelection().iterator(); iter.hasNext();) { + for (Iterator<?> iter = getCurrentSelection().iterator(); iter.hasNext();) { IWatchExpression expression= (IWatchExpression) iter.next(); expression.setExpressionContext(context); if (!expression.isEnabled()) { @@ -82,6 +82,7 @@ public class ReevaluateWatchExpressionAction implements IObjectActionDelegate { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { IDebugElement debugElement = getContext(); if (debugElement == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveAllExpressionsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveAllExpressionsAction.java index 209de9dac..682411595 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveAllExpressionsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveAllExpressionsAction.java @@ -33,6 +33,7 @@ public class RemoveAllExpressionsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IWorkbenchWindow window = DebugUIPlugin.getActiveWorkbenchWindow(); if (window != null) { @@ -60,6 +61,7 @@ public class RemoveAllExpressionsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#isEnabled() */ + @Override protected boolean isEnabled() { return DebugPlugin.getDefault().getExpressionManager().hasExpressions(); } @@ -67,6 +69,7 @@ public class RemoveAllExpressionsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#initialize() */ + @Override protected void initialize() { DebugPlugin.getDefault().getExpressionManager().addExpressionListener(this); } @@ -74,6 +77,7 @@ public class RemoveAllExpressionsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#dispose() */ + @Override public void dispose() { DebugPlugin.getDefault().getExpressionManager().removeExpressionListener(this); super.dispose(); @@ -82,6 +86,7 @@ public class RemoveAllExpressionsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionsListener#expressionsAdded(org.eclipse.debug.core.model.IExpression[]) */ + @Override public void expressionsAdded(IExpression[] expressions) { update(); } @@ -89,6 +94,7 @@ public class RemoveAllExpressionsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionsListener#expressionsRemoved(org.eclipse.debug.core.model.IExpression[]) */ + @Override public void expressionsRemoved(IExpression[] expressions) { update(); } @@ -96,5 +102,6 @@ public class RemoveAllExpressionsAction extends AbstractRemoveAllActionDelegate /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionsListener#expressionsChanged(org.eclipse.debug.core.model.IExpression[]) */ + @Override public void expressionsChanged(IExpression[] expressions) {} } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java index 3eed013bb..a2a00d0ca 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -33,12 +33,12 @@ public class RemoveExpressionAction extends AbstractSelectionActionDelegate { protected IExpression[] getExpressions() { TreeSelection selection = (TreeSelection) getSelection(); TreePath[] paths = selection.getPaths(); - List expressions = new ArrayList(); + List<IExpression> expressions = new ArrayList<IExpression>(); for (int i = paths.length-1; i >=0; i--) { TreePath path = paths[i]; Object segment = path.getFirstSegment(); if (segment instanceof IExpression) { - expressions.add(segment); + expressions.add((IExpression) segment); } else if (segment instanceof IAdaptable) { IExpression expression = (IExpression)((IAdaptable)segment).getAdapter(IExpression.class); if (expression != null) { @@ -46,14 +46,16 @@ public class RemoveExpressionAction extends AbstractSelectionActionDelegate { } } } - return (IExpression[]) expressions.toArray(new IExpression[expressions.size()]); + return expressions.toArray(new IExpression[expressions.size()]); } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { WorkbenchJob job = new WorkbenchJob("remove expression") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { IExpressionManager expManager = DebugPlugin.getDefault().getExpressionManager(); IExpression[] exp = getExpressions(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/SelectAllExpressionsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/SelectAllExpressionsAction.java index 2e9da1b1e..c777d0684 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/SelectAllExpressionsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/SelectAllExpressionsAction.java @@ -21,6 +21,7 @@ public class SelectAllExpressionsAction extends SelectAllAction implements IExpr /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#isEnabled() */ + @Override protected boolean isEnabled() { return DebugPlugin.getDefault().getExpressionManager().hasExpressions(); } @@ -28,6 +29,7 @@ public class SelectAllExpressionsAction extends SelectAllAction implements IExpr /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.SelectAllAction#getActionId() */ + @Override protected String getActionId() { return IDebugView.SELECT_ALL_ACTION + ".Variables"; //$NON-NLS-1$ } @@ -35,6 +37,7 @@ public class SelectAllExpressionsAction extends SelectAllAction implements IExpr /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.AbstractRemoveAllActionDelegate#initialize() */ + @Override protected void initialize() { DebugPlugin.getDefault().getExpressionManager().addExpressionListener(this); } @@ -42,6 +45,7 @@ public class SelectAllExpressionsAction extends SelectAllAction implements IExpr /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionsListener#expressionsAdded(org.eclipse.debug.core.model.IExpression[]) */ + @Override public void expressionsAdded(IExpression[] expressions) { update(); } @@ -49,6 +53,7 @@ public class SelectAllExpressionsAction extends SelectAllAction implements IExpr /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionsListener#expressionsRemoved(org.eclipse.debug.core.model.IExpression[]) */ + @Override public void expressionsRemoved(IExpression[] expressions) { update(); } @@ -56,13 +61,15 @@ public class SelectAllExpressionsAction extends SelectAllAction implements IExpr /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionsListener#expressionsChanged(org.eclipse.debug.core.model.IExpression[]) */ + @Override public void expressionsChanged(IExpression[] expressions) { } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.AbstractRemoveAllActionDelegate#dispose() */ - public void dispose() { + @Override + public void dispose() { super.dispose(); DebugPlugin.getDefault().getExpressionManager().removeExpressionListener(this); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionAction.java index 9b1d796a3..30ae517c4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -41,6 +41,7 @@ public abstract class WatchExpressionAction implements IViewActionDelegate { private static IWatchExpression[] EMPTY_EXPRESSION_ARRAY = new IWatchExpression[0]; + @Override public void init(IViewPart view) { fPart = view; } @@ -61,13 +62,13 @@ public abstract class WatchExpressionAction implements IViewActionDelegate { } protected IWatchExpression[] getSelectedExpressions() { - List list = new LinkedList(); + List<Object> list = new LinkedList<Object>(); IStructuredSelection currentSelection = getCurrentSelection(); if (currentSelection == null) { return EMPTY_EXPRESSION_ARRAY; } - for (Iterator iter= currentSelection.iterator(); iter.hasNext();) { + for (Iterator<?> iter= currentSelection.iterator(); iter.hasNext();) { Object element = iter.next(); if (element instanceof IWatchExpression) { list.add(element); @@ -83,12 +84,13 @@ public abstract class WatchExpressionAction implements IViewActionDelegate { } } - return (IWatchExpression[])list.toArray(new IWatchExpression[list.size()]); + return list.toArray(new IWatchExpression[list.size()]); } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection sel) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionDialog.java index 61171c618..e76d08056 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -84,6 +84,7 @@ public class WatchExpressionDialog extends StatusDialog { * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite) */ + @Override protected Control createDialogArea(Composite parent) { Font font = parent.getFont(); @@ -108,8 +109,10 @@ public class WatchExpressionDialog extends StatusDialog { fSnippetViewer.setEditable(true); fSnippetViewer.setDocument(document); document.addDocumentListener(new IDocumentListener() { + @Override public void documentAboutToBeChanged(DocumentEvent event) { } + @Override public void documentChanged(DocumentEvent event) { checkValues(); } @@ -144,6 +147,7 @@ public class WatchExpressionDialog extends StatusDialog { menuManager.add(copyAction); menuManager.add(pasteAction); menuManager.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { cutAction.update(); copyAction.update(); @@ -160,7 +164,7 @@ public class WatchExpressionDialog extends StatusDialog { fCheckBox.setFont(font); String tipText = MessageFormat.format(ActionMessages.WatchExpressionDialog_5, - new String[] { getCtrlReturnText() }); + new Object[] { getCtrlReturnText() }); fTip= new Label(container, SWT.LEFT); fTip.setText(tipText); fTip.setFont(font); @@ -187,6 +191,7 @@ public class WatchExpressionDialog extends StatusDialog { /** * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { fWatchExpression.setEnabled(fCheckBox.getSelection()); fWatchExpression.setExpressionText(fSnippetViewer.getDocument().get()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java index 6f300f4e3..167387bbb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java @@ -32,6 +32,7 @@ public class WatchExpressionFactoryTester extends PropertyTester { /* (non-Javadoc) * @see org.eclipse.core.expressions.PropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) */ + @Override public boolean test(Object element, String property, Object[] args, Object expectedValue) { if (CAN_CREATE_WATCH_EXPRESSION_PROPERTY.equals(property)){ if (element instanceof IVariable) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchHandler.java index a71ba6f14..b2d8fd139 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchHandler.java @@ -45,10 +45,11 @@ public class WatchHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ - public Object execute(ExecutionEvent event) throws ExecutionException { + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof IStructuredSelection) { - Iterator iter = ((IStructuredSelection)selection).iterator(); + Iterator<?> iter = ((IStructuredSelection)selection).iterator(); while (iter.hasNext()) { Object element = iter.next(); createExpression(element); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java index 4da195e81..dd191c286 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,8 +12,8 @@ package org.eclipse.debug.internal.ui.actions.variables; -import com.ibm.icu.text.MessageFormat; import java.util.Iterator; + import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValueModification; import org.eclipse.debug.core.model.IVariable; @@ -34,6 +34,8 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.SelectionProviderAction; +import com.ibm.icu.text.MessageFormat; + /** * Action for changing the value of primitives and <code>String</code> variables. * This action will attempt to delegate the editing operation to a registered @@ -122,10 +124,11 @@ public class ChangeVariableValueAction extends SelectionProviderAction { DebugUIPlugin.errorDialog(shell, ActionMessages.ChangeVariableValue_errorDialogTitle,ActionMessages.ChangeVariableValue_errorDialogMessage, exception); // return; } - ChangeVariableValueInputDialog inputDialog= new ChangeVariableValueInputDialog(shell, ActionMessages.ChangeVariableValue_1, MessageFormat.format(ActionMessages.ChangeVariableValue_2, new String[] {name}), value, new IInputValidator() { // + ChangeVariableValueInputDialog inputDialog = new ChangeVariableValueInputDialog(shell, ActionMessages.ChangeVariableValue_1, MessageFormat.format(ActionMessages.ChangeVariableValue_2, new Object[] { name }), value, new IInputValidator() { // /** * Returns an error string if the input is invalid */ + @Override public String isValid(String input) { try { if (fVariable.verifyValue(input)) { @@ -158,7 +161,7 @@ public class ChangeVariableValueAction extends SelectionProviderAction { */ protected void update(IStructuredSelection sel) { isApplicable = false; - Iterator iter= sel.iterator(); + Iterator<Object> iter = sel.iterator(); if (iter.hasNext()) { Object object= iter.next(); if (object instanceof IValueModification) { @@ -178,14 +181,16 @@ public class ChangeVariableValueAction extends SelectionProviderAction { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { - Iterator iterator= getStructuredSelection().iterator(); + Iterator<Object> iterator = getStructuredSelection().iterator(); doActionPerformed((IVariable)iterator.next()); } /** * @see SelectionProviderAction#selectionChanged(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public void selectionChanged(IStructuredSelection sel) { update(sel); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java index a5aeb7119..285405948 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java @@ -104,6 +104,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected void buttonPressed(int buttonId) { if (buttonId == IDialogConstants.OK_ID) { value= text.getText(); @@ -115,6 +116,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog { /* (non-Javadoc) * Method declared in Window. */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); if (title != null) @@ -123,6 +125,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected void createButtonsForButtonBar(Composite parent) { // create OK and Cancel buttons by default okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); @@ -138,6 +141,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected Control createDialogArea(Composite parent) { Font font = parent.getFont(); // create composite @@ -165,6 +169,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog { text.setFont(font); text.addModifyListener( new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { if (okButton.isEnabled()) { return; @@ -248,6 +253,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog { errorMessageLabel.getParent().update(); } + @Override protected void okPressed() { validateInput(); if (okButton.isEnabled()) { @@ -267,7 +273,8 @@ public class ChangeVariableValueInputDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() */ - protected IDialogSettings getDialogBoundsSettings() { + @Override + protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsSectionName()); if (section == null) { @@ -279,6 +286,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#handleShellCloseEvent() */ + @Override protected void handleShellCloseEvent() { value= null; super.handleShellCloseEvent(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/SelectAllVariablesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/SelectAllVariablesAction.java index dc228a629..81dbcba7b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/SelectAllVariablesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/SelectAllVariablesAction.java @@ -16,6 +16,7 @@ import org.eclipse.debug.ui.IDebugView; public class SelectAllVariablesAction extends SelectAllAction { + @Override protected String getActionId() { return IDebugView.SELECT_ALL_ACTION + ".Variables"; //$NON-NLS-1$ } @@ -23,12 +24,14 @@ public class SelectAllVariablesAction extends SelectAllAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#initialize() */ + @Override protected void initialize() { } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.selection.AbstractRemoveAllActionDelegate#isEnabled() */ + @Override protected boolean isEnabled() { // TODO: only enable when stuff present return true; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ShowTypesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ShowTypesAction.java index 9aaa80473..681bd7a08 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ShowTypesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ShowTypesAction.java @@ -51,6 +51,7 @@ public class ShowTypesAction extends Action { /** * @see Action#run() */ + @Override public void run() { valueChanged(isChecked()); } @@ -70,6 +71,7 @@ public class ShowTypesAction extends Action { treeViewer.getPresentationContext().setProperty(IDebugModelPresentation.DISPLAY_VARIABLE_TYPE_NAMES, typesStatus); } BusyIndicator.showWhile(viewer.getControl().getDisplay(), new Runnable() { + @Override public void run() { viewer.refresh(); } @@ -88,6 +90,7 @@ public class ShowTypesAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#setEnabled(boolean) */ + @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); if (enabled) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java index 572827acf..8f6adc86d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java @@ -78,6 +78,7 @@ public class ToggleDetailPaneAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { getVariablesView().setDetailPaneOrientation(getOrientation()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneAssignValueAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneAssignValueAction.java index 81eff77e9..b823527d0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneAssignValueAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneAssignValueAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -77,7 +77,8 @@ public class DetailPaneAssignValueAction extends Action{ variable.setValue(newValueExpression); } else { if (shell != null) { - DebugUIPlugin.errorDialog(shell, ActionMessages.DetailPaneAssignValueAction_2, MessageFormat.format(ActionMessages.DetailPaneAssignValueAction_3, new String[] {newValueExpression, variable.getName()}), new StatusInfo(IStatus.ERROR, ActionMessages.DetailPaneAssignValueAction_4)); // + DebugUIPlugin.errorDialog(shell, ActionMessages.DetailPaneAssignValueAction_2, MessageFormat.format(ActionMessages.DetailPaneAssignValueAction_3, new Object[] { + newValueExpression, variable.getName() }), new StatusInfo(IStatus.ERROR, ActionMessages.DetailPaneAssignValueAction_4)); // } } } catch (DebugException e) { @@ -119,6 +120,7 @@ public class DetailPaneAssignValueAction extends Action{ /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { IVariable variable = (IVariable) fCurrentSelection.getFirstElement(); @@ -144,6 +146,7 @@ public class DetailPaneAssignValueAction extends Action{ /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#getActionDefinitionId() */ + @Override public String getActionDefinitionId() { return IWorkbenchCommandConstants.FILE_SAVE; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthAction.java index 032958bd0..112725210 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthAction.java @@ -35,6 +35,7 @@ public class DetailPaneMaxLengthAction extends Action { } + @Override public void run() { DetailPaneMaxLengthDialog dialog = new DetailPaneMaxLengthDialog(fDialogShell); dialog.open(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java index e348f02c6..237d26f36 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java @@ -55,6 +55,7 @@ public class DetailPaneMaxLengthDialog extends TrayDialog { setShellStyle(getShellStyle() | SWT.RESIZE); fValue = Integer.toString(DebugUIPlugin.getDefault().getPreferenceStore().getInt(IDebugUIConstants.PREF_MAX_DETAIL_LENGTH)); fValidator = new IInputValidator() { + @Override public String isValid(String newText) { try { int num = Integer.parseInt(newText); @@ -73,6 +74,7 @@ public class DetailPaneMaxLengthDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.ui.dialogs.SelectionDialog#getDialogBoundsSettings() */ + @Override protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(SETTINGS_ID); @@ -85,6 +87,7 @@ public class DetailPaneMaxLengthDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { getShell().setText(VariablesViewMessages.DetailPaneMaxLengthDialog_0); Control contents = super.createContents(parent); @@ -95,6 +98,7 @@ public class DetailPaneMaxLengthDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); Label label = new Label(composite, SWT.WRAP); @@ -107,7 +111,8 @@ public class DetailPaneMaxLengthDialog extends TrayDialog { fTextWidget.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL)); fTextWidget.setText(fValue); fTextWidget.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { + @Override + public void modifyText(ModifyEvent e) { validateInput(); fValue = fTextWidget.getText(); } @@ -124,6 +129,7 @@ public class DetailPaneMaxLengthDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { String text = getValue(); try { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneWordWrapAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneWordWrapAction.java index f8bb07b1b..caa5bd816 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneWordWrapAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneWordWrapAction.java @@ -46,6 +46,7 @@ public class DetailPaneWordWrapAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { fTextViewer.getTextWidget().setWordWrap(isChecked()); IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/OtherBreakpointCategory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/OtherBreakpointCategory.java index 621109137..bb19279d5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/OtherBreakpointCategory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/OtherBreakpointCategory.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,12 +33,12 @@ import org.eclipse.ui.model.IWorkbenchAdapter; */
public class OtherBreakpointCategory extends PlatformObject implements IWorkbenchAdapter {
- private static Map fOthers = new HashMap();
+ private static Map<IBreakpointOrganizer, IAdaptable[]> fOthers = new HashMap<IBreakpointOrganizer, IAdaptable[]>();
private IBreakpointOrganizer fOrganizer;
public static IAdaptable[] getCategories(IBreakpointOrganizer organizer) {
- IAdaptable[] others = (IAdaptable[]) fOthers.get(organizer);
+ IAdaptable[] others = fOthers.get(organizer);
if (others == null) {
others = new IAdaptable[]{new OtherBreakpointCategory(organizer)};
fOthers.put(organizer, others);
@@ -58,35 +58,40 @@ public class OtherBreakpointCategory extends PlatformObject implements IWorkbenc /* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
*/
- public Object[] getChildren(Object o) {
+ @Override
+ public Object[] getChildren(Object o) {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
*/
- public ImageDescriptor getImageDescriptor(Object object) {
+ @Override
+ public ImageDescriptor getImageDescriptor(Object object) {
return DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_VIEW_BREAKPOINTS);
}
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
*/
- public String getLabel(Object o) {
+ @Override
+ public String getLabel(Object o) {
return fOrganizer.getOthersLabel();
}
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
*/
- public Object getParent(Object o) {
+ @Override
+ public Object getParent(Object o) {
return null;
}
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
- public boolean equals(Object obj) {
+ @Override
+ public boolean equals(Object obj) {
if (obj instanceof OtherBreakpointCategory) {
OtherBreakpointCategory category = (OtherBreakpointCategory) obj;
return fOrganizer.equals(category.fOrganizer);
@@ -97,7 +102,8 @@ public class OtherBreakpointCategory extends PlatformObject implements IWorkbenc /* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
- public int hashCode() {
+ @Override
+ public int hashCode() {
return fOrganizer.hashCode();
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/AbstractRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/AbstractRequestMonitor.java index 2364d5655..ff7ad3b6c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/AbstractRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/AbstractRequestMonitor.java @@ -27,6 +27,7 @@ public abstract class AbstractRequestMonitor implements IStatusMonitor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IStatusMonitor#setStatus(org.eclipse.core.runtime.IStatus) */ + @Override public void setStatus(IStatus status) { fStatus = status; } @@ -34,18 +35,21 @@ public abstract class AbstractRequestMonitor implements IStatusMonitor { /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#beginTask(java.lang.String, int) */ + @Override public void beginTask(String name, int totalWork) { } /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#internalWorked(double) */ + @Override public void internalWorked(double work) { } /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled() */ + @Override public boolean isCanceled() { return fCancelled; } @@ -53,6 +57,7 @@ public abstract class AbstractRequestMonitor implements IStatusMonitor { /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean) */ + @Override public void setCanceled(boolean value) { fCancelled = value; } @@ -60,24 +65,28 @@ public abstract class AbstractRequestMonitor implements IStatusMonitor { /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#setTaskName(java.lang.String) */ + @Override public void setTaskName(String name) { } /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#subTask(java.lang.String) */ + @Override public void subTask(String name) { } /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#worked(int) */ + @Override public void worked(int work) { } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IStatusMonitor#getStatus() */ + @Override public IStatus getStatus() { return fStatus; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugActionHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugActionHandler.java index 273f9ecff..0d4316589 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugActionHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugActionHandler.java @@ -59,6 +59,7 @@ public abstract class DebugActionHandler implements IHandler2 { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IHandler2 delegate = getDelegate(); if (delegate != null) { @@ -70,6 +71,7 @@ public abstract class DebugActionHandler implements IHandler2 { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#addHandlerListener(org.eclipse.core.commands.IHandlerListener) */ + @Override public void addHandlerListener(IHandlerListener handlerListener) { IHandler2 delegate = getDelegate(); if (delegate != null) { @@ -80,12 +82,14 @@ public abstract class DebugActionHandler implements IHandler2 { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#dispose() */ + @Override public void dispose() { } /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#isEnabled() */ + @Override public boolean isEnabled() { IHandler2 delegate = getDelegate(); if (delegate != null) { @@ -97,6 +101,7 @@ public abstract class DebugActionHandler implements IHandler2 { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#isHandled() */ + @Override public boolean isHandled() { IHandler2 delegate = getDelegate(); if (delegate != null) { @@ -108,6 +113,7 @@ public abstract class DebugActionHandler implements IHandler2 { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#removeHandlerListener(org.eclipse.core.commands.IHandlerListener) */ + @Override public void removeHandlerListener(IHandlerListener handlerListener) { IHandler2 delegate = getDelegate(); if (delegate != null) { @@ -118,6 +124,7 @@ public abstract class DebugActionHandler implements IHandler2 { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler2#setEnabled(java.lang.Object) */ + @Override public void setEnabled(Object evaluationContext) { IHandler2 delegate = getDelegate(); if (delegate != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandActionDelegate.java index 8f4b1fa07..a66a6b048 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandActionDelegate.java @@ -39,6 +39,7 @@ public abstract class DebugCommandActionDelegate implements IWorkbenchWindowActi * (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { fDebugAction.dispose(); } @@ -47,7 +48,8 @@ public abstract class DebugCommandActionDelegate implements IWorkbenchWindowActi * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ - public void init(IAction action) { + @Override + public void init(IAction action) { fDebugAction.setActionProxy(action); } @@ -55,7 +57,8 @@ public abstract class DebugCommandActionDelegate implements IWorkbenchWindowActi * (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ - public void init(IWorkbenchWindow window) { + @Override + public void init(IWorkbenchWindow window) { fDebugAction.init(window); } @@ -63,6 +66,7 @@ public abstract class DebugCommandActionDelegate implements IWorkbenchWindowActi * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { fDebugAction.run(); } @@ -72,6 +76,7 @@ public abstract class DebugCommandActionDelegate implements IWorkbenchWindowActi * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } @@ -80,7 +85,8 @@ public abstract class DebugCommandActionDelegate implements IWorkbenchWindowActi * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ - public void selectionChanged(IAction action, ISelection s) { + @Override + public void selectionChanged(IAction action, ISelection s) { // do nothing } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandService.java index b65c50c15..25c80f908 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.debug.internal.ui.commands.actions; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -40,7 +39,7 @@ public class DebugCommandService implements IDebugContextListener { /** * Maps command types to actions to update */ - private Map fCommandUpdates = new HashMap(); + private Map<Class<?>, List<IEnabledTarget>> fCommandUpdates = new HashMap<Class<?>, List<IEnabledTarget>>(); /** * Window this service is for. @@ -55,7 +54,7 @@ public class DebugCommandService implements IDebugContextListener { /** * Service per window */ - private static Map fgServices = new HashMap(); + private static Map<IWorkbenchWindow, DebugCommandService> fgServices = new HashMap<IWorkbenchWindow, DebugCommandService>(); /** * Returns the service for a window. @@ -64,7 +63,7 @@ public class DebugCommandService implements IDebugContextListener { * @return service */ public synchronized static DebugCommandService getService(IWorkbenchWindow window) { - DebugCommandService service = (DebugCommandService) fgServices.get(window); + DebugCommandService service = fgServices.get(window); if (service == null) { service = new DebugCommandService(window); fgServices.put(window, service); @@ -78,18 +77,22 @@ public class DebugCommandService implements IDebugContextListener { fContextService.addPostDebugContextListener(this); PlatformUI.getWorkbench().addWindowListener(new IWindowListener() { + @Override public void windowOpened(IWorkbenchWindow w) { } + @Override public void windowDeactivated(IWorkbenchWindow w) { } + @Override public void windowClosed(IWorkbenchWindow w) { if (fWindow == w) { dispose(); } } + @Override public void windowActivated(IWorkbenchWindow w) { } @@ -109,12 +112,12 @@ public class DebugCommandService implements IDebugContextListener { * @param commandType the command class * @param action the action to add to the update list */ - public void postUpdateCommand(Class commandType, IEnabledTarget action) { + public void postUpdateCommand(Class<?> commandType, IEnabledTarget action) { synchronized (fCommandUpdates) { Job.getJobManager().cancel(commandType); - List actions = (List) fCommandUpdates.get(commandType); + List<IEnabledTarget> actions = fCommandUpdates.get(commandType); if (actions == null) { - actions = new ArrayList(); + actions = new ArrayList<IEnabledTarget>(); fCommandUpdates.put(commandType, actions); } actions.add(action); @@ -127,7 +130,7 @@ public class DebugCommandService implements IDebugContextListener { * @param commandType the command class * @param action the action to update */ - public void updateCommand(Class commandType, IEnabledTarget action) { + public void updateCommand(Class<?> commandType, IEnabledTarget action) { ISelection context = fContextService.getActiveContext(); if (context instanceof IStructuredSelection && !context.isEmpty()) { Object[] elements = ((IStructuredSelection)context).toArray(); @@ -138,27 +141,21 @@ public class DebugCommandService implements IDebugContextListener { } private void postUpdate(ISelection context) { - Map commands = null; + Map<Class<?>, List<IEnabledTarget>> commands = null; synchronized (fCommandUpdates) { commands = fCommandUpdates; - fCommandUpdates = new HashMap(commands.size()); + fCommandUpdates = new HashMap<Class<?>, List<IEnabledTarget>>(commands.size()); } if (context instanceof IStructuredSelection && !context.isEmpty()) { Object[] elements = ((IStructuredSelection)context).toArray(); - Iterator iterator = commands.entrySet().iterator(); - while (iterator.hasNext()) { - Entry entry = (Entry) iterator.next(); - Class commandType = (Class)entry.getKey(); - List actions = (List) entry.getValue(); - updateCommand(commandType, elements, (IEnabledTarget[]) actions.toArray(new IEnabledTarget[actions.size()])); + for (Entry<Class<?>, List<IEnabledTarget>> entry : commands.entrySet()) { + List<IEnabledTarget> actions = entry.getValue(); + updateCommand(entry.getKey(), elements, actions.toArray(new IEnabledTarget[actions.size()])); } } else { - Iterator iterator = commands.values().iterator(); - while (iterator.hasNext()) { - List actionList = (List) iterator.next(); - Iterator actions = actionList.iterator(); - while (actions.hasNext()) { - ((IEnabledTarget)actions.next()).setEnabled(false); + for (List<IEnabledTarget> actionList : commands.values()) { + for (IEnabledTarget target : actionList) { + target.setEnabled(false); } } } @@ -171,7 +168,7 @@ public class DebugCommandService implements IDebugContextListener { * @param elements elements to update for * @param actions the actions to update */ - private void updateCommand(Class handlerType, Object[] elements, IEnabledTarget[] actions) { + private void updateCommand(Class<?> handlerType, Object[] elements, IEnabledTarget[] actions) { if (elements.length == 1) { // usual case - one element Object element = elements[0]; @@ -182,16 +179,12 @@ public class DebugCommandService implements IDebugContextListener { return; } } else { - Map map = collate(elements, handlerType); + Map<IDebugCommandHandler, List<Object>> map = collate(elements, handlerType); if (map != null) { ActionsUpdater updater = new ActionsUpdater(actions, map.size()); - Iterator entries = map.entrySet().iterator(); - while (entries.hasNext()) { - Entry entry = (Entry) entries.next(); - IDebugCommandHandler handler = (IDebugCommandHandler) entry.getKey(); - List list = (List) entry.getValue(); - UpdateHandlerRequest request = new UpdateHandlerRequest(list.toArray(), updater); - handler.canExecute(request); + for (Entry<IDebugCommandHandler, List<Object>> entry : map.entrySet()) { + UpdateHandlerRequest request = new UpdateHandlerRequest(entry.getValue().toArray(), updater); + entry.getKey().canExecute(request); } return; } @@ -209,7 +202,7 @@ public class DebugCommandService implements IDebugContextListener { * @param participant the participant * @return if the command stays enabled while the command executes */ - public boolean executeCommand(Class handlerType, Object[] elements, ICommandParticipant participant) { + public boolean executeCommand(Class<?> handlerType, Object[] elements, ICommandParticipant participant) { if (elements.length == 1) { // usual case - one element Object element = elements[0]; @@ -220,18 +213,14 @@ public class DebugCommandService implements IDebugContextListener { return handler.execute(request); } } else { - Map map = collate(elements, handlerType); + Map<IDebugCommandHandler, List<Object>> map = collate(elements, handlerType); if (map != null) { boolean enabled = true; - Iterator entries = map.entrySet().iterator(); - while (entries.hasNext()) { - Entry entry = (Entry) entries.next(); - IDebugCommandHandler handler = (IDebugCommandHandler) entry.getKey(); - List list = (List) entry.getValue(); - ExecuteActionRequest request = new ExecuteActionRequest(list.toArray()); + for (Entry<IDebugCommandHandler, List<Object>> entry : map.entrySet()) { + ExecuteActionRequest request = new ExecuteActionRequest(entry.getValue().toArray()); request.setCommandParticipant(participant); // specifically use & so handler is executed - enabled = enabled & handler.execute(request); + enabled = enabled & entry.getKey().execute(request); } return enabled; } @@ -240,6 +229,7 @@ public class DebugCommandService implements IDebugContextListener { return false; } + @Override public void debugContextChanged(DebugContextEvent event) { postUpdate(event.getContext()); } @@ -252,17 +242,17 @@ public class DebugCommandService implements IDebugContextListener { * @param handlerType the handler type class * @return map of command handlers to associated elements or <code>null</code> */ - private Map collate(Object[] elements, Class handlerType) { - Map map = new HashMap(); + private Map<IDebugCommandHandler, List<Object>> collate(Object[] elements, Class<?> handlerType) { + Map<IDebugCommandHandler, List<Object>> map = new HashMap<IDebugCommandHandler, List<Object>>(); for (int i = 0; i < elements.length; i++) { Object element = elements[i]; IDebugCommandHandler handler = getHandler(element, handlerType); if (handler == null) { return null; } else { - List list = (List) map.get(handler); + List<Object> list = map.get(handler); if (list == null) { - list = new ArrayList(); + list = new ArrayList<Object>(); map.put(handler, list); } list.add(element); @@ -271,7 +261,7 @@ public class DebugCommandService implements IDebugContextListener { return map; } - private IDebugCommandHandler getHandler(Object element, Class handlerType) { + private IDebugCommandHandler getHandler(Object element, Class<?> handlerType) { return (IDebugCommandHandler)DebugPlugin.getAdapter(element, handlerType); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java index cd5b4edd7..a0495f1fa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,35 +28,43 @@ public class DisconnectCommandAction extends DebugCommandAction{ setActionDefinitionId("org.eclipse.debug.ui.commands.Disconnect"); //$NON-NLS-1$ } - public String getText() { + @Override + public String getText() { return ActionMessages.DisconnectAction_0; } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.disconnect_action_context"; //$NON-NLS-1$ } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.debugview.toolbar.disconnect"; //$NON-NLS-1$ } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.DisconnectAction_3; } - public ImageDescriptor getDisabledImageDescriptor() { + @Override + public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DISCONNECT); } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT); } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT); } - protected Class getCommandType() { + @Override + protected Class<IDisconnectHandler> getCommandType() { return IDisconnectHandler.class; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandHandler.java index 435e83f33..a30302bd0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; @@ -21,7 +22,8 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler; */ public class DisconnectCommandHandler extends DebugCommandHandler { - protected Class getCommandType() { + @Override + protected Class<IDisconnectHandler> getCommandType() { return IDisconnectHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java index e4c11f993..581377773 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,35 +28,43 @@ public class DropToFrameCommandAction extends DebugCommandAction { setActionDefinitionId("org.eclipse.debug.ui.commands.DropToFrame"); //$NON-NLS-1$ } - public String getText() { + @Override + public String getText() { return ActionMessages.DropToFrameAction_0; } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.drop_to_frame_action_context"; //$NON-NLS-1$ } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.debugview.toolbar.dropToFrame"; //$NON-NLS-1$ } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.DropToFrameAction_3; } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DROP_TO_FRAME); } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DROP_TO_FRAME); } + @Override public ImageDescriptor getDisabledImageDescriptor() { return null; } - protected Class getCommandType() { + @Override + protected Class<IDropToFrameHandler> getCommandType() { return IDropToFrameHandler.class; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandHandler.java index 788fe1a8c..c5c7bbb8d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; @@ -21,7 +22,8 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler; */ public class DropToFrameCommandHandler extends DebugCommandHandler { - protected Class getCommandType() { + @Override + protected Class<IDropToFrameHandler> getCommandType() { return IDropToFrameHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ExecuteActionRequest.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ExecuteActionRequest.java index b47715b2b..4c37a86d3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ExecuteActionRequest.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ExecuteActionRequest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -30,7 +30,8 @@ public class ExecuteActionRequest extends DebugCommandRequest { super(elements); } - public void done() { + @Override + public void done() { if (fParticipant != null) { fParticipant.requestDone(this); fParticipant = null; @@ -40,25 +41,30 @@ public class ExecuteActionRequest extends DebugCommandRequest { switch (status.getSeverity()) { case IStatus.ERROR: DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { MessageDialog.openError(DebugUIPlugin.getShell(), DebugUIMessages.DebugUITools_Error_1, status.getMessage()); } }); break; case IStatus.WARNING: DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { MessageDialog.openWarning(DebugUIPlugin.getShell(), DebugUIMessages.DebugUITools_Error_1, status.getMessage()); } }); break; case IStatus.INFO: DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { MessageDialog.openInformation(DebugUIPlugin.getShell(), DebugUIMessages.DebugUITools_Error_1, status.getMessage()); } }); break; + default: + break; } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java index 5661ca927..cc34a4d3c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; @@ -28,35 +29,43 @@ public class RestartCommandAction extends DebugCommandAction { setActionDefinitionId("org.eclipse.debug.ui.commands.Restart"); //$NON-NLS-1$ } - protected Class getCommandType() { + @Override + protected Class<IRestartHandler> getCommandType() { return IRestartHandler.class; } - public ImageDescriptor getDisabledImageDescriptor() { + @Override + public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESTART); } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.restart_action_context"; //$NON-NLS-1$ } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESTART); } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.actions.Restart"; //$NON-NLS-1$ } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESTART); } - public String getText() { + @Override + public String getText() { return ActionMessages.RestartCommandAction__text; } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.RestartCommandAction_tooltip; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandActionDelegate.java index 961b7cd85..1502c4c71 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandActionDelegate.java @@ -28,28 +28,34 @@ public class RestartCommandActionDelegate implements IWorkbenchWindowActionDeleg private DebugCommandAction fDebugAction = new RestartCommandAction(); - public void dispose() { + @Override + public void dispose() { fDebugAction.dispose(); } - public void init(IWorkbenchWindow window) { + @Override + public void init(IWorkbenchWindow window) { fDebugAction.init(window); } - public void run(IAction action) { + @Override + public void run(IAction action) { fDebugAction.run(); } - public void selectionChanged(IAction action, ISelection selection) { + @Override + public void selectionChanged(IAction action, ISelection selection) { // do nothing } - public void init(IAction action) { + @Override + public void init(IAction action) { fDebugAction.setActionProxy(action); } - public void runWithEvent(IAction action, Event event) { + @Override + public void runWithEvent(IAction action, Event event) { run(action); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandHandler.java index 878dcc779..53b9fd0c4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Wind River Systems and others. + * Copyright (c) 2010, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; @@ -20,7 +21,8 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler; */ public class RestartCommandHandler extends DebugCommandHandler { - protected Class getCommandType() { + @Override + protected Class<IRestartHandler> getCommandType() { return IRestartHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java index f7f28abe5..d0a138eb7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,35 +28,43 @@ public class ResumeCommandAction extends DebugCommandAction{ setActionDefinitionId("org.eclipse.debug.ui.commands.Resume"); //$NON-NLS-1$ } - public String getText() { + @Override + public String getText() { return ActionMessages.ResumeAction_0; } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.resume_action_context"; //$NON-NLS-1$ } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.debugview.toolbar.resume"; //$NON-NLS-1$ } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.ResumeAction_3; } - public ImageDescriptor getDisabledImageDescriptor() { + @Override + public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESUME); } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESUME); } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESUME); } - protected Class getCommandType() { + @Override + protected Class<IResumeHandler> getCommandType() { return IResumeHandler.class; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandActionDelegate.java index 3a770a612..564d8a8b0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandActionDelegate.java @@ -28,28 +28,34 @@ public class ResumeCommandActionDelegate implements IWorkbenchWindowActionDelega private DebugCommandAction fDebugAction = new ResumeCommandAction(); - public void dispose() { + @Override + public void dispose() { fDebugAction.dispose(); } - public void init(IWorkbenchWindow window) { + @Override + public void init(IWorkbenchWindow window) { fDebugAction.init(window); } - public void run(IAction action) { + @Override + public void run(IAction action) { fDebugAction.run(); } - public void selectionChanged(IAction action, ISelection selection) { + @Override + public void selectionChanged(IAction action, ISelection selection) { // do nothing } - public void init(IAction action) { + @Override + public void init(IAction action) { fDebugAction.setActionProxy(action); } - public void runWithEvent(IAction action, Event event) { + @Override + public void runWithEvent(IAction action, Event event) { run(action); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandHandler.java index af8c669cd..22e23af17 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; @@ -21,7 +22,8 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler; */ public class ResumeCommandHandler extends DebugCommandHandler { - protected Class getCommandType() { + @Override + protected Class<IResumeHandler> getCommandType() { return IResumeHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java index f42a2dd03..f3517eacb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,35 +28,43 @@ public class StepIntoCommandAction extends DebugCommandAction { setActionDefinitionId("org.eclipse.debug.ui.commands.StepInto"); //$NON-NLS-1$ } - public String getText() { + @Override + public String getText() { return ActionMessages.StepIntoAction_0; } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.step_into_action_context"; //$NON-NLS-1$ } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.debugview.toolbar.stepInto"; //$NON-NLS-1$ } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.StepIntoAction_3; } - public ImageDescriptor getDisabledImageDescriptor() { + @Override + public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_INTO); } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO); } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO); } - protected Class getCommandType() { + @Override + protected Class<IStepIntoHandler> getCommandType() { return IStepIntoHandler.class; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java index 2158b1078..f16b86019 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; @@ -21,7 +22,8 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler; */ public class StepIntoCommandHandler extends DebugCommandHandler { - protected Class getCommandType() { + @Override + protected Class<IStepIntoHandler> getCommandType() { return IStepIntoHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java index 020e34d95..21e7cda98 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,35 +29,43 @@ public class StepOverCommandAction extends DebugCommandAction { setActionDefinitionId("org.eclipse.debug.ui.commands.StepOver"); //$NON-NLS-1$ } - public String getText() { + @Override + public String getText() { return ActionMessages.StepOverAction_0; } - public ImageDescriptor getDisabledImageDescriptor() { + @Override + public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_OVER); } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.step_over_action_context"; //$NON-NLS-1$ } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_OVER); } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.debugview.toolbar.stepOver"; //$NON-NLS-1$ } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_OVER); } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.StepOverAction_3; } - protected Class getCommandType() { + @Override + protected Class<IStepOverHandler> getCommandType() { return IStepOverHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandActionDelegate.java index 533c0fe9f..65bfe17e4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandActionDelegate.java @@ -25,7 +25,8 @@ public class StepOverCommandActionDelegate extends DebugCommandActionDelegate { setAction(new StepOverCommandAction()); } - public void init(IAction action) { + @Override + public void init(IAction action) { super.init(action); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java index b93551ebf..c0b43f318 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,7 +21,8 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler; */ public class StepOverCommandHandler extends DebugCommandHandler { - protected Class getCommandType() { + @Override + protected Class<IStepOverHandler> getCommandType() { return IStepOverHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java index 73aa93520..6d94acc61 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,35 +29,43 @@ public class StepReturnCommandAction extends DebugCommandAction { setActionDefinitionId("org.eclipse.debug.ui.commands.StepReturn"); //$NON-NLS-1$ } - public ImageDescriptor getDisabledImageDescriptor() { + @Override + public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_RETURN); } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.step_return_action_context"; //$NON-NLS-1$ } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_RETURN); } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.debugview.toolbar.stepReturn"; //$NON-NLS-1$ } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_RETURN); } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.StepReturnAction_2; } - public String getText() { + @Override + public String getText() { return ActionMessages.StepReturnAction_3; } - protected Class getCommandType() { + @Override + protected Class<IStepReturnHandler> getCommandType() { return IStepReturnHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandHandler.java index df4274249..dc329b50e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; @@ -21,7 +22,8 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler; */ public class StepReturnCommandHandler extends DebugCommandHandler { - protected Class getCommandType() { + @Override + protected Class<IStepReturnHandler> getCommandType() { return IStepReturnHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java index da1b596ed..ce16e0aee 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,35 +28,43 @@ public class SuspendCommandAction extends DebugCommandAction { setActionDefinitionId("org.eclipse.debug.ui.commands.Suspend"); //$NON-NLS-1$ } - public String getText() { + @Override + public String getText() { return ActionMessages.SuspendAction_0; } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.suspend_action_context"; //$NON-NLS-1$ } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.commands.Suspend"; //$NON-NLS-1$ } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.SuspendAction_3; } - public ImageDescriptor getDisabledImageDescriptor() { + @Override + public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_SUSPEND); } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SUSPEND); } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SUSPEND); } - protected Class getCommandType() { + @Override + protected Class<ISuspendHandler> getCommandType() { return ISuspendHandler.class; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandHandler.java index 2a162df08..78a5233d4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; @@ -21,7 +22,8 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler; */ public class SuspendCommandHandler extends DebugCommandHandler { - protected Class getCommandType() { + @Override + protected Class<ISuspendHandler> getCommandType() { return ISuspendHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java index 5634bcd49..f452460c1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -31,15 +31,18 @@ import org.eclipse.ui.IWorkbenchPart; */ public class TerminateAllAction extends DebugCommandAction implements ILaunchesListener2 { + @Override protected ISelection getContext() { return new StructuredSelection(getLaunchManager().getLaunches()); } + @Override public void dispose() { getLaunchManager().removeLaunchListener(this); super.dispose(); } + @Override public void init(IWorkbenchPart part) { super.init(part); ILaunchManager launchManager = getLaunchManager(); @@ -53,50 +56,60 @@ public class TerminateAllAction extends DebugCommandAction implements ILaunchesL return DebugPlugin.getDefault().getLaunchManager(); } + @Override public String getHelpContextId() { return "org.eclipse.debug.ui.terminate_all_action_context"; //$NON-NLS-1$ } + @Override public String getId() { return "org.eclipse.debug.ui.debugview.popupMenu.terminateAll"; //$NON-NLS-1$ } + @Override public String getText() { return ActionMessages.TerminateAllAction_2; } + @Override public String getToolTipText() { return ActionMessages.TerminateAllAction_3; } + @Override public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages .getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_ALL); } + @Override public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages .getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_ALL); } + @Override public ImageDescriptor getImageDescriptor() { return DebugPluginImages .getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_ALL); } - protected Class getCommandType() { + @Override + protected Class<ITerminateHandler> getCommandType() { return ITerminateHandler.class; } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesTerminated(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesAdded(ILaunch[] launches) { setEnabled(true); } @@ -104,12 +117,14 @@ public class TerminateAllAction extends DebugCommandAction implements ILaunchesL /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesChanged(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesRemoved(ILaunch[] launches) { setEnabled(getLaunchManager().getLaunches().length > 0); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java index 940ba8918..e67c7265d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2011 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,10 +36,12 @@ import org.eclipse.jface.viewers.StructuredSelection; */ public class TerminateAndRelaunchAction extends DebugCommandAction { - public void postExecute(IRequest request, final Object[] targets) { + @Override + public void postExecute(IRequest request, final Object[] targets) { if (request.getStatus() == null || request.getStatus().isOK()) { DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { // Must be run in the UI thread since the launch can require // prompting to proceed for (int i = 0; i < targets.length; i++) { @@ -53,14 +55,14 @@ public class TerminateAndRelaunchAction extends DebugCommandAction { } } - protected ISelection getContext() { + @Override + protected ISelection getContext() { // Convert action context to contain only launch objects (bug 356651). ISelection context = super.getContext(); if (context instanceof IStructuredSelection && !context.isEmpty()) { IStructuredSelection ss = (IStructuredSelection)context; - Set launches = new HashSet(ss.size()); - for (Iterator itr = ss.iterator(); itr.hasNext();) { - + Set<ILaunch> launches = new HashSet<ILaunch>(ss.size()); + for (Iterator<Object> itr = ss.iterator(); itr.hasNext();) { ILaunch launch = DebugUIPlugin.getLaunch(itr.next()); if (launch != null) { launches.add(launch); @@ -72,10 +74,12 @@ public class TerminateAndRelaunchAction extends DebugCommandAction { } - protected Class getCommandType() { + @Override + protected Class<ITerminateHandler> getCommandType() { return ITerminateHandler.class; } + @Override public void debugContextChanged(DebugContextEvent event) { ISelection context = event.getContext(); if (context instanceof IStructuredSelection) { @@ -101,35 +105,43 @@ public class TerminateAndRelaunchAction extends DebugCommandAction { return false; } - public String getActionDefinitionId() { + @Override + public String getActionDefinitionId() { return ActionMessages.TerminateAndRelaunchAction_0; } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.terminate_and_relaunch_action_context"; //$NON-NLS-1$ } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.debugview.popupMenu.TerminateAndRelaunch"; //$NON-NLS-1$ } - public String getText() { + @Override + public String getText() { return ActionMessages.TerminateAndRelaunchAction_3; } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.TerminateAndRelaunchAction_4; } - public ImageDescriptor getDisabledImageDescriptor() { + @Override + public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_RELAUNCH); } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH); } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java index a2e8f0b7e..6159f5177 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -50,39 +50,48 @@ public class TerminateAndRemoveAction extends DebugCommandAction { */ private IWorkbenchPart fMyPart = null; - public String getText() { + @Override + public String getText() { return ActionMessages.TerminateAndRemoveAction_0; } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.terminate_and_remove_action_context"; //$NON-NLS-1$ } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.debugview.popupMenu.terminateAndRemove"; //$NON-NLS-1$ } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.TerminateAndRemoveAction_3; } - public ImageDescriptor getDisabledImageDescriptor() { + @Override + public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_REMOVE); } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE); } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE); } - protected Class getCommandType() { + @Override + protected Class<ITerminateHandler> getCommandType() { return ITerminateHandler.class; } - public void debugContextChanged(DebugContextEvent event) { + @Override + public void debugContextChanged(DebugContextEvent event) { boolean isAllTerminated = true; ISelection context = event.getContext(); if (context instanceof IStructuredSelection) { @@ -113,13 +122,15 @@ public class TerminateAndRemoveAction extends DebugCommandAction { } - protected void postExecute(IRequest request, Object[] targets) { + @Override + protected void postExecute(IRequest request, Object[] targets) { IStatus status = request.getStatus(); if(status == null || status.isOK()) { for (int i = 0; i < targets.length; i++) { ILaunch launch = DebugUIPlugin.getLaunch(targets[i]); - if (launch != null) - DebugPlugin.getDefault().getLaunchManager().removeLaunch(launch); + if (launch != null) { + DebugPlugin.getDefault().getLaunchManager().removeLaunch(launch); + } } } } @@ -127,7 +138,8 @@ public class TerminateAndRemoveAction extends DebugCommandAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.DebugCommandAction#runWithEvent(org.eclipse.swt.widgets.Event) */ - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (fCanTerminate) { IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); if (window != null) { @@ -155,7 +167,8 @@ public class TerminateAndRemoveAction extends DebugCommandAction { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.DebugCommandAction#init(org.eclipse.ui.IWorkbenchPart) */ - public void init(IWorkbenchPart part) { + @Override + public void init(IWorkbenchPart part) { super.init(part); // TODO: if #getContext() was API, this would not be needed fMyPart = part; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java index a8de94bdc..7822e95aa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,35 +28,43 @@ public class TerminateCommandAction extends DebugCommandAction { setActionDefinitionId("org.eclipse.debug.ui.commands.Terminate"); //$NON-NLS-1$ } - public String getText() { + @Override + public String getText() { return ActionMessages.TerminateAction_0; } - public String getHelpContextId() { + @Override + public String getHelpContextId() { return "org.eclipse.debug.ui.terminate_action_context"; //$NON-NLS-1$ } - public String getId() { + @Override + public String getId() { return "org.eclipse.debug.ui.debugview.toolbar.terminate"; //$NON-NLS-1$ } - public String getToolTipText() { + @Override + public String getToolTipText() { return ActionMessages.TerminateAction_3; } - public ImageDescriptor getDisabledImageDescriptor() { + @Override + public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE); } - public ImageDescriptor getHoverImageDescriptor() { + @Override + public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE); } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE); } - protected Class getCommandType() { + @Override + protected Class<ITerminateHandler> getCommandType() { return ITerminateHandler.class; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandHandler.java index 2eeb01889..26ba2c9db 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; @@ -21,7 +22,8 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler; */ public class TerminateCommandHandler extends DebugCommandHandler { - protected Class getCommandType() { + @Override + protected Class<ITerminateHandler> getCommandType() { return ITerminateHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java index 181d6ebf4..048a0a65a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java @@ -39,6 +39,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#getDisabledImageDescriptor() */ + @Override public ImageDescriptor getDisabledImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TOGGLE_STEP_FILTERS); } @@ -46,6 +47,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#getHelpContextId() */ + @Override public String getHelpContextId() { return "org.eclipse.debug.ui.step_with_filters_action_context"; //$NON-NLS-1$ } @@ -53,6 +55,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#getHoverImageDescriptor() */ + @Override public ImageDescriptor getHoverImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TOGGLE_STEP_FILTERS); } @@ -60,6 +63,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#getId() */ + @Override public String getId() { return "org.eclipse.debug.ui.actions.ToggleStepFilters"; //$NON-NLS-1$ } @@ -67,6 +71,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TOGGLE_STEP_FILTERS); } @@ -74,6 +79,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#getText() */ + @Override public String getText() { return ActionMessages.ToggleStepFiltersAction_1; } @@ -81,6 +87,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#getToolTipText() */ + @Override public String getToolTipText() { return ActionMessages.ToggleStepFiltersAction_0; } @@ -88,6 +95,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#getInitialEnablement() */ + @Override protected boolean getInitialEnablement() { return true; } @@ -95,14 +103,16 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#getCommandType() */ - protected Class getCommandType() { + @Override + protected Class<IStepFiltersHandler> getCommandType() { return IStepFiltersHandler.class; } /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#run() */ - public void run() { + @Override + public void run() { // ignore initial call to run from abstract debug view // that runs the action to initialize it's state when // the workbench persisted the action as "on" @@ -116,13 +126,15 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.jface.action.Action#getStyle() */ - public int getStyle() { + @Override + public int getStyle() { return AS_CHECK_BOX; } /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#debugContextChanged(org.eclipse.debug.ui.contexts.DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { ISelection context = event.getContext(); if (context.isEmpty()) { @@ -135,6 +147,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#init(org.eclipse.ui.IWorkbenchPart) */ + @Override public void init(IWorkbenchPart part) { super.init(part); initState(); @@ -143,6 +156,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { super.init(window); initState(); @@ -161,6 +175,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref /** * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#dispose() */ + @Override public void dispose() { super.dispose(); IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugPlugin.getUniqueIdentifier()); @@ -169,6 +184,7 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref } } + @Override public void preferenceChange(PreferenceChangeEvent event) { if (event.getKey().equals(StepFilterManager.PREF_USE_STEP_FILTERS)) { boolean checked = DebugUITools.isUseStepFilters(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandActionDelegate.java index 163927199..a654648da 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandActionDelegate.java @@ -29,7 +29,8 @@ public class ToggleStepFiltersCommandActionDelegate extends DebugCommandActionDe setAction(new ToggleStepFiltersAction()); } - public void init(IAction action) { + @Override + public void init(IAction action) { super.init(action); action.setChecked(DebugUITools.isUseStepFilters()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandHandler.java index aad7dc919..e1148235f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; @@ -21,7 +22,8 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler; */ public class ToggleStepFiltersCommandHandler extends DebugCommandHandler { - protected Class getCommandType() { + @Override + protected Class<IStepFiltersHandler> getCommandType() { return IStepFiltersHandler.class; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/UpdateActionsRequest.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/UpdateActionsRequest.java index 142dbb22d..30249935b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/UpdateActionsRequest.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/UpdateActionsRequest.java @@ -33,6 +33,7 @@ public class UpdateActionsRequest extends DebugCommandRequest implements IEnable /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.provisional.IBooleanRequestMonitor#setResult(boolean) */ + @Override public synchronized void setEnabled(boolean result) { fEnabled = result; } @@ -40,6 +41,7 @@ public class UpdateActionsRequest extends DebugCommandRequest implements IEnable /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#done() */ + @Override public synchronized void done() { if (!isCanceled()) { for (int i = 0; i < fActions.length; i++) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/UpdateHandlerRequest.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/UpdateHandlerRequest.java index a0069caee..9e8d3e616 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/UpdateHandlerRequest.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/UpdateHandlerRequest.java @@ -34,6 +34,7 @@ public class UpdateHandlerRequest extends DebugCommandRequest implements IEnable /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.provisional.IBooleanRequestMonitor#setResult(boolean) */ + @Override public synchronized void setEnabled(boolean result) { fEnabled = result; } @@ -41,6 +42,7 @@ public class UpdateHandlerRequest extends DebugCommandRequest implements IEnable /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#done() */ + @Override public synchronized void done() { fUpdater.setEnabled(fEnabled); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java index de1866407..fe6b175b2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -46,7 +46,6 @@ import com.ibm.icu.text.MessageFormat; * @see org.eclipse.debug.ui.actions.ContextualLaunchAction * * @since 3.3 - * CONTEXTLAUNCHING */ public final class ContextRunner { @@ -113,7 +112,7 @@ public final class ContextRunner { if(group != null) { LaunchConfigurationManager lcm = DebugUIPlugin.getDefault().getLaunchConfigurationManager(); String mode = group.getMode(); - List shortcuts = fLRM.getShortcutsForSelection(selection, mode); + List<LaunchShortcutExtension> shortcuts = fLRM.getShortcutsForSelection(selection, mode); // allow the shortcut to translate/provide the resource for the launch IResource overrideResource = fLRM.getLaunchableResource(shortcuts, selection); if(overrideResource != null) { @@ -127,15 +126,15 @@ public final class ContextRunner { return; } //get the configurations from the resource and participants - List configs = fLRM.getParticipatingLaunchConfigurations(selection, resource, shortcuts, mode); + List<ILaunchConfiguration> configs = fLRM.getParticipatingLaunchConfigurations(selection, resource, shortcuts, mode); int csize = configs.size(); if(csize == 1) { - launch((ILaunchConfiguration) configs.get(0), mode); + launch(configs.get(0), mode); } else if(csize < 1) { int esize = shortcuts.size(); if(esize == 1) { - launchShortcut(selection, (LaunchShortcutExtension) shortcuts.get(0), mode); + launchShortcut(selection, shortcuts.get(0), mode); } else if(esize > 1) { showShortcutSelectionDialog(resource, shortcuts, mode, selection); @@ -154,7 +153,7 @@ public final class ContextRunner { else { String msg = ContextMessages.ContextRunner_7; if(!resource.isAccessible()) { - msg = MessageFormat.format(ContextMessages.ContextRunner_13, new String[] {resource.getName()}); + msg = MessageFormat.format(ContextMessages.ContextRunner_13, new Object[] { resource.getName() }); } MessageDialog.openInformation(DebugUIPlugin.getShell(), ContextMessages.ContextRunner_0, msg); } @@ -229,8 +228,9 @@ public final class ContextRunner { } else { String label = launchMode.getLabel(); String modeLabel = DebugUIPlugin.removeAccelerators(label); - MessageDialog.openInformation(DebugUIPlugin.getShell(), MessageFormat.format(ContextMessages.ContextRunner_1, new String[]{modeLabel}), - MessageFormat.format(ContextMessages.ContextRunner_3, new String[]{configuration.getName(), modeLabel.toLowerCase()})); + MessageDialog.openInformation(DebugUIPlugin.getShell(), MessageFormat.format(ContextMessages.ContextRunner_1, new Object[] { modeLabel }), MessageFormat.format(ContextMessages.ContextRunner_3, new Object[] { + configuration.getName(), + modeLabel.toLowerCase() })); } return false; } @@ -249,7 +249,7 @@ public final class ContextRunner { * @param configurations the listing of applicable configurations to present * @param mode the mode */ - protected void showConfigurationSelectionDialog(List configurations, String mode) { + protected void showConfigurationSelectionDialog(List<ILaunchConfiguration> configurations, String mode) { LaunchConfigurationSelectionDialog lsd = new LaunchConfigurationSelectionDialog(DebugUIPlugin.getShell(), configurations); if(lsd.open() == IDialogConstants.OK_ID) { ILaunchConfiguration config = (ILaunchConfiguration) lsd.getResult()[0]; @@ -266,7 +266,7 @@ public final class ContextRunner { * @param mode the mode * @param selection the current selection */ - protected void showShortcutSelectionDialog(IResource resource, List shortcuts, String mode, IStructuredSelection selection) { + protected void showShortcutSelectionDialog(IResource resource, List<LaunchShortcutExtension> shortcuts, String mode, IStructuredSelection selection) { LaunchShortcutSelectionDialog dialog = new LaunchShortcutSelectionDialog(shortcuts, resource, mode); if (dialog.open() == Window.OK) { Object[] result = dialog.getResult(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java index b2a9e557a..3a766774b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java @@ -11,12 +11,12 @@ package org.eclipse.debug.internal.ui.contextlaunching; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.ListIterator; +import java.util.Map.Entry; import java.util.Set; import org.eclipse.core.expressions.IEvaluationContext; @@ -54,6 +54,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseTrackAdapter; import org.eclipse.swt.widgets.ToolBar; +import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.IWindowListener; @@ -80,6 +81,7 @@ import com.ibm.icu.text.MessageFormat; * * @since 3.3 */ +@SuppressWarnings("restriction") public class LaunchingResourceManager implements IPropertyChangeListener, IWindowListener, ISelectionListener, ILaunchHistoryChangedListener, ILaunchesListener2 { /** @@ -91,12 +93,12 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo * The map of ToolBars that have mouse tracker listeners associated with them: * stored as Map<IWorkbenchWindow, ToolBar> */ - private HashMap fToolbars = new HashMap(); + private HashMap<IWorkbenchWindow, ToolBar> fToolbars = new HashMap<IWorkbenchWindow, ToolBar>(); /** * the map of current labels */ - private HashMap fCurrentLabels = new HashMap(); + private HashMap<ILaunchGroup, String> fCurrentLabels = new HashMap<ILaunchGroup, String>(); /** * The selection has changed and we need to update the labels @@ -106,19 +108,19 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /** * Set of windows that have been opened and that we have registered selection listeners with */ - private HashSet fWindows = new HashSet(); + private HashSet<IWorkbenchWindow> fWindows = new HashSet<IWorkbenchWindow>(); /** * Cache of IResource -> ILaunchConfiguration[] used during a tooltip update job. * The cache is cleared after each tooltip update job is complete. */ - private HashMap fConfigCache = new HashMap(); + private HashMap<IResource, ILaunchConfiguration[]> fConfigCache = new HashMap<IResource, ILaunchConfiguration[]>(); /** * Cache of IResource -> LaunchShortcutExtension used during a tooltip update job. * The cache is cleared after each tooltip update job is complete. */ - private HashMap fExtCache = new HashMap(); + private HashMap<IResource, List<LaunchShortcutExtension>> fExtCache = new HashMap<IResource, List<LaunchShortcutExtension>>(); /** * Constant denoting the empty string; @@ -129,11 +131,13 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo * Provides a mouse tracker listener for the launching main toolbar */ private MouseTrackAdapter fMouseListener = new MouseTrackAdapter() { + @Override public void mouseEnter(MouseEvent e) { if(fUpdateLabel) { fUpdateLabel = false; fCurrentLabels.clear(); Job job = new Job("Compute launch button tooltip") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { computeLabels(); fConfigCache.clear(); @@ -197,7 +201,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo * @return the current resource label; */ public String getLaunchLabel(ILaunchGroup group) { - return (String) fCurrentLabels.get(group); + return fCurrentLabels.get(group); } /** @@ -227,7 +231,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo Object[] listeners = fLabelListeners.getListeners(); SelectedResourceManager srm = SelectedResourceManager.getDefault(); IStructuredSelection selection = srm.getCurrentSelection(); - List shortcuts = null; + List<LaunchShortcutExtension> shortcuts = null; IResource resource = srm.getSelectedResource(); for(int i = 0; i < listeners.length; i++) { group = ((ILaunchLabelChangedListener)listeners[i]).getLaunchGroup(); @@ -282,7 +286,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo } } if(launched) { - return MessageFormat.format(ContextMessages.LaunchingResourceManager_0, new String[] {config.getName()}); + return MessageFormat.format(ContextMessages.LaunchingResourceManager_0, new Object[] { config.getName() }); } return config.getName(); } @@ -310,19 +314,18 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo * @param group the {@link ILaunchGroup} to launch using * @return the label for the resource or the empty string, never <code>null</code> */ - protected String getLabel(IStructuredSelection selection, IResource resource, List shortcuts, ILaunchGroup group) { - List sc = pruneShortcuts(shortcuts, resource, group.getMode()); + protected String getLabel(IStructuredSelection selection, IResource resource, List<LaunchShortcutExtension> shortcuts, ILaunchGroup group) { + List<LaunchShortcutExtension> sc = pruneShortcuts(shortcuts, resource, group.getMode()); LaunchConfigurationManager lcm = DebugUIPlugin.getDefault().getLaunchConfigurationManager(); //see if the context is a shared configuration ILaunchConfiguration config = lcm.isSharedConfig(resource); if(config != null) { return appendLaunched(config); } - //TODO cache the results ? - List configs = getParticipatingLaunchConfigurations(selection, resource, sc, group.getMode()); + List<ILaunchConfiguration> configs = getParticipatingLaunchConfigurations(selection, resource, sc, group.getMode()); int csize = configs.size(); if(csize == 1) { - return appendLaunched((ILaunchConfiguration)configs.get(0)); + return appendLaunched(configs.get(0)); } else if(csize > 1) { config = lcm.getMRUConfiguration(configs, group, resource); @@ -334,7 +337,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo } } else { - List exts = (List) fExtCache.get(resource); + List<LaunchShortcutExtension> exts = fExtCache.get(resource); if(exts == null && resource != null) { fExtCache.put(resource, sc); } @@ -358,7 +361,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo return resource.getName(); } else { - return MessageFormat.format(ContextMessages.LaunchingResourceManager_1, new String[] {((LaunchShortcutExtension) sc.get(0)).getLabel()}); + return MessageFormat.format(ContextMessages.LaunchingResourceManager_1, new Object[] { sc.get(0).getLabel() }); } } else { @@ -376,12 +379,12 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo * * @since 3.4 */ - protected List pruneShortcuts(List shortcuts, IResource resource, String mode) { - List list = new ArrayList(shortcuts); + protected List<LaunchShortcutExtension> pruneShortcuts(List<LaunchShortcutExtension> shortcuts, IResource resource, String mode) { + List<LaunchShortcutExtension> list = new ArrayList<LaunchShortcutExtension>(shortcuts); if(resource == null) { LaunchShortcutExtension ext = null; - for(ListIterator iter = list.listIterator(); iter.hasNext();) { - ext = (LaunchShortcutExtension) iter.next(); + for (ListIterator<LaunchShortcutExtension> iter = list.listIterator(); iter.hasNext();) { + ext = iter.next(); if(!ext.isParticipant()) { iter.remove(); } @@ -402,14 +405,12 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo * * @since 3.4 */ - public IResource getLaunchableResource(List shortcuts, IStructuredSelection selection) { + public IResource getLaunchableResource(List<LaunchShortcutExtension> shortcuts, IStructuredSelection selection) { if(selection != null && !selection.isEmpty()) { - ArrayList resources = new ArrayList(); + ArrayList<IResource> resources = new ArrayList<IResource>(); IResource resource = null; Object o = selection.getFirstElement(); - LaunchShortcutExtension ext = null; - for(Iterator iter = shortcuts.iterator(); iter.hasNext();) { - ext = (LaunchShortcutExtension) iter.next(); + for (LaunchShortcutExtension ext : shortcuts) { if(o instanceof IEditorPart) { resource = ext.getLaunchableResource((IEditorPart) o); } @@ -422,7 +423,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo } } if(resources.size() > 0) { - return (IResource) resources.get(0); + return resources.get(0); } } return null; @@ -436,10 +437,10 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo * * @since 3.4 */ - public List getShortcutsForSelection(IStructuredSelection selection, String mode) { - ArrayList list = new ArrayList(); - List sc = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchShortcuts(); - List ctxt = new ArrayList(); + public List<LaunchShortcutExtension> getShortcutsForSelection(IStructuredSelection selection, String mode) { + ArrayList<LaunchShortcutExtension> list = new ArrayList<LaunchShortcutExtension>(); + List<LaunchShortcutExtension> sc = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchShortcuts(); + List<IEditorInput> ctxt = new ArrayList<IEditorInput>(); // work around to bug in Structured Selection that returns actual underlying array in selection // @see bug 211646 ctxt.addAll(selection.toList()); @@ -449,9 +450,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo } IEvaluationContext context = DebugUIPlugin.createEvaluationContext(ctxt); context.addVariable("selection", ctxt); //$NON-NLS-1$ - LaunchShortcutExtension ext = null; - for(Iterator iter = sc.iterator(); iter.hasNext();) { - ext = (LaunchShortcutExtension) iter.next(); + for (LaunchShortcutExtension ext : sc) { try { if(ext.evalEnablementExpression(context, ext.getContextualLaunchEnablementExpression()) && ext.getModes().contains(mode) && !WorkbenchActivityHelper.filterItem(ext)) { @@ -476,16 +475,15 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo * * @since 3.4 */ - public List getParticipatingLaunchConfigurations(IStructuredSelection selection, IResource resource, List shortcuts, String mode) { - HashSet configs = new HashSet(); + public List<ILaunchConfiguration> getParticipatingLaunchConfigurations(IStructuredSelection selection, IResource resource, List<LaunchShortcutExtension> shortcuts, String mode) { + List<ILaunchConfiguration> configs = new ArrayList<ILaunchConfiguration>(); int voteDefault = 0; if(selection != null) { Object o = selection.getFirstElement(); LaunchShortcutExtension ext = null; ILaunchConfiguration[] cfgs = null; - //TODO this falls victim to contributors code performance for(int i = 0; i < shortcuts.size(); i++) { - ext = (LaunchShortcutExtension) shortcuts.get(i); + ext = shortcuts.get(i); if(o instanceof IEditorPart) { cfgs = ext.getLaunchConfigurations((IEditorPart)o); } @@ -493,8 +491,8 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo cfgs = ext.getLaunchConfigurations(selection); } if (cfgs == null) { - Set types = ext.getAssociatedConfigurationTypes(); - addAllToList(configs, DebugUIPlugin.getDefault().getLaunchConfigurationManager().getApplicableLaunchConfigurations((String[]) types.toArray(new String[types.size()]), resource)); + Set<String> types = ext.getAssociatedConfigurationTypes(); + addAllToList(configs, DebugUIPlugin.getDefault().getLaunchConfigurationManager().getApplicableLaunchConfigurations(types.toArray(new String[types.size()]), resource)); voteDefault++; } else { if(cfgs.length > 0) { @@ -509,11 +507,11 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo // consider default configurations if no configurations were contributed addAllToList(configs, DebugUIPlugin.getDefault().getLaunchConfigurationManager().getApplicableLaunchConfigurations(null, resource)); } - Iterator iterator = configs.iterator(); + Iterator<ILaunchConfiguration> iterator = configs.iterator(); while (iterator.hasNext()) { - ILaunchConfiguration config = (ILaunchConfiguration) iterator.next(); + ILaunchConfiguration config = iterator.next(); try { - Set modes = config.getModes(); + Set<String> modes = config.getModes(); modes.add(mode); if (!config.getType().supportsModeCombination(modes)) { iterator.remove(); @@ -521,7 +519,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo } catch (CoreException e) {} } - return new ArrayList(configs); + return configs; } /** @@ -530,12 +528,14 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo * @param list the {@link List} to append to * @param values the array of {@link Object}s to add to the list */ - private void addAllToList(Collection list, Object[] values) { - if(list == null || values == null) { + private void addAllToList(List<ILaunchConfiguration> list, ILaunchConfiguration[] configs) { + if (list == null || configs == null) { return; } - for(int i = 0; i < values.length; i++) { - list.add(values[i]); + for (int i = 0; i < configs.length; i++) { + if (!list.contains(configs[i])) { + list.add(configs[i]); + } } } @@ -570,19 +570,18 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo DebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this); DebugUIPlugin.getDefault().getLaunchConfigurationManager().removeLaunchHistoryListener(this); DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this); - for(Iterator iter = fWindows.iterator(); iter.hasNext();) { - ((IWorkbenchWindow)iter.next()).getSelectionService().removeSelectionListener(this); + for (IWorkbenchWindow window : fWindows) { + window.getSelectionService().removeSelectionListener(this); } - IWorkbenchWindow window = null; // set fUpdateLabel to false so that mouse track listener will do nothing if called // before the asynchronous execution disposes them fUpdateLabel = false; - for(Iterator iter = fToolbars.keySet().iterator(); iter.hasNext();) { - window = (IWorkbenchWindow) iter.next(); - final ToolBar bar = (ToolBar) fToolbars.get(window); + for (Entry<IWorkbenchWindow, ToolBar> entry : fToolbars.entrySet()) { + final ToolBar bar = entry.getValue(); if(bar != null && !bar.isDisposed()) { final MouseTrackAdapter listener = fMouseListener; DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() { + @Override public void run() { bar.removeMouseTrackListener(listener); } @@ -599,6 +598,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /** * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowActivated(IWorkbenchWindow window) { if(!fToolbars.containsKey(window)) { addMouseListener(window); @@ -608,8 +608,9 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /** * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowClosed(IWorkbenchWindow window) { - ToolBar bar = (ToolBar) fToolbars.remove(window); + ToolBar bar = fToolbars.remove(window); if(bar != null && !bar.isDisposed()) { bar.removeMouseTrackListener(fMouseListener); } @@ -621,11 +622,13 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /** * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowDeactivated(IWorkbenchWindow window) {} /** * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowOpened(IWorkbenchWindow window) { if(fWindows.add(window)) { window.getSelectionService().addSelectionListener(this); @@ -655,6 +658,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /** * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { if(event.getProperty().equals(IInternalDebugUIConstants.PREF_USE_CONTEXTUAL_LAUNCH) || event.getProperty().equals(IInternalDebugUIConstants.PREF_LAUNCH_LAST_IF_NOT_LAUNCHABLE)) { @@ -668,6 +672,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /* (non-Javadoc) * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { if(isContextLaunchEnabled()) { fUpdateLabel = true; @@ -677,6 +682,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.ILaunchHistoryChangedListener#launchHistoryChanged() */ + @Override public void launchHistoryChanged() { //this always must be set to true, because as the history is loaded these events are fired, and we need to //update on workspace load. @@ -686,6 +692,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesTerminated(ILaunch[] launches) { fUpdateLabel = true; } @@ -693,6 +700,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesAdded(ILaunch[] launches) { fUpdateLabel = true; } @@ -700,11 +708,13 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesChanged(ILaunch[] launches) {} /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesRemoved(ILaunch[] launches) { //we want to ensure that even if a launch is removed from the debug view //when it is not terminated we update the label just in case. diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java index 3e0b39fb2..06b4f2db8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,51 +34,68 @@ import org.eclipse.ui.services.IEvaluationService; public class DebugContextManager implements IDebugContextManager { private static DebugContextManager fgDefault; - private Map fServices = new HashMap(); + private Map<IWorkbenchWindow, DebugWindowContextService> fServices = new HashMap<IWorkbenchWindow, DebugWindowContextService>(); private ListenerList fGlobalListeners = new ListenerList(); /** * A debug context service that does nothing (used for windows that have been closed) */ private static IDebugContextService NULL_SERVICE = new IDebugContextService() { + @Override public void removePostDebugContextListener(IDebugContextListener listener, String partId) { } + @Override public void removePostDebugContextListener(IDebugContextListener listener) { } + @Override public void removeDebugContextProvider(IDebugContextProvider provider) { } + @Override public void removeDebugContextListener(IDebugContextListener listener, String partId) { } + @Override public void removeDebugContextListener(IDebugContextListener listener) { } + @Override public ISelection getActiveContext(String partId) { return null; } + @Override public ISelection getActiveContext() { return null; } + @Override public void addPostDebugContextListener(IDebugContextListener listener, String partId) { } + @Override public void addPostDebugContextListener(IDebugContextListener listener) { } + @Override public void addDebugContextProvider(IDebugContextProvider provider) { } + @Override public void addDebugContextListener(IDebugContextListener listener, String partId) { } + @Override public void addDebugContextListener(IDebugContextListener listener) { } + @Override public void addDebugContextListener(IDebugContextListener listener, String partId, String partSecondaryId) { } + @Override public void removeDebugContextListener(IDebugContextListener listener, String partId, String partSecondaryId) { } + @Override public ISelection getActiveContext(String partId, String partSecondaryId) { return null; } + @Override public void addPostDebugContextListener(IDebugContextListener listener, String partId, String partSecondaryId) { } + @Override public void removePostDebugContextListener(IDebugContextListener listener, String partId, String partSecondaryId) { } }; @@ -88,20 +105,23 @@ public class DebugContextManager implements IDebugContextManager { /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowActivated(IWorkbenchWindow window) { } /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowDeactivated(IWorkbenchWindow window) { } /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowClosed(final IWorkbenchWindow window) { - DebugWindowContextService service = (DebugWindowContextService) fServices.get(window); + DebugWindowContextService service = fServices.get(window); if (service != null) { fServices.remove(window); service.dispose(); @@ -111,6 +131,7 @@ public class DebugContextManager implements IDebugContextManager { /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowOpened(IWorkbenchWindow window) { } @@ -132,7 +153,7 @@ public class DebugContextManager implements IDebugContextManager { } protected IDebugContextService createService(IWorkbenchWindow window) { - DebugWindowContextService service = (DebugWindowContextService) fServices.get(window); + DebugWindowContextService service = fServices.get(window); if (service == null) { IEvaluationService evaluationService = (IEvaluationService)window.getService(IEvaluationService.class); if (window.getShell() == null || evaluationService == null) { @@ -153,12 +174,13 @@ public class DebugContextManager implements IDebugContextManager { } protected IDebugContextService getService(IWorkbenchWindow window) { - return (DebugWindowContextService) fServices.get(window); + return fServices.get(window); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.contexts.IDebugContextManager#addDebugContextListener(org.eclipse.debug.internal.ui.contexts.IDebugContextListener) */ + @Override public void addDebugContextListener(IDebugContextListener listener) { fGlobalListeners.add(listener); DebugWindowContextService[] services = getServices(); @@ -171,6 +193,7 @@ public class DebugContextManager implements IDebugContextManager { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.contexts.IDebugContextManager#removeDebugContextListener(org.eclipse.debug.internal.ui.contexts.IDebugContextListener) */ + @Override public void removeDebugContextListener(IDebugContextListener listener) { fGlobalListeners.remove(listener); DebugWindowContextService[] services = getServices(); @@ -186,13 +209,14 @@ public class DebugContextManager implements IDebugContextManager { * @return existing context services */ private DebugWindowContextService[] getServices() { - Collection sevices = fServices.values(); - return (DebugWindowContextService[]) sevices.toArray(new DebugWindowContextService[sevices.size()]); + Collection<DebugWindowContextService> sevices = fServices.values(); + return sevices.toArray(new DebugWindowContextService[sevices.size()]); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextManager#getContextService(org.eclipse.ui.IWorkbenchWindow) */ + @Override public IDebugContextService getContextService(IWorkbenchWindow window) { return createService(window); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextSourceProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextSourceProvider.java index 847f24112..f3d20350f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextSourceProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextSourceProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 Wind River Systems and others. + * Copyright (c) 2006, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.contexts; @@ -17,6 +18,7 @@ import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.contexts.DebugContextEvent; import org.eclipse.debug.ui.contexts.IDebugContextListener; import org.eclipse.debug.ui.contexts.IDebugContextService; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.AbstractSourceProvider; import org.eclipse.ui.ISources; import org.eclipse.ui.services.IEvaluationService; @@ -49,23 +51,27 @@ public class DebugContextSourceProvider extends AbstractSourceProvider implement fEvaluationService.addSourceProvider(this); } + @Override public void debugContextChanged(DebugContextEvent event) { - Map values = new HashMap(1); + Map<String, ISelection> values = new HashMap<String, ISelection>(1); values.put(IDebugUIConstants.DEBUG_CONTEXT_SOURCE_NAME, event.getContext()); fireSourceChanged(ISources.ACTIVE_CURRENT_SELECTION, values); } + @Override public void dispose() { fDebugContextService.removeDebugContextListener(this); fEvaluationService.removeSourceProvider(this); } + @Override public String[] getProvidedSourceNames() { return PROVIDED_SOURCE_NAMES; } + @Override public Map getCurrentState() { - Map currentState = new HashMap(1); + Map<String, ISelection> currentState = new HashMap<String, ISelection>(1); currentState.put(IDebugUIConstants.DEBUG_CONTEXT_SOURCE_NAME, fDebugContextService.getActiveContext()); return currentState; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java index 38ea299a7..35052121c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -68,33 +68,33 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I * Map of debug model identifier to associated contexts as defined * by <code>debugModelContextBindings</code> extensions. */ - private Map fModelToContextIds = new HashMap(); + private Map<String, List<String>> fModelToContextIds = new HashMap<String, List<String>>(); /** * Map of launch objects to enabled model ids */ - private Map fLaunchToModelIds = new HashMap(); + private Map<ILaunch, Set<String>> fLaunchToModelIds = new HashMap<ILaunch, Set<String>>(); /** * Map of launch objects to context activations */ - private Map fLanuchToContextActivations = new HashMap(); + private Map<ILaunch, List<IContextActivation>> fLanuchToContextActivations = new HashMap<ILaunch, List<IContextActivation>>(); /** * A list of activity pattern bindings for debug models. */ - private List fModelPatternBindings = new ArrayList(); + private List<IActivityPatternBinding> fModelPatternBindings = new ArrayList<IActivityPatternBinding>(); /** - * Map of debug model ids to assocaited activity ids. + * Map of debug model ids to associated activity ids. */ - private Map fModelToActivities = new HashMap(); + private Map<String, Set<String>> fModelToActivities = new HashMap<String, Set<String>>(); /** * A set of debug model ids for which activities have been enabled. * Cleared when enabled activities change. */ - private Set fModelsEnabledForActivities = new HashSet(); + private Set<String> fModelsEnabledForActivities = new HashSet<String>(); // extension point public static final String ID_DEBUG_MODEL_CONTEXT_BINDINGS= "debugModelContextBindings"; //$NON-NLS-1$ @@ -143,9 +143,9 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I String contextId = element.getAttribute(ATTR_CONTEXT_ID); synchronized (this) { if (modelIdentifier != null && contextId != null) { - List contextIds = (List) fModelToContextIds.get(modelIdentifier); + List<String> contextIds = fModelToContextIds.get(modelIdentifier); if (contextIds == null) { - contextIds = new ArrayList(); + contextIds = new ArrayList<String>(); fModelToContextIds.put(modelIdentifier, contextIds); } contextIds.add(contextId); @@ -161,16 +161,12 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I */ private void loadDebugModelActivityExtensions() { IActivityManager activityManager = PlatformUI.getWorkbench().getActivitySupport().getActivityManager(); - Set activityIds = activityManager.getDefinedActivityIds(); - Iterator activityIterator = activityIds.iterator(); - while (activityIterator.hasNext()) { - String activityId= (String) activityIterator.next(); + Set<String> activityIds = activityManager.getDefinedActivityIds(); + for (String activityId : activityIds) { IActivity activity = activityManager.getActivity(activityId); if (activity != null) { - Set patternBindings = activity.getActivityPatternBindings(); - Iterator patternIterator= patternBindings.iterator(); - while (patternIterator.hasNext()) { - IActivityPatternBinding patternBinding= (IActivityPatternBinding) patternIterator.next(); + Set<IActivityPatternBinding> patternBindings = activity.getActivityPatternBindings(); + for (IActivityPatternBinding patternBinding : patternBindings) { String pattern = patternBinding.getPattern().pattern(); if (pattern.endsWith(DEBUG_MODEL_ACTIVITY_SUFFIX)) { fModelPatternBindings.add(patternBinding); @@ -180,12 +176,13 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I } } + @Override public void debugContextChanged(DebugContextEvent event) { if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { ISelection selection = event.getContext(); if (selection instanceof IStructuredSelection) { IStructuredSelection ss = (IStructuredSelection) selection; - Iterator iterator = ss.iterator(); + Iterator<?> iterator = ss.iterator(); while (iterator.hasNext()) { activated(iterator.next()); } @@ -208,11 +205,11 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I if (launch == null || launch.isTerminated()) { return; } - List toEnable = new ArrayList(modelIds.length); + List<String> toEnable = new ArrayList<String>(modelIds.length); synchronized (this) { - Set alreadyEnabled = (Set) fLaunchToModelIds.get(launch); + Set<String> alreadyEnabled = fLaunchToModelIds.get(launch); if (alreadyEnabled == null) { - alreadyEnabled = new HashSet(); + alreadyEnabled = new HashSet<String>(); fLaunchToModelIds.put(launch, alreadyEnabled); } for (int i = 0; i < modelIds.length; i++) { @@ -224,7 +221,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I } } for (int i = 0; i < toEnable.size(); i++) { - activateModel((String)toEnable.get(i), launch); + activateModel(toEnable.get(i), launch); } enableActivitiesFor(modelIds); @@ -238,22 +235,20 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I * @param launch the launch the model is being enabled for */ private void activateModel(String modelId, ILaunch launch) { - List contextIds = null; + List<String> contextIds = null; synchronized (this) { - contextIds = (List) fModelToContextIds.get(modelId); + contextIds = fModelToContextIds.get(modelId); if (contextIds == null) { // if there are no contexts for a model, the base debug context should // be activated (i.e. a debug model with no org.eclipse.ui.contexts and // associated org.eclipse.debug.ui.modelContextBindings) - contextIds = new ArrayList(); + contextIds = new ArrayList<String>(); contextIds.add(DEBUG_CONTEXT); fModelToContextIds.put(modelId, contextIds); } } - - Iterator iterator = contextIds.iterator(); - while (iterator.hasNext()) { - activateContext((String) iterator.next(), launch); + for (String id : contextIds) { + activateContext(id, launch); } } @@ -288,9 +283,9 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I * @param activation */ private synchronized void addActivation(ILaunch launch, IContextActivation activation) { - List activations = (List) fLanuchToContextActivations.get(launch); + List<IContextActivation> activations = fLanuchToContextActivations.get(launch); if (activations == null) { - activations = new ArrayList(); + activations = new ArrayList<IContextActivation>(); fLanuchToContextActivations.put(launch, activations); } activations.add(activation); @@ -340,22 +335,22 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesTerminated(ILaunch[] launches) { // disable activated contexts for (int i = 0; i < launches.length; i++) { ILaunch launch = launches[i]; - List activations; + List<IContextActivation> activations; synchronized(this) { - activations = (List) fLanuchToContextActivations.remove(launch); + activations = fLanuchToContextActivations.remove(launch); fLaunchToModelIds.remove(launch); } if (activations != null) { - final List _activations = activations; + final List<IContextActivation> _activations = activations; UIJob job = new UIJob("Deactivate debug contexts") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { - Iterator iterator = _activations.iterator(); - while (iterator.hasNext()) { - IContextActivation activation = (IContextActivation) iterator.next(); + for (IContextActivation activation : _activations) { activation.getContextService().deactivateContext(activation); } return Status.OK_STATUS; @@ -372,17 +367,20 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesRemoved(ILaunch[] launches) {} /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesAdded(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesChanged(ILaunch[] launches) { } @@ -392,18 +390,16 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I * @param target debug context * @return associated workbench contexts */ - public List getWorkbenchContextsForDebugContext(Object target) { - List workbenchContexts = new ArrayList(); + public List<String> getWorkbenchContextsForDebugContext(Object target) { + List<String> workbenchContexts = new ArrayList<String>(); String[] modelIds = getDebugModelIds(target); if (modelIds != null) { for (int i = 0; i < modelIds.length; i++) { String modelId = modelIds[i]; synchronized (this) { - List contextIds = (List) fModelToContextIds.get(modelId); + List<String> contextIds = fModelToContextIds.get(modelId); if (contextIds != null) { - Iterator contextIterator = contextIds.iterator(); - while (contextIterator.hasNext()) { - String contextId = (String) contextIterator.next(); + for (String contextId : contextIds) { if (!workbenchContexts.contains(contextId)) { workbenchContexts.add(contextId); } @@ -422,18 +418,16 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I * @param debug model ids for which to enable activities */ private void enableActivitiesFor(String[] modelIds) { - Set activities = null; + Set<String> activities = null; for (int i = 0; i < modelIds.length; i++) { String id = modelIds[i]; if (!fModelsEnabledForActivities.contains(id)) { - Set ids= (Set) fModelToActivities.get(id); + Set<String> ids = fModelToActivities.get(id); if (ids == null) { // first time the model has been seen, perform pattern matching - ids = new HashSet(); + ids = new HashSet<String>(); fModelToActivities.put(id, ids); - Iterator bindings = fModelPatternBindings.iterator(); - while (bindings.hasNext()) { - IActivityPatternBinding binding = (IActivityPatternBinding) bindings.next(); + for (IActivityPatternBinding binding : fModelPatternBindings) { String regex = binding.getPattern().pattern(); regex = regex.substring(0, regex.length() - DEBUG_MODEL_ACTIVITY_SUFFIX.length()); if (Pattern.matches(regex, id)) { @@ -443,7 +437,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I } if (!ids.isEmpty()) { if (activities == null) { - activities = new HashSet(); + activities = new HashSet<String>(); } activities.addAll(ids); } @@ -452,9 +446,9 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I } if (activities != null) { IWorkbenchActivitySupport activitySupport = PlatformUI.getWorkbench().getActivitySupport(); - Set enabledActivityIds = activitySupport.getActivityManager().getEnabledActivityIds(); + Set<String> enabledActivityIds = activitySupport.getActivityManager().getEnabledActivityIds(); if (!enabledActivityIds.containsAll(activities)) { - enabledActivityIds = new HashSet(enabledActivityIds); + enabledActivityIds = new HashSet<String>(enabledActivityIds); enabledActivityIds.addAll(activities); activitySupport.setEnabledActivityIds(activities); } @@ -464,6 +458,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivityManagerListener#activityManagerChanged(org.eclipse.ui.activities.ActivityManagerEvent) */ + @Override public void activityManagerChanged(ActivityManagerEvent activityManagerEvent) { if (activityManagerEvent.haveEnabledActivityIdsChanged()) { fModelsEnabledForActivities.clear(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java index 9853bf4ab..d0979911d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -46,12 +46,12 @@ import org.eclipse.ui.services.IEvaluationService; */ public class DebugWindowContextService implements IDebugContextService, IPartListener2, IDebugContextListener { - private Map fListenersByPartId = new HashMap(); - private Map fProvidersByPartId = new HashMap(); - private Map fPostListenersByPartId = new HashMap(); + private Map<String, ListenerList> fListenersByPartId = new HashMap<String, ListenerList>(); + private Map<String, IDebugContextProvider> fProvidersByPartId = new HashMap<String, IDebugContextProvider>(); + private Map<String, ListenerList> fPostListenersByPartId = new HashMap<String, ListenerList>(); private IWorkbenchWindow fWindow; - private List fProviders = new ArrayList(); + private List<IDebugContextProvider> fProviders = new ArrayList<IDebugContextProvider>(); private DebugContextSourceProvider fSourceProvider; @@ -68,8 +68,12 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis fWindow = null; } + @Override public synchronized void addDebugContextProvider(IDebugContextProvider provider) { - if (fWindow == null) return; // disposed + if (fWindow == null) + { + return; // disposed + } IWorkbenchPart part = provider.getPart(); fProvidersByPartId.put( getCombinedPartId(part), provider ); @@ -99,6 +103,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis provider.addDebugContextListener(this); } + @Override public synchronized void removeDebugContextProvider(IDebugContextProvider provider) { int index = fProviders.indexOf(provider); if (index >= 0) { @@ -124,12 +129,14 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService#addDebugContextListener(org.eclipse.debug.ui.contexts.IDebugContextListener) */ + @Override public void addDebugContextListener(IDebugContextListener listener) { addDebugContextListener(listener, null); } + @Override public void addPostDebugContextListener(IDebugContextListener listener, String partId) { - ListenerList list = (ListenerList) fPostListenersByPartId.get(partId); + ListenerList list = fPostListenersByPartId.get(partId); if (list == null) { list = new ListenerList(); fPostListenersByPartId.put(partId, list); @@ -137,17 +144,20 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis list.add(listener); } + @Override public void addPostDebugContextListener(IDebugContextListener listener) { addPostDebugContextListener(listener, null); } + @Override public void removePostDebugContextListener(IDebugContextListener listener, String partId) { - ListenerList list = (ListenerList) fPostListenersByPartId.get(partId); + ListenerList list = fPostListenersByPartId.get(partId); if (list != null) { list.remove(listener); } } + @Override public void removePostDebugContextListener(IDebugContextListener listener) { removePostDebugContextListener(listener, null); } @@ -155,6 +165,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService#removeDebugContextListener(org.eclipse.debug.ui.contexts.IDebugContextListener) */ + @Override public void removeDebugContextListener(IDebugContextListener listener) { removeDebugContextListener(listener, null); } @@ -207,9 +218,11 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis for (int i = 0; i < listeners.length; i++) { final IDebugContextListener listener = (IDebugContextListener) listeners[i]; SafeRunner.run(new ISafeRunnable() { + @Override public void run() throws Exception { listener.debugContextChanged(event); } + @Override public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } @@ -221,15 +234,15 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis String id = null; if (part != null) { id = getCombinedPartId(part); - ListenerList listenerList = (ListenerList)fListenersByPartId.get(id); + ListenerList listenerList = fListenersByPartId.get(id); return listenerList != null ? listenerList.getListeners() : new Object[0]; } else { - List retVal = new ArrayList(); - retVal.addAll(Arrays.asList(((ListenerList)fListenersByPartId.get(null)).getListeners()) ); - outer: for (Iterator itr = fListenersByPartId.keySet().iterator(); itr.hasNext();) { - String listenerPartId = (String)itr.next(); + List<Object> retVal = new ArrayList<Object>(); + retVal.addAll(Arrays.asList(fListenersByPartId.get(null).getListeners()) ); + outer: for (Iterator<String> itr = fListenersByPartId.keySet().iterator(); itr.hasNext();) { + String listenerPartId = itr.next(); for (int i = 0; i < fProviders.size(); i++) { - String providerPartId = getCombinedPartId(((IDebugContextProvider)fProviders.get(i)).getPart()); + String providerPartId = getCombinedPartId(fProviders.get(i).getPart()); if ((listenerPartId == null && providerPartId == null) || (listenerPartId != null && listenerPartId.equals(providerPartId))) { @@ -237,10 +250,12 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis } } - List toAdd = Arrays.asList(((ListenerList)fListenersByPartId.get(listenerPartId)).getListeners()); - for (Iterator addItr = toAdd.iterator(); addItr.hasNext();) { + List<Object> toAdd = Arrays.asList(fListenersByPartId.get(listenerPartId).getListeners()); + for (Iterator<Object> addItr = toAdd.iterator(); addItr.hasNext();) { Object element = addItr.next(); - if (!retVal.contains(element)) retVal.add(element); + if (!retVal.contains(element)) { + retVal.add(element); + } } } @@ -252,26 +267,26 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis String id = null; if (part != null) { id = getCombinedPartId(part); - ListenerList listenerList = (ListenerList)fPostListenersByPartId.get(id); + ListenerList listenerList = fPostListenersByPartId.get(id); return listenerList != null ? listenerList.getListeners() : new Object[0]; } else { - List retVal = new ArrayList(); - ListenerList postListenersList = (ListenerList)fPostListenersByPartId.get(null); + List<Object> retVal = new ArrayList<Object>(); + ListenerList postListenersList = fPostListenersByPartId.get(null); if (postListenersList != null) { retVal.addAll( Arrays.asList(postListenersList.getListeners()) ); } - outer: for (Iterator itr = fPostListenersByPartId.keySet().iterator(); itr.hasNext();) { - String listenerPartId = (String)itr.next(); + outer: for (Iterator<String> itr = fPostListenersByPartId.keySet().iterator(); itr.hasNext();) { + String listenerPartId = itr.next(); for (int i = 0; i < fProviders.size(); i++) { - String providerPartId = getCombinedPartId(((IDebugContextProvider)fProviders.get(i)).getPart()); + String providerPartId = getCombinedPartId(fProviders.get(i).getPart()); if ((listenerPartId == null && providerPartId == null) || (listenerPartId != null && listenerPartId.equals(providerPartId))) { continue outer; } } - retVal.addAll( Arrays.asList(((ListenerList)fPostListenersByPartId.get(listenerPartId)).getListeners()) ); + retVal.addAll( Arrays.asList(fPostListenersByPartId.get(listenerPartId).getListeners()) ); } return retVal.toArray(); } @@ -280,8 +295,9 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService#addDebugContextListener(org.eclipse.debug.ui.contexts.IDebugContextListener, java.lang.String) */ + @Override public synchronized void addDebugContextListener(IDebugContextListener listener, String partId) { - ListenerList list = (ListenerList) fListenersByPartId.get(partId); + ListenerList list = fListenersByPartId.get(partId); if (list == null) { list = new ListenerList(); fListenersByPartId.put(partId, list); @@ -292,20 +308,23 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService#removeDebugContextListener(org.eclipse.debug.ui.contexts.IDebugContextListener, java.lang.String) */ + @Override public void removeDebugContextListener(IDebugContextListener listener, String partId) { - ListenerList list = (ListenerList) fListenersByPartId.get(partId); + ListenerList list = fListenersByPartId.get(partId); if (list != null) { list.remove(listener); - if (list.size() == 0) + if (list.size() == 0) { fListenersByPartId.remove(partId); + } } } /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService#getActiveContext(java.lang.String) */ + @Override public ISelection getActiveContext(String partId) { - IDebugContextProvider provider = (IDebugContextProvider) fProvidersByPartId.get(partId); + IDebugContextProvider provider = fProvidersByPartId.get(partId); if (provider != null) { return provider.getActiveContext(); } @@ -315,6 +334,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService#getActiveContext() */ + @Override public ISelection getActiveContext() { IDebugContextProvider activeProvider = getActiveProvider(); if (activeProvider != null) { @@ -330,7 +350,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis */ private IDebugContextProvider getActiveProvider() { if (!fProviders.isEmpty()) { - return (IDebugContextProvider)fProviders.get(0); + return fProviders.get(0); } return null; } @@ -338,8 +358,9 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partActivated(IWorkbenchPartReference partRef) { - IDebugContextProvider provider = (IDebugContextProvider) fProvidersByPartId.get(partRef.getId()); + IDebugContextProvider provider = fProvidersByPartId.get(partRef.getId()); if (provider != null) { boolean canSetActive = true; if (provider instanceof IDebugContextProvider2) { @@ -361,48 +382,56 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public synchronized void partClosed(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partDeactivated(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partOpened(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partHidden(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partVisible(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partInputChanged(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextEventListener#contextEvent(org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { notify(event); } @@ -426,6 +455,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService2#addDebugContextListener(org.eclipse.debug.ui.contexts.IDebugContextListener, java.lang.String, java.lang.String) */ + @Override public void addDebugContextListener(IDebugContextListener listener, String partId, String partSecondaryId) { addDebugContextListener(listener, getCombinedPartId(partId, partSecondaryId)); } @@ -433,6 +463,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService2#removeDebugContextListener(org.eclipse.debug.ui.contexts.IDebugContextListener, java.lang.String, java.lang.String) */ + @Override public void removeDebugContextListener(IDebugContextListener listener, String partId, String partSecondaryId) { removeDebugContextListener(listener, getCombinedPartId(partId, partSecondaryId)); } @@ -440,6 +471,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService2#addPostDebugContextListener(org.eclipse.debug.ui.contexts.IDebugContextListener, java.lang.String, java.lang.String) */ + @Override public void addPostDebugContextListener(IDebugContextListener listener, String partId, String partSecondaryId) { addPostDebugContextListener(listener, getCombinedPartId(partId, partSecondaryId)); } @@ -447,6 +479,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService2#removePostDebugContextListener(org.eclipse.debug.ui.contexts.IDebugContextListener, java.lang.String, java.lang.String) */ + @Override public void removePostDebugContextListener(IDebugContextListener listener, String partId, String partSecondaryId) { removePostDebugContextListener(listener, getCombinedPartId(partId, partSecondaryId)); } @@ -454,6 +487,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextService2#getActiveContext(java.lang.String, java.lang.String) */ + @Override public ISelection getActiveContext(String partId, String partSecondaryId) { return getActiveContext(getCombinedPartId(partId, partSecondaryId)); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/LaunchSuspendTrigger.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/LaunchSuspendTrigger.java index 08dd1518d..4302aed21 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/LaunchSuspendTrigger.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/LaunchSuspendTrigger.java @@ -54,6 +54,7 @@ public class LaunchSuspendTrigger implements ISuspendTrigger, IDebugEventSetList /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.ISuspendTrigger#addSuspendTriggerListener(org.eclipse.debug.ui.contexts.ISuspendTriggerListener) */ + @Override public void addSuspendTriggerListener(ISuspendTriggerListener listener) { if (fListeners != null) { fListeners.add(listener); @@ -63,6 +64,7 @@ public class LaunchSuspendTrigger implements ISuspendTrigger, IDebugEventSetList /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.ISuspendTrigger#removeSuspendTriggerListener(org.eclipse.debug.ui.contexts.ISuspendTriggerListener) */ + @Override public void removeSuspendTriggerListener(ISuspendTriggerListener listener) { if (fListeners != null) { fListeners.remove(listener); @@ -75,6 +77,7 @@ public class LaunchSuspendTrigger implements ISuspendTrigger, IDebugEventSetList /* (non-Javadoc) * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ + @Override public void handleDebugEvents(DebugEvent[] events) { // open the debugger if this is a suspend event and the debug view is not yet open // and the preferences are set to switch @@ -119,11 +122,13 @@ public class LaunchSuspendTrigger implements ISuspendTrigger, IDebugEventSetList for (int i = 0; i < listeners.length; i++) { final ISuspendTriggerListener listener = (ISuspendTriggerListener) listeners[i]; SafeRunner.run(new ISafeRunnable() { - public void run() throws Exception { + @Override + public void run() throws Exception { listener.suspended(launch, temp); } - public void handleException(Throwable exception) { + @Override + public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/SuspendTriggerAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/SuspendTriggerAdapterFactory.java index 27c026894..d542267b9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/SuspendTriggerAdapterFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/SuspendTriggerAdapterFactory.java @@ -22,15 +22,16 @@ import org.eclipse.debug.ui.contexts.ISuspendTrigger; */ public class SuspendTriggerAdapterFactory implements IAdapterFactory { - private Map fSuspendTriggers = new HashMap(); + private Map<Object, LaunchSuspendTrigger> fSuspendTriggers = new HashMap<Object, LaunchSuspendTrigger>(); /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ + @Override public synchronized Object getAdapter(Object adaptableObject, Class adapterType) { if (adapterType.equals(ISuspendTrigger.class)) { if (adaptableObject instanceof ILaunch) { - Object trigger = fSuspendTriggers.get(adaptableObject); + LaunchSuspendTrigger trigger = fSuspendTriggers.get(adaptableObject); if (trigger == null) { trigger = new LaunchSuspendTrigger((ILaunch) adaptableObject, this); fSuspendTriggers.put(adaptableObject, trigger); @@ -44,6 +45,7 @@ public class SuspendTriggerAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override public Class[] getAdapterList() { return new Class[]{ISuspendTrigger.class}; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/AsynchronousDebugLabelAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/AsynchronousDebugLabelAdapter.java index 8547d1c12..3de6db4e1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/AsynchronousDebugLabelAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/AsynchronousDebugLabelAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.debug.internal.ui.elements.adapters; import java.util.Arrays; -import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; @@ -40,6 +39,7 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter { /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.AsynchronousLabelAdapter#computeLabels(java.lang.Object, org.eclipse.debug.ui.viewers.IPresentationContext, org.eclipse.debug.ui.viewers.ILabelRequestMonitor) */ + @Override protected void computeLabels(Object element, IPresentationContext context, ILabelRequestMonitor monitor) { DelegatingModelPresentation presentation = DebugElementHelper.getPresentation(); // Honor view specific settings in a debug view by copying model presentation settings @@ -48,7 +48,7 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter { if (element instanceof IDebugElement && context.getPart() instanceof IDebugView) { IDebugView debugView = (IDebugView)context.getPart(); IDebugModelPresentation pres = debugView.getPresentation(((IDebugElement)element).getModelIdentifier()); - Map settings = null; + Map<String, Object> settings = null; synchronized (presentation) { if (pres instanceof DelegatingModelPresentation) { settings = ((DelegatingModelPresentation)pres).getAttributes(); @@ -56,10 +56,8 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter { settings = ((LazyModelPresentation)pres).getAttributes(); } if (settings != null) { - Iterator iterator = settings.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = (Entry) iterator.next(); - presentation.setAttribute((String) entry.getKey(), entry.getValue()); + for (Entry<String, Object> entry : settings.entrySet()) { + presentation.setAttribute(entry.getKey(), entry.getValue()); } super.computeLabels(element, context, monitor); return; @@ -72,6 +70,7 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter { /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.AsynchronousLabelAdapter#getLabels(java.lang.Object, org.eclipse.debug.ui.viewers.IPresentationContext) */ + @Override protected String[] getLabels(Object element, IPresentationContext context) throws CoreException { return new String[] {DebugElementHelper.getLabel(element)}; } @@ -79,6 +78,7 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter { /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.AsynchronousLabelAdapter#getImageDescriptors(java.lang.Object, org.eclipse.debug.ui.viewers.IPresentationContext) */ + @Override protected ImageDescriptor[] getImageDescriptors(Object element, IPresentationContext context) throws CoreException { return new ImageDescriptor[] {DebugElementHelper.getImageDescriptor(element)}; } @@ -86,6 +86,7 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter { /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.AsynchronousLabelAdapter#getFontDatas(java.lang.Object, org.eclipse.debug.ui.viewers.IPresentationContext) */ + @Override protected FontData[] getFontDatas(Object element, IPresentationContext context) throws CoreException { FontData[] datas = new FontData[getNumElements(context)]; Arrays.fill(datas, DebugElementHelper.getFont(element)); @@ -95,6 +96,7 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter { /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.AsynchronousLabelAdapter#getForegrounds(java.lang.Object, org.eclipse.debug.ui.viewers.IPresentationContext) */ + @Override protected RGB[] getForegrounds(Object element, IPresentationContext context) throws CoreException { RGB[] rgbs = new RGB[getNumElements(context)]; Arrays.fill(rgbs, DebugElementHelper.getForeground(element)); @@ -104,6 +106,7 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter { /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.AsynchronousLabelAdapter#getBackgrounds(java.lang.Object, org.eclipse.debug.ui.viewers.IPresentationContext) */ + @Override protected RGB[] getBackgrounds(Object element, IPresentationContext context) throws CoreException { RGB[] rgbs = new RGB[getNumElements(context)]; Arrays.fill(rgbs, DebugElementHelper.getBackground(element)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultBreakpointsViewInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultBreakpointsViewInput.java index a525bdf95..b8b34d385 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultBreakpointsViewInput.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultBreakpointsViewInput.java @@ -48,7 +48,8 @@ public class DefaultBreakpointsViewInput { * (non-Javadoc) * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { if (getContext() != null) { return getContext().hashCode(); } else { @@ -60,7 +61,8 @@ public class DefaultBreakpointsViewInput { * (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object arg0) { + @Override + public boolean equals(Object arg0) { if ( (arg0 != null) && arg0.getClass().equals(this.getClass()) ) { IPresentationContext context = ((DefaultBreakpointsViewInput) arg0).getContext(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultVariableCellModifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultVariableCellModifier.java index 346efdc21..33b394dea 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultVariableCellModifier.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultVariableCellModifier.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,11 +21,13 @@ import org.eclipse.jface.viewers.ICellModifier; * @since 3.2 * */ +@SuppressWarnings("deprecation") public class DefaultVariableCellModifier implements ICellModifier { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String) */ + @Override public boolean canModify(Object element, String property) { if (VariableColumnPresentation.COLUMN_VARIABLE_VALUE.equals(property)) { if (element instanceof IVariable) { @@ -38,6 +40,7 @@ public class DefaultVariableCellModifier implements ICellModifier { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String) */ + @Override public Object getValue(Object element, String property) { if (VariableColumnPresentation.COLUMN_VARIABLE_VALUE.equals(property)) { if (element instanceof IVariable) { @@ -55,6 +58,7 @@ public class DefaultVariableCellModifier implements ICellModifier { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object) */ + @Override public void modify(Object element, String property, Object value) { Object oldValue = getValue(element, property); if (!value.equals(oldValue)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultViewerInputProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultViewerInputProvider.java index 258cc1ec4..d47277d85 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultViewerInputProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultViewerInputProvider.java @@ -29,6 +29,7 @@ public class DefaultViewerInputProvider extends ViewerInputProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ViewerInputProvider#getViewerInput(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ + @Override protected Object getViewerInput(Object source, IPresentationContext context, IViewerUpdate update) throws CoreException { if (IDebugUIConstants.ID_BREAKPOINT_VIEW.equals(context.getId())) { DefaultBreakpointsViewInput input = new DefaultBreakpointsViewInput(context); @@ -41,6 +42,7 @@ public class DefaultViewerInputProvider extends ViewerInputProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ViewerInputProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return IDebugUIConstants.ID_EXPRESSION_VIEW.equals(id) || IDebugUIConstants.ID_BREAKPOINT_VIEW.equals(id); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockContentAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockContentAdapter.java index bdcc2f87a..ffa412b99 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockContentAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockContentAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,7 +15,6 @@ package org.eclipse.debug.internal.ui.elements.adapters; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Hashtable; import java.util.Vector; import org.eclipse.core.runtime.CoreException; @@ -37,66 +36,57 @@ import org.eclipse.debug.ui.memory.IMemoryRendering; public class MemoryBlockContentAdapter extends AsynchronousContentAdapter { - // Cache to allow the content provider to comppute change information - // Cache is taken by copying the lineCache after a suspend event - // or change event from the the memory block. - protected Hashtable contentCache; - - public MemoryBlockContentAdapter() - { - contentCache = new Hashtable(); - } + @Override + protected Object[] getChildren(Object parent, IPresentationContext context) throws CoreException { - protected Object[] getChildren(Object parent, IPresentationContext context) - throws CoreException { - - if (!(parent instanceof IMemoryBlock)) + if (!(parent instanceof IMemoryBlock)) { return new Object[0]; - - if (!(context instanceof MemoryViewPresentationContext)) + } + + if (!(context instanceof MemoryViewPresentationContext)) { return new Object[0]; - - MemoryViewPresentationContext memoryViewContext = (MemoryViewPresentationContext)context; + } + + MemoryViewPresentationContext memoryViewContext = (MemoryViewPresentationContext) context; IMemoryRendering rendering = memoryViewContext.getRendering(); - - if (!(rendering instanceof AbstractAsyncTableRendering)) + + if (!(rendering instanceof AbstractAsyncTableRendering)) { return new Object[0]; - - try - { + } + + try { return getMemoryFromMemoryBlock(memoryViewContext); } catch (DebugException e) { throw e; - } + } } - protected boolean hasChildren(Object element, IPresentationContext context) - throws CoreException { - - if (context instanceof MemoryViewPresentationContext) - { - if (((MemoryViewPresentationContext)context).getRendering() != null) + @Override + protected boolean hasChildren(Object element, IPresentationContext context) throws CoreException { + + if (context instanceof MemoryViewPresentationContext) { + if (((MemoryViewPresentationContext) context).getRendering() != null) { return true; + } } - + return false; } + @Override protected boolean supportsPartId(String id) { return true; } - - + private Object[] getMemoryFromMemoryBlock(MemoryViewPresentationContext context) throws DebugException { IMemoryBlock memoryBlock = context.getRendering().getMemoryBlock(); - if (memoryBlock instanceof IMemoryBlockExtension) - { + if (memoryBlock instanceof IMemoryBlockExtension) { return loadContentForExtendedMemoryBlock(context); } return loadContentForSimpleMemoryBlock(context); - + } /** @@ -104,14 +94,13 @@ public class MemoryBlockContentAdapter extends AsynchronousContentAdapter { */ public Object[] loadContentForSimpleMemoryBlock(MemoryViewPresentationContext context) throws DebugException { AbstractAsyncTableRendering rendering = getTableRendering(context); - if (rendering != null) - { + if (rendering != null) { IMemoryBlock memoryBlock = rendering.getMemoryBlock(); long startAddress = memoryBlock.getStartAddress(); BigInteger address = BigInteger.valueOf(startAddress); long length = memoryBlock.getLength(); long numLines = length / rendering.getBytesPerLine(); - return getMemoryToFitTable(address, numLines, context); + return getMemoryToFitTable(address, numLines, context); } return EMPTY; } @@ -120,186 +109,183 @@ public class MemoryBlockContentAdapter extends AsynchronousContentAdapter { * @throws DebugException */ public Object[] loadContentForExtendedMemoryBlock(MemoryViewPresentationContext context) throws DebugException { - + AbstractAsyncTableRendering rendering = getTableRendering(context); - if (rendering != null) - { - TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor)rendering.getAdapter(TableRenderingContentDescriptor.class); - - if (descriptor == null) + if (rendering != null) { + TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor) rendering.getAdapter(TableRenderingContentDescriptor.class); + + if (descriptor == null) { return new Object[0]; - - if (descriptor.getNumLines() <= 0) + } + + if (descriptor.getNumLines() <= 0) { return new Object[0]; - + } + // calculate top buffered address BigInteger loadAddress = descriptor.getLoadAddress(); - if (loadAddress == null) - { + if (loadAddress == null) { loadAddress = new BigInteger("0"); //$NON-NLS-1$ } - + BigInteger mbStart = descriptor.getStartAddress(); BigInteger mbEnd = descriptor.getEndAddress(); - + // check that the load address is within range - if (loadAddress.compareTo(mbStart) < 0 || loadAddress.compareTo(mbEnd) > 0) - { + if (loadAddress.compareTo(mbStart) < 0 || loadAddress.compareTo(mbEnd) > 0) { // default load address to memory block base address - loadAddress = ((IMemoryBlockExtension)descriptor.getMemoryBlock()).getBigBaseAddress(); + loadAddress = ((IMemoryBlockExtension) descriptor.getMemoryBlock()).getBigBaseAddress(); descriptor.setLoadAddress(loadAddress); } - + // if address is still out of range, throw an exception - if (loadAddress.compareTo(mbStart) < 0 || loadAddress.compareTo(mbEnd) > 0) - { + if (loadAddress.compareTo(mbStart) < 0 || loadAddress.compareTo(mbEnd) > 0) { throw new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.TableRenderingContentProvider_0 + loadAddress.toString(16), null)); } - + int addressableUnitsPerLine = rendering.getAddressableUnitPerLine(); - BigInteger bufferStart = loadAddress.subtract(BigInteger.valueOf(descriptor.getPreBuffer()*addressableUnitsPerLine)); - BigInteger bufferEnd = loadAddress.add(BigInteger.valueOf(descriptor.getPostBuffer()*addressableUnitsPerLine)); - bufferEnd = bufferEnd.add(BigInteger.valueOf(descriptor.getNumLines()*addressableUnitsPerLine)); - - // TODO: should rely on input to tell us what to load + BigInteger bufferStart = loadAddress.subtract(BigInteger.valueOf(descriptor.getPreBuffer() * addressableUnitsPerLine)); + BigInteger bufferEnd = loadAddress.add(BigInteger.valueOf(descriptor.getPostBuffer() * addressableUnitsPerLine)); + bufferEnd = bufferEnd.add(BigInteger.valueOf(descriptor.getNumLines() * addressableUnitsPerLine)); + + // TODO: should rely on input to tell us what to load // instead of having the content adapter override the setting - if (descriptor.isDynamicLoad()) - { - if (bufferStart.compareTo(mbStart) < 0) + if (descriptor.isDynamicLoad()) { + if (bufferStart.compareTo(mbStart) < 0) { bufferStart = mbStart; - - if (bufferEnd.compareTo(mbEnd) > 0) - { + } + + if (bufferEnd.compareTo(mbEnd) > 0) { bufferEnd = mbEnd; - + int numLines = bufferEnd.subtract(bufferStart).divide(BigInteger.valueOf(addressableUnitsPerLine)).intValue(); - if (numLines < descriptor.getNumLines()) - { - // re-calculate buffer start since we may not have enough lines to popoulate the view - bufferStart = bufferEnd.subtract(BigInteger.valueOf(descriptor.getNumLines()*addressableUnitsPerLine)); - bufferStart = bufferStart.subtract(BigInteger.valueOf(descriptor.getPreBuffer()*addressableUnitsPerLine)); - - // if after adjusting buffer start, it goes before the memory block start + if (numLines < descriptor.getNumLines()) { + // re-calculate buffer start since we may not have + // enough lines to popoulate the view + bufferStart = bufferEnd.subtract(BigInteger.valueOf(descriptor.getNumLines() * addressableUnitsPerLine)); + bufferStart = bufferStart.subtract(BigInteger.valueOf(descriptor.getPreBuffer() * addressableUnitsPerLine)); + + // if after adjusting buffer start, it goes before the + // memory block start // address, adjust it back - if (bufferStart.compareTo(mbStart) < 0) + if (bufferStart.compareTo(mbStart) < 0) { bufferStart = mbStart; + } } } - + // buffer end must be greater than buffer start - if (bufferEnd.compareTo(bufferStart) <= 0) + if (bufferEnd.compareTo(bufferStart) <= 0) { throw new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.TableRenderingContentProvider_1, null)); - - int numLines = bufferEnd.subtract(bufferStart).divide(BigInteger.valueOf(addressableUnitsPerLine)).intValue()+1; + } + + int numLines = bufferEnd.subtract(bufferStart).divide(BigInteger.valueOf(addressableUnitsPerLine)).intValue() + 1; // get stoarage to fit the memory view tab size - return getMemoryToFitTable(bufferStart, numLines,context); - } - else - { - if (bufferStart.compareTo(mbStart) < 0) + return getMemoryToFitTable(bufferStart, numLines, context); + } else { + if (bufferStart.compareTo(mbStart) < 0) { bufferStart = mbStart; - - if (bufferEnd.compareTo(mbEnd) > 0) - { - bufferStart = mbEnd.subtract(BigInteger.valueOf((descriptor.getNumLines()-1)*addressableUnitsPerLine)); + } + + if (bufferEnd.compareTo(mbEnd) > 0) { + bufferStart = mbEnd.subtract(BigInteger.valueOf((descriptor.getNumLines() - 1) * addressableUnitsPerLine)); bufferEnd = mbEnd; - - // after adjusting buffer start, check if it's smaller than memory block's start address - if (bufferStart.compareTo(mbStart) < 0) + + // after adjusting buffer start, check if it's smaller than + // memory block's start address + if (bufferStart.compareTo(mbStart) < 0) { bufferStart = mbStart; + } } - + // buffer end must be greater than buffer start - if (bufferEnd.compareTo(bufferStart) <= 0) + if (bufferEnd.compareTo(bufferStart) <= 0) { throw new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.TableRenderingContentProvider_2, null)); - + } + int numLines = descriptor.getNumLines(); - int bufferNumLines = bufferEnd.subtract(bufferStart).divide(BigInteger.valueOf(addressableUnitsPerLine)).intValue()+1; - - if (bufferNumLines < numLines) + int bufferNumLines = bufferEnd.subtract(bufferStart).divide(BigInteger.valueOf(addressableUnitsPerLine)).intValue() + 1; + + if (bufferNumLines < numLines) { numLines = bufferNumLines; - + } + // get stoarage to fit the memory view tab size - return getMemoryToFitTable(bufferStart, numLines, context); + return getMemoryToFitTable(bufferStart, numLines, context); } } return EMPTY; } - + /** * Get memory to fit table + * * @param startingAddress * @param numberOfLines * @param updateDelta * @throws DebugException */ - public Object[] getMemoryToFitTable(BigInteger startAddress, long numberOfLines, MemoryViewPresentationContext context) throws DebugException - { - AbstractAsyncTableRendering tableRendering = getTableRendering(context); - if (tableRendering == null) - { + public Object[] getMemoryToFitTable(BigInteger startAddress, long numberOfLines, MemoryViewPresentationContext context) throws DebugException { + AbstractAsyncTableRendering tableRendering = getTableRendering(context); + if (tableRendering == null) { DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.MemoryViewContentProvider_Unable_to_retrieve_content, null)); throw e; } - - TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor)tableRendering.getAdapter(TableRenderingContentDescriptor.class); - if(descriptor == null) + + TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor) tableRendering.getAdapter(TableRenderingContentDescriptor.class); + if (descriptor == null) { return new Object[0]; - + } + // do not ask for memory from memory block if the debug target // is already terminated IDebugTarget target = descriptor.getMemoryBlock().getDebugTarget(); - - // check for null target to not calculate and retrieve memory for standard debug model - if (target != null && (target.isDisconnected() || target.isTerminated())) + + // check for null target to not calculate and retrieve memory for + // standard debug model + if (target != null && (target.isDisconnected() || target.isTerminated())) { return new Object[0]; - + } + DebugException dbgEvt = null; - + String adjustedAddress = startAddress.toString(16); // align to the closest boundary based on addressable size per line - if (descriptor.isAlignAddressToBoundary() && descriptor.getMemoryBlock() instanceof IMemoryBlockExtension) - { + if (descriptor.isAlignAddressToBoundary() && descriptor.getMemoryBlock() instanceof IMemoryBlockExtension) { startAddress = MemoryViewUtil.alignToBoundary(startAddress, tableRendering.getAddressableUnitPerLine()); } IMemoryBlockExtension extMemoryBlock = null; MemoryByte[] memoryBuffer = null; - + long reqNumBytes = 0; - try - { - - if (descriptor.getMemoryBlock() instanceof IMemoryBlockExtension) - { + try { + + if (descriptor.getMemoryBlock() instanceof IMemoryBlockExtension) { reqNumBytes = tableRendering.getBytesPerLine() * numberOfLines; // get memory from memory block extMemoryBlock = (IMemoryBlockExtension) descriptor.getMemoryBlock(); - + long reqNumberOfUnits = tableRendering.getAddressableUnitPerLine() * numberOfLines; - - memoryBuffer = extMemoryBlock.getBytesFromAddress(startAddress, reqNumberOfUnits); - - if(memoryBuffer == null) - { + + memoryBuffer = extMemoryBlock.getBytesFromAddress(startAddress, reqNumberOfUnits); + + if (memoryBuffer == null) { DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.MemoryViewContentProvider_Unable_to_retrieve_content, null)); throw e; } - } - else - { + } else { // get memory from memory block byte[] memory = descriptor.getMemoryBlock().getBytes(); - - if (memory == null) - { - DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.MemoryViewContentProvider_Unable_to_retrieve_content, null)); - throw e; + + if (memory == null) { + DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.MemoryViewContentProvider_Unable_to_retrieve_content, null)); + throw e; } - + int prefillNumBytes = 0; - + // number of bytes need to prefill if (!startAddress.toString(16).endsWith("0")) //$NON-NLS-1$ { @@ -310,33 +296,30 @@ public class MemoryBlockContentAdapter extends AsynchronousContentAdapter { startAddress = adjustedStart; } reqNumBytes = descriptor.getMemoryBlock().getLength() + prefillNumBytes; - + // figure out number of dummy bytes to append - while (reqNumBytes % tableRendering.getBytesPerLine() != 0) - { - reqNumBytes ++; + while (reqNumBytes % tableRendering.getBytesPerLine() != 0) { + reqNumBytes++; } - + numberOfLines = reqNumBytes / tableRendering.getBytesPerLine(); - + // create memory byte for IMemoryBlock - memoryBuffer = new MemoryByte[(int)reqNumBytes]; - + memoryBuffer = new MemoryByte[(int) reqNumBytes]; + // prefill buffer to ensure double-word alignment - for (int i=0; i<prefillNumBytes; i++) - { + for (int i = 0; i < prefillNumBytes; i++) { MemoryByte tmp = new MemoryByte(); - tmp.setValue((byte)0); + tmp.setValue((byte) 0); tmp.setWritable(false); tmp.setReadable(false); tmp.setEndianessKnown(false); memoryBuffer[i] = tmp; } - + // fill buffer with memory returned by debug adapter - int j = prefillNumBytes; // counter for memoryBuffer - for (int i=0; i<memory.length; i++) - { + int j = prefillNumBytes; // counter for memoryBuffer + for (int i = 0; i < memory.length; i++) { MemoryByte tmp = new MemoryByte(); tmp.setValue(memory[i]); tmp.setReadable(true); @@ -345,127 +328,112 @@ public class MemoryBlockContentAdapter extends AsynchronousContentAdapter { memoryBuffer[j] = tmp; j++; } - + // append to buffer to fill up the entire line - for (int i=j; i<memoryBuffer.length; i++) - { + for (int i = j; i < memoryBuffer.length; i++) { MemoryByte tmp = new MemoryByte(); - tmp.setValue((byte)0); + tmp.setValue((byte) 0); tmp.setWritable(false); tmp.setReadable(false); tmp.setEndianessKnown(false); memoryBuffer[i] = tmp; } } - } - catch (DebugException e) - { + } catch (DebugException e) { memoryBuffer = makeDummyContent(numberOfLines, tableRendering.getBytesPerLine()); - + // finish creating the content provider before throwing an event dbgEvt = e; - } - catch (Throwable e) - { + } catch (Throwable e) { // catch all errors from this process just to be safe memoryBuffer = makeDummyContent(numberOfLines, tableRendering.getBytesPerLine()); - + // finish creating the content provider before throwing an event dbgEvt = new DebugException(DebugUIPlugin.newErrorStatus(e.getMessage(), e)); } - + // if debug adapter did not return enough memory, create dummy memory - if (memoryBuffer.length < reqNumBytes) - { - ArrayList newBuffer = new ArrayList(); - - for (int i=0; i<memoryBuffer.length; i++) - { + if (memoryBuffer.length < reqNumBytes) { + ArrayList<MemoryByte> newBuffer = new ArrayList<MemoryByte>(); + + for (int i = 0; i < memoryBuffer.length; i++) { newBuffer.add(memoryBuffer[i]); } - - for (int i=memoryBuffer.length; i<reqNumBytes; i++) - { + + for (int i = memoryBuffer.length; i < reqNumBytes; i++) { MemoryByte mb = new MemoryByte(); mb.setReadable(false); mb.setWritable(false); mb.setEndianessKnown(false); newBuffer.add(mb); } - - memoryBuffer = (MemoryByte[])newBuffer.toArray(new MemoryByte[newBuffer.size()]); - + + memoryBuffer = newBuffer.toArray(new MemoryByte[newBuffer.size()]); + } boolean manageDelta = true; - + // If change information is not managed by the memory block // The view tab will manage it and calculate delta information // for its content cache. - if (descriptor.getMemoryBlock() instanceof IMemoryBlockExtension) - { - manageDelta = !((IMemoryBlockExtension)descriptor.getMemoryBlock()).supportsChangeManagement(); + if (descriptor.getMemoryBlock() instanceof IMemoryBlockExtension) { + manageDelta = !((IMemoryBlockExtension) descriptor.getMemoryBlock()).supportsChangeManagement(); } - - if (dbgEvt != null){ + + if (dbgEvt != null) { throw dbgEvt; } - + // put memory information into MemoryViewLine return organizeLines(numberOfLines, memoryBuffer, startAddress, manageDelta, context); - } - private Object[] organizeLines(long numberOfLines, MemoryByte[] memoryBuffer, BigInteger address, boolean manageDelta, MemoryViewPresentationContext context) - { - Vector lineCache = new Vector(); + private Object[] organizeLines(long numberOfLines, MemoryByte[] memoryBuffer, BigInteger address, boolean manageDelta, MemoryViewPresentationContext context) { + Vector<MemorySegment> lineCache = new Vector<MemorySegment>(); IMemoryRendering rendering = context.getRendering(); - if (!(rendering instanceof AbstractAsyncTableRendering)) + if (!(rendering instanceof AbstractAsyncTableRendering)) { return lineCache.toArray(); - - AbstractAsyncTableRendering tableRendering = (AbstractAsyncTableRendering)rendering; - int addressableUnit = tableRendering.getBytesPerLine()/tableRendering.getAddressableSize(); - - for (int i = 0; i < numberOfLines; i++) - { + } + + AbstractAsyncTableRendering tableRendering = (AbstractAsyncTableRendering) rendering; + int addressableUnit = tableRendering.getBytesPerLine() / tableRendering.getAddressableSize(); + + for (int i = 0; i < numberOfLines; i++) { int bytesPerLine = tableRendering.getBytesPerLine(); MemoryByte[] memory = new MemoryByte[bytesPerLine]; - + // counter for memory, starts from 0 to number of bytes per line int k = 0; // j is the counter for memArray, memory returned by debug adapter - for (int j = i * bytesPerLine; - j < i * bytesPerLine + bytesPerLine; - j++) - { - + for (int j = i * bytesPerLine; j < i * bytesPerLine + bytesPerLine; j++) { + byte changeFlag = memoryBuffer[j].getFlags(); - if (manageDelta) - { + if (manageDelta) { // turn off both change and known bits to make sure that // the change bits returned by debug adapters do not take // any effect - + changeFlag |= MemoryByte.HISTORY_KNOWN; changeFlag ^= MemoryByte.HISTORY_KNOWN; - + changeFlag |= MemoryByte.CHANGED; changeFlag ^= MemoryByte.CHANGED; } - + MemoryByte newByteObj = new MemoryByte(memoryBuffer[j].getValue(), changeFlag); - memory[k] = newByteObj; + memory[k] = newByteObj; k++; } - + MemorySegment newLine = new MemorySegment(address, memory, addressableUnit); lineCache.add(newLine); address = address.add(BigInteger.valueOf(addressableUnit)); } return lineCache.toArray(); } - + /** * @param numberOfLines * @return an array of dummy MemoryByte @@ -475,25 +443,23 @@ public class MemoryBlockContentAdapter extends AsynchronousContentAdapter { // make up dummy memory, needed for recovery in case the debug adapter // is capable of retrieving memory again - int numBytes = (int)(bytesPerLine * numberOfLines); + int numBytes = (int) (bytesPerLine * numberOfLines); memoryBuffer = new MemoryByte[numBytes]; - - for (int i=0; i<memoryBuffer.length; i++){ + + for (int i = 0; i < memoryBuffer.length; i++) { memoryBuffer[i] = new MemoryByte(); - memoryBuffer[i].setValue((byte)0); + memoryBuffer[i].setValue((byte) 0); memoryBuffer[i].setWritable(false); memoryBuffer[i].setReadable(false); memoryBuffer[i].setEndianessKnown(false); } return memoryBuffer; } - - protected AbstractAsyncTableRendering getTableRendering(MemoryViewPresentationContext context) - { + + protected AbstractAsyncTableRendering getTableRendering(MemoryViewPresentationContext context) { IMemoryRendering memRendering = context.getRendering(); - if (memRendering != null && memRendering instanceof AbstractAsyncTableRendering) - { - return (AbstractAsyncTableRendering)memRendering; + if (memRendering != null && memRendering instanceof AbstractAsyncTableRendering) { + return (AbstractAsyncTableRendering) memRendering; } return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockLabelAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockLabelAdapter.java index 6e9c3c116..bde25dd89 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockLabelAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockLabelAdapter.java @@ -21,6 +21,7 @@ import org.eclipse.jface.resource.ImageDescriptor; public class MemoryBlockLabelAdapter extends AsynchronousDebugLabelAdapter { + @Override protected ImageDescriptor[] getImageDescriptors(Object element, IPresentationContext context) throws CoreException { if (element instanceof IMemoryBlock) return new ImageDescriptor[]{DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_OBJS_VARIABLE)}; @@ -52,6 +53,7 @@ public class MemoryBlockLabelAdapter extends AsynchronousDebugLabelAdapter { return memoryBlockLabel; } + @Override protected String[] getLabels(Object element, IPresentationContext context) throws CoreException { if (element instanceof IMemoryBlock) return new String[]{getLabel((IMemoryBlock)element)}; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryRetrievalContentAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryRetrievalContentAdapter.java index eb963920b..9826e37db 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryRetrievalContentAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryRetrievalContentAdapter.java @@ -20,6 +20,7 @@ import org.eclipse.debug.ui.IDebugUIConstants; public class MemoryRetrievalContentAdapter extends AsynchronousContentAdapter{ + @Override protected Object[] getChildren(Object parent, IPresentationContext context) throws CoreException { String id = context.getId(); if (id.equals(IDebugUIConstants.ID_MEMORY_VIEW)) @@ -32,6 +33,7 @@ public class MemoryRetrievalContentAdapter extends AsynchronousContentAdapter{ return EMPTY; } + @Override protected boolean hasChildren(Object element, IPresentationContext context) throws CoreException { String id = context.getId(); if (id.equals(IDebugUIConstants.ID_MEMORY_VIEW)) @@ -45,6 +47,7 @@ public class MemoryRetrievalContentAdapter extends AsynchronousContentAdapter{ return false; } + @Override protected boolean supportsPartId(String id) { return id.equals(IDebugUIConstants.ID_MEMORY_VIEW); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java index 5d07d2d1a..9324f12f6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java @@ -42,6 +42,7 @@ import org.eclipse.swt.graphics.RGB; public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { + @Override protected String[] getLabels(Object element, IPresentationContext context) throws CoreException { @@ -136,6 +137,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { return columnLabel; } + @Override protected ImageDescriptor[] getImageDescriptors(Object element, IPresentationContext context) throws CoreException { if (context instanceof MemoryViewPresentationContext) @@ -209,6 +211,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_OBJECT_MEMORY); } + @Override protected FontData[] getFontDatas(Object element, IPresentationContext context) throws CoreException { if (context instanceof MemoryViewPresentationContext) @@ -254,6 +257,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { return null; } + @Override protected RGB[] getForegrounds(Object element, IPresentationContext context) throws CoreException { @@ -356,6 +360,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { return null; } + @Override protected RGB[] getBackgrounds(Object element, IPresentationContext context) throws CoreException { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/RegisterGroupProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/RegisterGroupProxy.java index ba69b6ff7..4ef734a77 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/RegisterGroupProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/RegisterGroupProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -80,6 +80,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElement() */ + @Override public Object getElement() { return fFrame; } @@ -87,6 +88,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElementPath() */ + @Override public TreePath getElementPath() { return TreePath.EMPTY; } @@ -94,6 +96,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getPresentationContext() */ + @Override public IPresentationContext getPresentationContext() { return fViewerUpdate.getPresentationContext(); } @@ -101,6 +104,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.core.commands.Request#done() */ + @Override public void done() { fViewerUpdate.setStatus(getStatus()); fViewerUpdate.done(); @@ -109,6 +113,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getViewerInput() */ + @Override public Object getViewerInput() { return fFrame; } @@ -127,6 +132,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate#setChildCount(int) */ + @Override public void setChildCount(int numChildren) { fUpdate.setChildCount(numChildren); } @@ -145,6 +151,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdate#setHasChilren(boolean) */ + @Override public void setHasChilren(boolean hasChildren) { fUpdate.setHasChilren(hasChildren); } @@ -162,6 +169,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate#getLength() */ + @Override public int getLength() { return fUpdate.getLength(); } @@ -169,6 +177,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate#getOffset() */ + @Override public int getOffset() { return fUpdate.getOffset(); } @@ -176,6 +185,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate#setChild(java.lang.Object, int) */ + @Override public void setChild(Object child, int offset) { fUpdate.setChild(child, offset); } @@ -197,12 +207,15 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoRequest#getMemento() */ + @Override public IMemento getMemento() { return fUpdate.getMemento(); } + @Override public Object getElement() { return fUpdate.getElement(); } + @Override public TreePath getElementPath() { return fUpdate.getElementPath(); } @@ -219,6 +232,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest#setEqual(boolean) */ + @Override public void setEqual(boolean equal) { fRequest.setEqual(equal); } @@ -243,6 +257,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati * * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof RegisterGroupProxy) { return Arrays.equals(fGroups, ((RegisterGroupProxy)obj).fGroups); @@ -253,6 +268,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { int code = getClass().hashCode(); for (int i = 0; i < fGroups.length; i++) { @@ -282,6 +298,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory#createModelProxy(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override public IModelProxy createModelProxy(Object element, IPresentationContext context) { IModelProxyFactory factory = ViewerAdapterService.getModelProxyFactory(fFrame); if (factory != null) { @@ -293,6 +310,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory#createColumnPresentation(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object) */ + @Override public IColumnPresentation createColumnPresentation(IPresentationContext context, Object element) { IColumnPresentationFactory factory = ViewerAdapterService.getColumnPresentationFactory(fFrame); if (factory != null) { @@ -304,6 +322,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory#getColumnPresentationId(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object) */ + @Override public String getColumnPresentationId(IPresentationContext context, Object element) { IColumnPresentationFactory factory = ViewerAdapterService.getColumnPresentationFactory(fFrame); if (factory != null) { @@ -315,6 +334,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate[]) */ + @Override public void update(IChildrenCountUpdate[] updates) { IElementContentProvider provider = ViewerAdapterService.getContentProvider(fFrame); if (provider != null) { @@ -331,6 +351,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate[]) */ + @Override public void update(IChildrenUpdate[] updates) { IElementContentProvider provider = ViewerAdapterService.getContentProvider(fFrame); if (provider != null) { @@ -348,6 +369,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdate[]) */ + @Override public void update(IHasChildrenUpdate[] updates) { IElementContentProvider provider = ViewerAdapterService.getContentProvider(fFrame); if (provider != null) { @@ -376,10 +398,11 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[]) */ + @Override public void compareElements(IElementCompareRequest[] requests) { IElementMementoProvider provider = ViewerAdapterService.getMementoProvider(fFrame); if (provider != null) { - List others = new ArrayList(requests.length); + List<IElementCompareRequest> others = new ArrayList<IElementCompareRequest>(requests.length); for (int i = 0; i < requests.length; i++) { IElementCompareRequest request = requests[i]; if (request.getElement().equals(this)) { @@ -395,7 +418,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati } } if (!others.isEmpty()) { - provider.compareElements((IElementCompareRequest[]) others.toArray(new IElementCompareRequest[others.size()])); + provider.compareElements(others.toArray(new IElementCompareRequest[others.size()])); } } else { cancelUpdates(requests); @@ -405,10 +428,11 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#encodeElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoRequest[]) */ + @Override public void encodeElements(IElementMementoRequest[] requests) { IElementMementoProvider provider = ViewerAdapterService.getMementoProvider(fFrame); if (provider != null) { - List others = new ArrayList(requests.length); + List<IElementMementoRequest> others = new ArrayList<IElementMementoRequest>(requests.length); for (int i = 0; i < requests.length; i++) { IElementMementoRequest request = requests[i]; if (request.getElement().equals(this)) { @@ -419,7 +443,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati } } if (!others.isEmpty()) { - provider.encodeElements((IElementMementoRequest[]) others.toArray(new IElementMementoRequest[others.size()])); + provider.encodeElements(others.toArray(new IElementMementoRequest[others.size()])); } } else { cancelUpdates(requests); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameSourceDisplayAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameSourceDisplayAdapter.java index 03a373071..a62505d4b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameSourceDisplayAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameSourceDisplayAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -44,16 +44,18 @@ public class StackFrameSourceDisplayAdapter implements ISourceDisplay { */ public StackFrameSourceDisplayAdapter() { DebugPlugin.getDefault().addDebugEventListener(new IDebugEventSetListener() { + @Override public void handleDebugEvents(DebugEvent[] events) { for (int i = 0; i < events.length; i++) { final DebugEvent event = events[i]; switch (event.getKind()) { case DebugEvent.TERMINATE: clearCachedModel(event.getSource()); - // fall through + //$FALL-THROUGH$ case DebugEvent.RESUME: if (!event.isEvaluation()) { Job uijob = new UIJob("clear source selection"){ //$NON-NLS-1$ + @Override public IStatus runInUIThread( IProgressMonitor monitor) { clearSourceSelection(event.getSource()); @@ -73,6 +75,8 @@ public class StackFrameSourceDisplayAdapter implements ISourceDisplay { } } break; + default: + break; } } } @@ -105,6 +109,7 @@ public class StackFrameSourceDisplayAdapter implements ISourceDisplay { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { if (!monitor.isCanceled()) { if (!fTarget.isTerminated()) { @@ -124,6 +129,7 @@ public class StackFrameSourceDisplayAdapter implements ISourceDisplay { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#belongsTo(java.lang.Object) */ + @Override public boolean belongsTo(Object family) { // source lookup jobs are a family per workbench page if (family instanceof SourceLookupJob) { @@ -152,6 +158,7 @@ public class StackFrameSourceDisplayAdapter implements ISourceDisplay { /* (non-Javadoc) * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (!monitor.isCanceled() && fResult != null) { DebugUITools.displaySource(fResult, fPage); @@ -170,6 +177,7 @@ public class StackFrameSourceDisplayAdapter implements ISourceDisplay { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#belongsTo(java.lang.Object) */ + @Override public boolean belongsTo(Object family) { // source display jobs are a family per workbench page if (family instanceof SourceDisplayJob) { @@ -184,6 +192,7 @@ public class StackFrameSourceDisplayAdapter implements ISourceDisplay { /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.ISourceDisplayAdapter#displaySource(java.lang.Object, org.eclipse.ui.IWorkbenchPage, boolean) */ + @Override public synchronized void displaySource(Object context, IWorkbenchPage page, boolean force) { IStackFrame frame = (IStackFrame)context; if (!force && frame.equals(fPrevFrame)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameViewerInputProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameViewerInputProvider.java index 885bedd2f..fb3ac0c4f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameViewerInputProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameViewerInputProvider.java @@ -28,6 +28,7 @@ public class StackFrameViewerInputProvider extends ViewerInputProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ViewerInputProvider#getViewerInput(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ + @Override protected Object getViewerInput(Object source, IPresentationContext context, IViewerUpdate update) throws CoreException { if ( IDebugUIConstants.ID_REGISTER_VIEW.equals(context.getId()) ) { return new RegisterGroupProxy((IStackFrame) source); @@ -42,6 +43,7 @@ public class StackFrameViewerInputProvider extends ViewerInputProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ViewerInputProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return IDebugUIConstants.ID_REGISTER_VIEW.equals(id) || IDebugUIConstants.ID_EXPRESSION_VIEW.equals(id) || diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnFactoryAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnFactoryAdapter.java index 0da76888a..9098c00d7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnFactoryAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnFactoryAdapter.java @@ -28,6 +28,7 @@ public class VariableColumnFactoryAdapter implements IColumnPresentationFactory /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresenetationFactoryAdapter#createColumnPresentation(org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext, java.lang.Object) */ + @Override public IColumnPresentation createColumnPresentation(IPresentationContext context, Object element) { String id = context.getId(); if (IDebugUIConstants.ID_VARIABLE_VIEW.equals(id) || @@ -44,6 +45,7 @@ public class VariableColumnFactoryAdapter implements IColumnPresentationFactory /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresenetationFactoryAdapter#getColumnPresentationId(org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext, java.lang.Object) */ + @Override public String getColumnPresentationId(IPresentationContext context, Object element) { String id = context.getId(); if (IDebugUIConstants.ID_VARIABLE_VIEW.equals(id) || diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java index 54e92b43a..35489d86b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,24 +24,29 @@ public class VariableColumnPresentation extends AbstractColumnPresentation { * Constant identifier for the default variable column presentation. * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_PRESENTATION_ID_VARIABLE} */ + @Deprecated public final static String DEFAULT_VARIABLE_COLUMN_PRESENTATION = IDebugUIConstants.COLUMN_PRESENTATION_ID_VARIABLE; /** * Default column identifiers * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_NAME} */ + @Deprecated public final static String COLUMN_VARIABLE_NAME = IDebugUIConstants.COLUMN_ID_VARIABLE_NAME; /** * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_TYPE} */ + @Deprecated public final static String COLUMN_VARIABLE_TYPE = IDebugUIConstants.COLUMN_ID_VARIABLE_TYPE; /** * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_VALUE} */ + @Deprecated public final static String COLUMN_VARIABLE_VALUE = IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE; /** * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_VALUE_TYPE} */ + @Deprecated public final static String COLUMN_VALUE_TYPE = IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE_TYPE; private static final String[] ALL_COLUMNS = new String[]{IDebugUIConstants.COLUMN_ID_VARIABLE_NAME, @@ -52,6 +57,7 @@ public class VariableColumnPresentation extends AbstractColumnPresentation { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getColumns() */ + @Override public String[] getAvailableColumns() { return ALL_COLUMNS; } @@ -59,6 +65,7 @@ public class VariableColumnPresentation extends AbstractColumnPresentation { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getHeader(java.lang.String) */ + @Override public String getHeader(String id) { if (IDebugUIConstants.COLUMN_ID_VARIABLE_TYPE.equals(id)) { return Messages.VariableColumnPresentation_0; @@ -78,6 +85,7 @@ public class VariableColumnPresentation extends AbstractColumnPresentation { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getId() */ + @Override public String getId() { return IDebugUIConstants.COLUMN_PRESENTATION_ID_VARIABLE; } @@ -85,6 +93,7 @@ public class VariableColumnPresentation extends AbstractColumnPresentation { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getInitialColumns() */ + @Override public String[] getInitialColumns() { return INITIAL_COLUMNS; } @@ -92,6 +101,7 @@ public class VariableColumnPresentation extends AbstractColumnPresentation { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#isOptional() */ + @Override public boolean isOptional() { return true; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/WatchExpressionCellModifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/WatchExpressionCellModifier.java index 954665858..840200f04 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/WatchExpressionCellModifier.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/WatchExpressionCellModifier.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Wind River Systems and others. + * Copyright (c) 2010, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.elements.adapters; @@ -20,11 +21,13 @@ import org.eclipse.jface.viewers.ICellModifier; * * @since 3.6 */ +@SuppressWarnings("deprecation") public class WatchExpressionCellModifier implements ICellModifier { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String) */ + @Override public boolean canModify(Object element, String property) { if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) { return element instanceof IWatchExpression; @@ -35,6 +38,7 @@ public class WatchExpressionCellModifier implements ICellModifier { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String) */ + @Override public Object getValue(Object element, String property) { if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) { return DefaultLabelProvider.escapeSpecialChars( ((IWatchExpression)element).getExpressionText() ); @@ -45,6 +49,7 @@ public class WatchExpressionCellModifier implements ICellModifier { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object) */ + @Override public void modify(Object element, String property, Object value) { Object oldValue = getValue(element, property); if (!value.equals(oldValue)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/BreakpointsPathDecorator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/BreakpointsPathDecorator.java index 7c864479e..68501ffb9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/BreakpointsPathDecorator.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/BreakpointsPathDecorator.java @@ -21,10 +21,12 @@ import org.eclipse.swt.graphics.Image; */ public class BreakpointsPathDecorator extends BaseLabelProvider implements ILabelDecorator { + @Override public Image decorateImage(Image image, Object element) { return null; } + @Override public String decorateText(String text, Object element) { if (element instanceof IBreakpoint) { IBreakpoint breakpoint = (IBreakpoint) element; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java index 9072cacc4..9bddcba20 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -60,6 +60,7 @@ public class EmbeddedBreakpointsViewer { private Tree fTree = null; private BreakpointsViewer fViewer = null; private ICheckStateListener fCheckListener = new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { updateCheckedState(event.getElement(), event.getChecked()); } @@ -111,7 +112,7 @@ public class EmbeddedBreakpointsViewer { if(view != null) { //if we have handle to the view try get the current attributes, that way the //presentation of the embedded viewer matches the current view - Map map = null; + Map<String, Object> map = null; IDebugModelPresentation current = (IDebugModelPresentation)view.getAdapter(IDebugModelPresentation.class); if (current instanceof DelegatingModelPresentation) { map = ((DelegatingModelPresentation) current).getAttributes(); @@ -119,7 +120,7 @@ public class EmbeddedBreakpointsViewer { if(map != null) { Object key = null; IDebugModelPresentation newpres = labelprovider.getPresentation(); - for(Iterator iter = map.keySet().iterator(); iter.hasNext();) { + for (Iterator<String> iter = map.keySet().iterator(); iter.hasNext();) { key = iter.next(); newpres.setAttribute((String) key, map.get(key)); } @@ -145,7 +146,7 @@ public class EmbeddedBreakpointsViewer { Object[] items = fSelection.toArray(); fViewer.setGrayedElements(new Object[] {}); fViewer.setCheckedElements(new Object[] {}); - ArrayList list = new ArrayList(); + ArrayList<IBreakpoint> list = new ArrayList<IBreakpoint>(); for(int i = 0; i < items.length; i++) { Object item = items[i]; IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(item, IBreakpoint.class); @@ -166,7 +167,7 @@ public class EmbeddedBreakpointsViewer { * @param container the container to get breakpoints from * @param list the list of breakpoints to update state for */ - private void getBreakpointsFromContainers(IBreakpointContainer container, ArrayList list) { + private void getBreakpointsFromContainers(IBreakpointContainer container, ArrayList<IBreakpoint> list) { IBreakpoint[] bps = container.getBreakpoints(); list.ensureCapacity(list.size() + bps.length); for (int j = 0; j < bps.length; j++) { @@ -180,7 +181,7 @@ public class EmbeddedBreakpointsViewer { */ public IStructuredSelection getCheckedElements() { Object[] list = fViewer.getCheckedElements(); - Vector selected = new Vector(); + Vector<Object> selected = new Vector<Object>(); for(int i = 0; i < list.length; i++) { if(!selected.contains(list[i])) { selected.addElement(list[i]); @@ -203,12 +204,12 @@ public class EmbeddedBreakpointsViewer { * @return a list of widget occurrences to update or an empty list */ private Widget[] searchItems(Object element) { - ArrayList list = new ArrayList(); + ArrayList<TreeItem> list = new ArrayList<TreeItem>(); TreeItem[] items = fTree.getItems(); for (int i = 0; i < items.length; i++) { findAllOccurrences(items[i], element, list); } - return (Widget[]) list.toArray(new Widget[0]); + return list.toArray(new Widget[0]); } /** @@ -217,7 +218,7 @@ public class EmbeddedBreakpointsViewer { * @param item the item in the tree * @param element the element to compare */ - private void findAllOccurrences(TreeItem item, Object element, ArrayList list) { + private void findAllOccurrences(TreeItem item, Object element, ArrayList<TreeItem> list) { if (element.equals(item.getData())) { list.add(item); } @@ -245,7 +246,7 @@ public class EmbeddedBreakpointsViewer { } } else if (obj instanceof BreakpointContainer) { - ArrayList bps = new ArrayList(); + ArrayList<IBreakpoint> bps = new ArrayList<IBreakpoint>(); getBreakpointsFromContainers((BreakpointContainer)obj, bps); for(int j = 0; j < bps.size(); j++) { updateCheckedState(bps.get(j), enable); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/ExportBreakpoints.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/ExportBreakpoints.java index 0ca84788c..95a047422 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/ExportBreakpoints.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/ExportBreakpoints.java @@ -42,6 +42,7 @@ public class ExportBreakpoints extends AbstractDebugActionDelegate { * * @param action IAction the action */ + @Override public void run(IAction action) { IViewPart fViewpart = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage().findView(IDebugUIConstants.ID_BREAKPOINT_VIEW); WizardExportBreakpoints wiz = new WizardExportBreakpoints(); @@ -54,6 +55,7 @@ public class ExportBreakpoints extends AbstractDebugActionDelegate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.AbstractDebugActionDelegate#update(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override protected void update(IAction action, ISelection s) { getAction().setEnabled(DebugPlugin.getDefault().getBreakpointManager().hasBreakpoints()); } @@ -61,5 +63,6 @@ public class ExportBreakpoints extends AbstractDebugActionDelegate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.AbstractDebugActionDelegate#doAction(java.lang.Object) */ + @Override protected void doAction(Object element) throws DebugException {} } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/ImportBreakpoints.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/ImportBreakpoints.java index 0cd0a82dc..46753b5d9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/ImportBreakpoints.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/ImportBreakpoints.java @@ -37,6 +37,7 @@ public class ImportBreakpoints extends AbstractDebugActionDelegate { * * @param action IAction the action */ + @Override public void run(IAction action) { WizardImportBreakpoints wiz = new WizardImportBreakpoints(); wiz.init(DebugUIPlugin.getDefault().getWorkbench(), null); @@ -48,11 +49,13 @@ public class ImportBreakpoints extends AbstractDebugActionDelegate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.AbstractDebugActionDelegate#doAction(java.lang.Object) */ + @Override protected void doAction(Object element) throws DebugException {} /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.AbstractDebugActionDelegate#update(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override protected void update(IAction action, ISelection s) { getAction().setEnabled(true); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java index 882cab6bd..5deb204c0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java @@ -72,6 +72,7 @@ public class WizardExportBreakpoints extends Wizard implements IExportWizard { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#addPages() */ + @Override public void addPages() { super.addPages(); fMainPage = new WizardExportBreakpointsPage(ImportExportMessages.WizardExportBreakpoints_0, fSelection); @@ -81,6 +82,7 @@ public class WizardExportBreakpoints extends Wizard implements IExportWizard { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#dispose() */ + @Override public void dispose() { super.dispose(); fMainPage = null; @@ -90,6 +92,7 @@ public class WizardExportBreakpoints extends Wizard implements IExportWizard { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#performFinish() */ + @Override public boolean performFinish() { return fMainPage.finish(); } @@ -97,6 +100,7 @@ public class WizardExportBreakpoints extends Wizard implements IExportWizard { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { fSelection = selection; setWindowTitle(ImportExportMessages.WizardExportBreakpoints_0); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java index 59805e902..986d8b654 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -97,6 +97,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener /* (non-Javadoc) * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ + @Override public void handleEvent(Event event) { Widget source = event.widget; if (source == fDestinationBrowseButton) { @@ -170,12 +171,14 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { initializeDialogUnits(parent); Composite composite = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH); SWTFactory.createLabel(composite, ImportExportMessages.WizardExportBreakpointsPage_2, 1); fTView = new EmbeddedBreakpointsViewer(composite, DebugPlugin.getDefault().getBreakpointManager(), fSelection); fTView.getViewer().addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { setPageComplete(detectPageComplete()); } @@ -200,6 +203,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#getImage() */ + @Override public Image getImage() { return DebugUITools.getImage(IInternalDebugUIConstants.IMG_WIZBAN_EXPORT_BREAKPOINTS); } @@ -305,23 +309,23 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener } saveWidgetState(); if(path.toFile().exists() && !fOverwriteExistingFilesCheckbox.getSelection()) { - if (!MessageDialog.openQuestion(null, ImportExportMessages.WizardBreakpointsPage_12, MessageFormat.format(ImportExportMessages.ImportExportOperations_0, new String[] {path.toPortableString()}))) { + if (!MessageDialog.openQuestion(null, ImportExportMessages.WizardBreakpointsPage_12, MessageFormat.format(ImportExportMessages.ImportExportOperations_0, new Object[] { path.toPortableString() }))) { return false; } } // collect breakpoints Object[] elements = fTView.getCheckedElements().toArray(); - List breakpoints = new ArrayList(); + List<IBreakpoint> breakpoints = new ArrayList<IBreakpoint>(); for (int i = 0; i < elements.length; i++) { Object object = elements[i]; if (object instanceof IBreakpoint) { - breakpoints.add(object); + breakpoints.add((IBreakpoint) object); } } getContainer().run(false, true, new ExportBreakpointsOperation( - (IBreakpoint[]) breakpoints.toArray(new IBreakpoint[breakpoints.size()]), + breakpoints.toArray(new IBreakpoint[breakpoints.size()]), path.toOSString())); } catch (InterruptedException e) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java index 335366b41..3bdcfc2bb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,6 +14,7 @@ package org.eclipse.debug.internal.ui.importexport.breakpoints; import java.util.List; +import org.eclipse.core.resources.IMarker; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.IStructuredSelection; @@ -65,14 +66,16 @@ public class WizardImportBreakpoints extends Wizard implements IImportWizard { DebugUIPlugin plugin = DebugUIPlugin.getDefault(); IDialogSettings workbenchSettings = plugin.getDialogSettings(); IDialogSettings section = workbenchSettings.getSection(IMPORT_DIALOG_SETTINGS); - if (section == null) + if (section == null) { section = workbenchSettings.addNewSection(IMPORT_DIALOG_SETTINGS); + } setDialogSettings(section); } /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#addPages() */ + @Override public void addPages() { super.addPages(); fMainPage = new WizardImportBreakpointsPage(ImportExportMessages.WizardImportBreakpoints_0); @@ -84,6 +87,7 @@ public class WizardImportBreakpoints extends Wizard implements IImportWizard { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#dispose() */ + @Override public void dispose() { super.dispose(); fMainPage = null; @@ -92,19 +96,22 @@ public class WizardImportBreakpoints extends Wizard implements IImportWizard { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#performFinish() */ + @Override public boolean performFinish() { - List selectedBreakpoints = fSelectionPage.getSelectedMarkers(); + List<IMarker> selectedBreakpoints = fSelectionPage.getSelectedMarkers(); return fMainPage.finish(selectedBreakpoints); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { setWindowTitle(ImportExportMessages.WizardImportBreakpoints_0); setNeedsProgressMonitor(true); } + @Override public boolean needsProgressMonitor() { return true; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java index 95a15abf4..651fdcfb8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -78,6 +78,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener /* (non-Javadoc) * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ + @Override public void handleEvent(Event event) { Widget source = event.widget; if(source == fBrowseForFileButton) { @@ -101,6 +102,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { initializeDialogUnits(parent); Composite composite = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH); @@ -115,6 +117,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#getImage() */ + @Override public Image getImage() { return DebugUITools.getImage(IInternalDebugUIConstants.IMG_WIZBAN_IMPORT_BREAKPOINTS); } @@ -133,7 +136,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener } File file = new File(fileName); if (!file.exists() || file.isDirectory()) { - setMessage(MessageFormat.format(ImportExportMessages.WizardImportBreakpointsPage_1, new String[]{fileName}), ERROR); + setMessage(MessageFormat.format(ImportExportMessages.WizardImportBreakpointsPage_1, new Object[] { fileName }), ERROR); return false; } @@ -208,11 +211,12 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener return finish(null); } - public boolean finish(final List selectedMarkers) { + public boolean finish(final List<IMarker> selectedMarkers) { try { saveWidgetState(); getContainer().run(false, true, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { ImportBreakpointsOperation operation = new ImportBreakpointsOperation( fFileNameField.getText().trim(), @@ -230,8 +234,8 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener boolean selected = false; for(int j = 0; j < selectedMarkers.size(); j++) { try { - Map importedMarkerAttributes = importedBreakpoints[i].getMarker().getAttributes(); - Map selectedMarkerAttributes = ((IMarker) selectedMarkers.get(j)).getAttributes(); + Map<String, Object> importedMarkerAttributes = importedBreakpoints[i].getMarker().getAttributes(); + Map<String, Object> selectedMarkerAttributes = selectedMarkers.get(j).getAttributes(); if(importedMarkerAttributes.equals(selectedMarkerAttributes)) { selected = true; break; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsSelectionPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsSelectionPage.java index cf873f2fb..9374cea50 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsSelectionPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsSelectionPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Sebastian Schmidt and others. + * Copyright (c) 2012, 2013 Sebastian Schmidt and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Sebastian Schmidt - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.importexport.breakpoints; @@ -14,6 +15,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; +import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.debug.internal.core.BreakpointManager; @@ -50,6 +52,7 @@ public class WizardImportBreakpointsSelectionPage extends WizardPage { * (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { setDescription(ImportExportMessages.WizardImportBreakpointsSelectionPage_1); Composite composite = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH); @@ -61,14 +64,14 @@ public class WizardImportBreakpointsSelectionPage extends WizardPage { setControl(composite); } - public List getSelectedMarkers() { + public List<IMarker> getSelectedMarkers() { if(!fIsVisible) { return null; } - List markers = new ArrayList(); - List breakpoints = fTView.getCheckedElements().toList(); + List<IMarker> markers = new ArrayList<IMarker>(); + List<IBreakpoint> breakpoints = fTView.getCheckedElements().toList(); for(int i = 0; i < breakpoints.size(); i++) { - markers.add(((IBreakpoint) breakpoints.get(i)).getMarker()); + markers.add(breakpoints.get(i).getMarker()); } return markers; } @@ -77,6 +80,7 @@ public class WizardImportBreakpointsSelectionPage extends WizardPage { * (non-Javadoc) * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) */ + @Override public void setVisible(boolean visible) { if (visible) { fIsVisible = true; @@ -94,6 +98,7 @@ public class WizardImportBreakpointsSelectionPage extends WizardPage { private void updateBreakpointsPreviewList(final EmbeddedBreakpointsViewer currentTView) throws InvocationTargetException, InterruptedException { getContainer().run(false, true, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { WizardImportBreakpointsPage mainPage = (WizardImportBreakpointsPage) getWizard().getPage( ImportExportMessages.WizardImportBreakpoints_0); @@ -114,6 +119,7 @@ public class WizardImportBreakpointsSelectionPage extends WizardPage { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#getImage() */ + @Override public Image getImage() { return DebugUITools.getImage(IInternalDebugUIConstants.IMG_WIZBAN_IMPORT_BREAKPOINTS); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizard.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizard.java index cfbbe1fcc..8c826ba0a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizard.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizard.java @@ -44,6 +44,7 @@ public class ExportLaunchConfigurationsWizard extends Wizard implements IExportW /* (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#addPages() */ + @Override public void addPages() { IWizardPage page = new ExportLaunchConfigurationsWizardPage(); addPage(page); @@ -52,6 +53,7 @@ public class ExportLaunchConfigurationsWizard extends Wizard implements IExportW /* (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#performFinish() */ + @Override public boolean performFinish() { return ((ExportLaunchConfigurationsWizardPage)getStartingPage()).finish(); } @@ -59,6 +61,7 @@ public class ExportLaunchConfigurationsWizard extends Wizard implements IExportW /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { setWindowTitle(WizardMessages.ExportLaunchConfigurationsWizard_0); setNeedsProgressMonitor(true); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java index 80585cc0e..0ac2fea14 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java @@ -81,6 +81,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager(); + @Override public Object[] getChildren(Object parentElement) { if(parentElement instanceof ILaunchConfigurationType) { try { @@ -92,6 +93,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { } return null; } + @Override public Object getParent(Object element) { if(element instanceof ILaunchConfiguration) { try { @@ -102,13 +104,17 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { } return null; } + @Override public boolean hasChildren(Object element) { return element instanceof ILaunchConfigurationType; } + @Override public Object[] getElements(Object inputElement) { return lm.getLaunchConfigurationTypes(); } + @Override public void dispose() {lm = null;} + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} } @@ -129,6 +135,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH); //add the check table @@ -166,6 +173,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { fViewer.expandAll(); fViewer.collapseAll(); fViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { updateCheckedState(event.getElement()); setPageComplete(isComplete()); @@ -174,6 +182,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { Composite buttoncomp = SWTFactory.createComposite(parent, parent.getFont(), 2, 2, GridData.FILL_HORIZONTAL, 0, 0); Button button = SWTFactory.createPushButton(buttoncomp, WizardMessages.ExportLaunchConfigurationsWizardPage_8, null); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { Object[] items = fContentProvider.getElements(fViewer.getInput()); for (int i = 0; i < items.length; i++) { @@ -184,6 +193,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { }); button = SWTFactory.createPushButton(buttoncomp, WizardMessages.ExportLaunchConfigurationsWizardPage_9, null); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { Object[] items = fContentProvider.getElements(fViewer.getInput()); for (int i = 0; i < items.length; i++) { @@ -236,12 +246,14 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { String opath = getDialogSettings().get(OLD_PATH); fFilePath.setText((opath == null ? IInternalDebugCoreConstants.EMPTY_STRING : opath)); fFilePath.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { setPageComplete(isComplete()); } }); Button button = SWTFactory.createPushButton(comp, WizardMessages.ExportLaunchConfigurationsWizardPage_0, null, GridData.END); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { DirectoryDialog dd = new DirectoryDialog(getContainer().getShell()); dd.setText(WizardMessages.ExportLaunchConfigurationsWizard_0); @@ -291,6 +303,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { /* (non-Javadoc) * @see org.eclipse.jface.wizard.WizardPage#getImage() */ + @Override public Image getImage() { return DebugUITools.getImage(IInternalDebugUIConstants.IMG_WIZBAN_EXPORT_CONFIGS); } @@ -307,6 +320,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { final Object[] configs = fViewer.getCheckedElements(); final boolean overwrite = fOverwrite.getSelection(); UIJob exportjob = new UIJob(getContainer().getShell().getDisplay(), WizardMessages.ExportLaunchConfigurationsWizard_0) { + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if(monitor == null) { monitor = new NullProgressMonitor(); @@ -318,7 +332,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { } monitor.beginTask(WizardMessages.ExportLaunchConfigurationsWizardPage_10, configs.length); try { - List errors = null; + List<IStatus> errors = null; IFileStore file = null; File newfile = null; boolean owall = false, nowall = false; @@ -333,10 +347,10 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { file = launchConfig.getFileStore(); if (file == null) { if (errors == null) { - errors = new ArrayList(configs.length); + errors = new ArrayList<IStatus>(configs.length); } errors.add(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), - MessageFormat.format(WizardMessages.ExportLaunchConfigurationsWizardPage_19, new String[]{launchConfig.getName()}), null)); + MessageFormat.format(WizardMessages.ExportLaunchConfigurationsWizardPage_19, new Object[] { launchConfig.getName() }), null)); } else { newfile = new File(destpath.append(file.getName()).toOSString()); if(newfile.exists() & !overwrite) { @@ -346,7 +360,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { dialog = new MessageDialog(DebugUIPlugin.getShell(), WizardMessages.ExportLaunchConfigurationsWizardPage_11, null, - MessageFormat.format(WizardMessages.ExportLaunchConfigurationsWizardPage_12, new String[] {file.getName()}), + MessageFormat.format(WizardMessages.ExportLaunchConfigurationsWizardPage_12, new Object[] { file.getName() }), MessageDialog.QUESTION, new String[] {WizardMessages.ExportLaunchConfigurationsWizardPage_13, WizardMessages.ExportLaunchConfigurationsWizardPage_14, WizardMessages.ExportLaunchConfigurationsWizardPage_15, WizardMessages.ExportLaunchConfigurationsWizardPage_16, WizardMessages.ExportLaunchConfigurationsWizardPage_17}, 0); if(!owall) { int ret = dialog.open(); @@ -368,6 +382,8 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { monitor.setCanceled(true); break; } + default: + break; } } else if(!nowall) { @@ -381,14 +397,14 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { } catch (IOException e ) { if (errors == null) { - errors = new ArrayList(configs.length); + errors = new ArrayList<IStatus>(configs.length); } errors.add(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), e.getMessage(), e)); } catch (CoreException e) { if (errors == null) { - errors = new ArrayList(configs.length); + errors = new ArrayList<IStatus>(configs.length); } errors.add(e.getStatus()); } @@ -401,10 +417,10 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { return Status.OK_STATUS; } else { if (errors.size() == 1) { - return (IStatus)errors.get(0); + return errors.get(0); } else { return new MultiStatus(DebugUIPlugin.getUniqueIdentifier(), 0, - (IStatus[])errors.toArray(new IStatus[errors.size()]), + errors.toArray(new IStatus[errors.size()]), WizardMessages.ExportLaunchConfigurationsWizardPage_18, null); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizard.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizard.java index 1cefad93b..7d8bc653b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizard.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizard.java @@ -47,6 +47,7 @@ public class ImportLaunchConfigurationsWizard extends Wizard implements IImportW /* (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#performFinish() */ + @Override public boolean performFinish() { return ((ImportLaunchConfigurationsWizardPage)getStartingPage()).finish(); } @@ -54,6 +55,7 @@ public class ImportLaunchConfigurationsWizard extends Wizard implements IImportW /* (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#addPages() */ + @Override public void addPages() { addPage(new ImportLaunchConfigurationsWizardPage()); } @@ -61,6 +63,7 @@ public class ImportLaunchConfigurationsWizard extends Wizard implements IImportW /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { setWindowTitle(WizardMessages.ImportLaunchConfigurationsWizard_0); setNeedsProgressMonitor(true); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java index 85899ba77..0fb6ca526 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -81,6 +81,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa return populated; } + @Override public AdaptableList getFiles() { if(!populated) { populateElementChildren(); @@ -88,6 +89,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa return super.getFiles(); } + @Override public AdaptableList getFolders() { if(!populated) { populateElementChildren(); @@ -102,12 +104,9 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa */ private void populateElementChildren() { FileSystemStructureProvider provider = FileSystemStructureProvider.INSTANCE; - List allchildren = provider.getChildren(this.getFileSystemObject()); - File child = null; + List<File> allchildren = provider.getChildren(this.getFileSystemObject()); DebugFileSystemElement newelement = null; - Iterator iter = allchildren.iterator(); - while(iter.hasNext()) { - child = (File) iter.next(); + for (File child : allchildren) { if(child.isFile()) { Path childpath = new Path(child.getAbsolutePath()); String extension = childpath.getFileExtension(); @@ -143,6 +142,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH); createRootDirectoryGroup(comp); @@ -168,12 +168,12 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa settings.put(OVERWRITE, fOverwrite.getSelection()); settings.put(OLD_PATH, fFromDirectory.getText().trim()); boolean overwrite = fOverwrite.getSelection(); - List items = getSelectedResources(); + List<?> items = getSelectedResources(); File config, newconfig = null; boolean owall = false, nowall = false; MessageDialog dialog = null; - final List filesToImport = new ArrayList(); - for(Iterator iter = items.iterator(); iter.hasNext();) { + final List<File> filesToImport = new ArrayList<File>(); + for (Iterator<?> iter = items.iterator(); iter.hasNext();) { config = (File) ((DebugFileSystemElement) iter.next()).getFileSystemObject(); newconfig = new File(new Path(LaunchManager.LOCAL_LAUNCH_CONFIGURATION_CONTAINER_PATH.toOSString()).append(config.getName()).toOSString()); if(newconfig.exists() & !overwrite) { @@ -184,7 +184,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa dialog = new MessageDialog(DebugUIPlugin.getShell(), WizardMessages.ExportLaunchConfigurationsWizardPage_11, null, - MessageFormat.format(WizardMessages.ExportLaunchConfigurationsWizardPage_12, new String[] {config.getName()}), + MessageFormat.format(WizardMessages.ExportLaunchConfigurationsWizardPage_12, new Object[] { config.getName() }), MessageDialog.QUESTION, new String[] {WizardMessages.ExportLaunchConfigurationsWizardPage_13, WizardMessages.ExportLaunchConfigurationsWizardPage_14, WizardMessages.ExportLaunchConfigurationsWizardPage_15, WizardMessages.ExportLaunchConfigurationsWizardPage_16, WizardMessages.ExportLaunchConfigurationsWizardPage_17}, 0); int ret = dialog.open(); switch(ret) { @@ -204,6 +204,8 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa case 4: { return true; } + default: + break; } } else if(!nowall) { filesToImport.add(config); @@ -215,10 +217,11 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa if (!filesToImport.isEmpty()) { Job job = new Job(WizardMessages.ExportLaunchConfigurationsWizard_0) { + @Override public IStatus run(IProgressMonitor monitor) { LaunchManager launchManager = (LaunchManager) DebugPlugin.getDefault().getLaunchManager(); try { - launchManager.importConfigurations((File[]) filesToImport.toArray(new File[filesToImport.size()]), monitor); + launchManager.importConfigurations(filesToImport.toArray(new File[filesToImport.size()]), monitor); } catch (CoreException e) { return e.getStatus(); } @@ -234,6 +237,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa /* (non-Javadoc) * @see org.eclipse.jface.wizard.WizardPage#getImage() */ + @Override public Image getImage() { return DebugUITools.getImage(IInternalDebugUIConstants.IMG_WIZBAN_IMPORT_CONFIGS); } @@ -241,6 +245,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa /* (non-Javadoc) * @see org.eclipse.ui.dialogs.WizardResourceImportPage#updateWidgetEnablements() */ + @Override protected void updateWidgetEnablements() { setPageComplete(determinePageCompletion()); } @@ -248,6 +253,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa /* (non-Javadoc) * @see org.eclipse.ui.dialogs.WizardResourceImportPage#determinePageCompletion() */ + @Override protected boolean determinePageCompletion() { if(fFromDirectory.getText().trim().equals(IInternalDebugCoreConstants.EMPTY_STRING)) { setErrorMessage(WizardMessages.ImportLaunchConfigurationsWizardPage_3); @@ -265,6 +271,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa /* (non-Javadoc) * @see org.eclipse.ui.dialogs.WizardResourceImportPage#createSourceGroup(org.eclipse.swt.widgets.Composite) */ + @Override protected void createSourceGroup(Composite parent) {} /** @@ -278,6 +285,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa // source browse button Button browse = SWTFactory.createPushButton(comp, WizardMessages.ImportLaunchConfigurationsWizardPage_7, null); browse.addSelectionListener(new SelectionAdapter () { + @Override public void widgetSelected(SelectionEvent e) { DirectoryDialog dd = new DirectoryDialog(getContainer().getShell()); dd.setText(WizardMessages.ImportLaunchConfigurationsWizardPage_0); @@ -300,6 +308,8 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa */ protected void resetSelection(final IPath path) { BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() { + @SuppressWarnings("restriction") + @Override public void run() { File file = new File(path.toOSString()); DebugFileSystemElement dummyparent = new DebugFileSystemElement(IInternalDebugCoreConstants.EMPTY_STRING, null, true); @@ -317,9 +327,11 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa /* (non-Javadoc) * @see org.eclipse.ui.dialogs.WizardResourceImportPage#getFileProvider() */ + @Override protected ITreeContentProvider getFileProvider() { return new WorkbenchContentProvider() { - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { if (o instanceof DebugFileSystemElement) { DebugFileSystemElement element = (DebugFileSystemElement) o; return element.getFiles().getChildren(element); @@ -332,9 +344,11 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa /* (non-Javadoc) * @see org.eclipse.ui.dialogs.WizardResourceImportPage#getFolderProvider() */ + @Override protected ITreeContentProvider getFolderProvider() { return new WorkbenchContentProvider() { - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { if (o instanceof DebugFileSystemElement) { DebugFileSystemElement element = (DebugFileSystemElement) o; return element.getFolders().getChildren(); @@ -342,7 +356,8 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa return new Object[0]; } - public boolean hasChildren(Object o) { + @Override + public boolean hasChildren(Object o) { if (o instanceof DebugFileSystemElement) { DebugFileSystemElement element = (DebugFileSystemElement) o; if (element.isPopulated()) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/AbstractLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/AbstractLaunchConfigurationAction.java index 61dee1659..771ca395f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/AbstractLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/AbstractLaunchConfigurationAction.java @@ -91,6 +91,7 @@ public abstract class AbstractLaunchConfigurationAction extends SelectionListene /** * @see org.eclipse.jface.action.IAction#run() */ + @Override public final void run() { if (fConfirmationRequestor != null) { if (!fConfirmationRequestor.getConfirmation()) { @@ -101,6 +102,7 @@ public abstract class AbstractLaunchConfigurationAction extends SelectionListene /** * @see java.lang.Runnable#run() */ + @Override public void run() { performAction(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ClosedProjectFilter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ClosedProjectFilter.java index d36c2e406..2a4d66c74 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ClosedProjectFilter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ClosedProjectFilter.java @@ -39,6 +39,7 @@ public class ClosedProjectFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parent, Object element) { //always let through types, we only care about configs if(element instanceof ILaunchConfigurationType) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CollapseAllLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CollapseAllLaunchConfigurationAction.java index a8ab1d7d7..ad47df486 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CollapseAllLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CollapseAllLaunchConfigurationAction.java @@ -44,6 +44,7 @@ public class CollapseAllLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COLLAPSE_ALL); } @@ -51,6 +52,7 @@ public class CollapseAllLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getText() */ + @Override public String getText() { return LaunchConfigurationsMessages.CollapseAllLaunchConfigurationAction_0; } @@ -58,6 +60,7 @@ public class CollapseAllLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getToolTipText() */ + @Override public String getToolTipText() { return LaunchConfigurationsMessages.CollapseAllLaunchConfigurationAction_1; } @@ -65,6 +68,7 @@ public class CollapseAllLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getDisabledImageDescriptor() */ + @Override public ImageDescriptor getDisabledImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COLLAPSE_ALL); } @@ -72,6 +76,7 @@ public class CollapseAllLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { fViewer.collapseAll(); } @@ -79,6 +84,7 @@ public class CollapseAllLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getDescription() */ + @Override public String getDescription() { return LaunchConfigurationsMessages.CollapseAllLaunchConfigurationAction_2; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java index 3c1d9a950..f8124b2f3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,13 +36,13 @@ public class CompileErrorProjectPromptStatusHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus(IStatus status, Object source) throws CoreException { ILaunchConfiguration config = null; - List projects = new ArrayList(); - + List<Object> projects = new ArrayList<Object>(); if (source instanceof List) { - List args = (List) source; - Iterator iterator = args.iterator(); + List<?> args = (List<?>) source; + Iterator<?> iterator = args.iterator(); while (iterator.hasNext()) { Object arg = iterator.next(); if (arg instanceof ILaunchConfiguration) { @@ -72,7 +72,7 @@ public class CompileErrorProjectPromptStatusHandler implements IStatusHandler { projectMessage = projectList.toString(); } String title = LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_0; - String message = MessageFormat.format(LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_2, new String[]{projectMessage}); + String message = MessageFormat.format(LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_2, new Object[] { projectMessage }); IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore(); String pref = store.getString(IInternalDebugUIConstants.PREF_CONTINUE_WITH_COMPILE_ERROR); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java index ac0805393..5d411606e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java @@ -29,6 +29,7 @@ public class CompileErrorPromptStatusHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus(IStatus status, Object source) throws CoreException { if (source instanceof ILaunchConfiguration) { ILaunchConfiguration config = (ILaunchConfiguration)source; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java index f274f056d..d49e50f23 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java @@ -48,6 +48,7 @@ public class CreateLaunchConfigurationAction extends AbstractLaunchConfiguration /** * @see AbstractLaunchConfigurationAction#performAction() */ + @Override protected void performAction() { Object object = getStructuredSelection().getFirstElement(); //double click with Ctrl key mask results in empty selection: bug 156087 @@ -89,6 +90,7 @@ public class CreateLaunchConfigurationAction extends AbstractLaunchConfiguration /** * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { return selection.size() == 1; } @@ -96,6 +98,7 @@ public class CreateLaunchConfigurationAction extends AbstractLaunchConfiguration /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getDisabledImageDescriptor() */ + @Override public ImageDescriptor getDisabledImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_NEW_CONFIG); } @@ -103,6 +106,7 @@ public class CreateLaunchConfigurationAction extends AbstractLaunchConfiguration /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_NEW_CONFIG); } @@ -110,6 +114,7 @@ public class CreateLaunchConfigurationAction extends AbstractLaunchConfiguration /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getToolTipText() */ + @Override public String getToolTipText() { return LaunchConfigurationsMessages.LaunchConfigurationsDialog_0; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java index b56132adc..c14731486 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java @@ -29,6 +29,7 @@ public class DebugModePromptStatusHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus(IStatus status, Object source) throws CoreException { if (source instanceof ILaunchConfiguration) { ILaunchConfiguration config = (ILaunchConfiguration)source; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java index 7738c162c..a9cc4fefd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -55,6 +55,7 @@ public class DeleteLaunchConfigurationAction extends AbstractLaunchConfiguration /** * @see AbstractLaunchConfigurationAction#performAction() */ + @Override protected void performAction() { if(!shouldDelete()) { return; @@ -62,7 +63,7 @@ public class DeleteLaunchConfigurationAction extends AbstractLaunchConfiguration IStructuredSelection selection = getStructuredSelection(); getViewer().getControl().setRedraw(false); - Iterator iterator = selection.iterator(); + Iterator<?> iterator = selection.iterator(); while (iterator.hasNext()) { ILaunchConfiguration configuration = (ILaunchConfiguration)iterator.next(); try { @@ -77,11 +78,12 @@ public class DeleteLaunchConfigurationAction extends AbstractLaunchConfiguration /** * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { if (selection.isEmpty()) { return false; } - Iterator items = selection.iterator(); + Iterator<?> items = selection.iterator(); while (items.hasNext()) { if (!(items.next() instanceof ILaunchConfiguration)) { return false; @@ -93,6 +95,7 @@ public class DeleteLaunchConfigurationAction extends AbstractLaunchConfiguration /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getDisabledImageDescriptor() */ + @Override public ImageDescriptor getDisabledImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DELETE_CONFIG); } @@ -100,6 +103,7 @@ public class DeleteLaunchConfigurationAction extends AbstractLaunchConfiguration /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DELETE_CONFIG); } @@ -107,6 +111,7 @@ public class DeleteLaunchConfigurationAction extends AbstractLaunchConfiguration /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getToolTipText() */ + @Override public String getToolTipText() { return LaunchConfigurationsMessages.LaunchConfigurationsDialog_1; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeletedProjectFilter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeletedProjectFilter.java index fb68746ca..c7496285d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeletedProjectFilter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeletedProjectFilter.java @@ -38,6 +38,7 @@ public class DeletedProjectFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { //always let through types, we only care about configs if (element instanceof ILaunchConfigurationType) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java index fd9a3fbd2..00947544c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java @@ -42,6 +42,7 @@ public class DuplicateLaunchConfigurationAction extends AbstractLaunchConfigurat /** * @see AbstractLaunchConfigurationAction#performAction() */ + @Override protected void performAction() { ILaunchConfiguration original = (ILaunchConfiguration)getStructuredSelection().getFirstElement(); String newName = DebugPlugin.getDefault().getLaunchManager().generateLaunchConfigurationName(original.getName()); @@ -56,6 +57,7 @@ public class DuplicateLaunchConfigurationAction extends AbstractLaunchConfigurat /** * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { return selection.size() == 1 && selection.getFirstElement() instanceof ILaunchConfiguration; } @@ -63,6 +65,7 @@ public class DuplicateLaunchConfigurationAction extends AbstractLaunchConfigurat /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getDisabledImageDescriptor() */ + @Override public ImageDescriptor getDisabledImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DUPLICATE_CONFIG); } @@ -70,6 +73,7 @@ public class DuplicateLaunchConfigurationAction extends AbstractLaunchConfigurat /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DUPLICATE_CONFIG); } @@ -77,6 +81,7 @@ public class DuplicateLaunchConfigurationAction extends AbstractLaunchConfigurat /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getToolTipText() */ + @Override public String getToolTipText() { return LaunchConfigurationsMessages.LaunchConfigurationsDialog_5; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchDelegatesStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchDelegatesStatusHandler.java index a599a91ce..d2c5ec444 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchDelegatesStatusHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchDelegatesStatusHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,6 +36,7 @@ public class DuplicateLaunchDelegatesStatusHandler implements IStatusHandler { /** * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus(IStatus status, Object source) throws CoreException { if(source instanceof Object[]) { Object[] infos = (Object[]) source; @@ -43,7 +44,7 @@ public class DuplicateLaunchDelegatesStatusHandler implements IStatusHandler { ILaunchConfiguration config = (ILaunchConfiguration) infos[0]; String mode = (String) infos[1]; Shell shell = DebugUIPlugin.getShell(); - HashSet modes = new HashSet(); + HashSet<String> modes = new HashSet<String>(); modes.add(mode); modes.addAll(config.getModes()); SelectLaunchersDialog sldd = new SelectLaunchersDialog(shell, diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/EnvironmentVariable.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/EnvironmentVariable.java index c93c3aede..4421aa195 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/EnvironmentVariable.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/EnvironmentVariable.java @@ -61,6 +61,7 @@ public class EnvironmentVariable /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { return getName(); } @@ -69,6 +70,7 @@ public class EnvironmentVariable /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { boolean equal = false; if (obj instanceof EnvironmentVariable) { @@ -80,6 +82,7 @@ public class EnvironmentVariable /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return name.hashCode(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java index 7bedac0cd..86780ffa3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -65,7 +65,7 @@ public class FavoritesDialog extends TrayDialog { private LaunchHistory fHistory; // favorites collection under edit - private List fFavorites; + private List<ILaunchConfiguration> fFavorites; // buttons protected Button fAddFavoriteButton; @@ -78,6 +78,7 @@ public class FavoritesDialog extends TrayDialog { * Listener that delegates when a button is pressed */ private SelectionAdapter fButtonListener= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { Button button = (Button) e.widget; if (button == fAddFavoriteButton) { @@ -96,6 +97,7 @@ public class FavoritesDialog extends TrayDialog { * Listener that delegates when the selection changes in a table */ private ISelectionChangedListener fSelectionChangedListener= new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleFavoriteSelectionChanged(); } @@ -105,6 +107,7 @@ public class FavoritesDialog extends TrayDialog { * Listener that delegates when a key is pressed in a table */ private KeyListener fKeyListener= new KeyAdapter() { + @Override public void keyPressed(KeyEvent event) { if (event.character == SWT.DEL && event.stateMask == 0) { removeSelectedFavorites(); @@ -116,11 +119,14 @@ public class FavoritesDialog extends TrayDialog { * Content provider for favorites table */ protected class FavoritesContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { - ILaunchConfiguration[] favorites= (ILaunchConfiguration[]) getFavorites().toArray(new ILaunchConfiguration[0]); + ILaunchConfiguration[] favorites= getFavorites().toArray(new ILaunchConfiguration[0]); return LaunchConfigurationManager.filterConfigs(favorites); } + @Override public void dispose() {} + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} } @@ -145,7 +151,7 @@ public class FavoritesDialog extends TrayDialog { Object[] selection = sfd.getResult(); if (selection != null) { for (int i = 0; i < selection.length; i++) { - getFavorites().add(selection[i]); + getFavorites().add((ILaunchConfiguration) selection[i]); } updateStatus(); } @@ -156,7 +162,7 @@ public class FavoritesDialog extends TrayDialog { */ protected void removeSelectedFavorites() { IStructuredSelection sel = (IStructuredSelection)getFavoritesTable().getSelection(); - Iterator iter = sel.iterator(); + Iterator<?> iter = sel.iterator(); while (iter.hasNext()) { Object config = iter.next(); getFavorites().remove(config); @@ -174,6 +180,7 @@ public class FavoritesDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#getInitialSize() */ + @Override protected Point getInitialSize() { return new Point(350, 400); } @@ -191,10 +198,10 @@ public class FavoritesDialog extends TrayDialog { */ protected void handleMove(int direction) { IStructuredSelection sel = (IStructuredSelection)getFavoritesTable().getSelection(); - List selList= sel.toList(); + List<?> selList = sel.toList(); Object[] movedFavs= new Object[getFavorites().size()]; int i; - for (Iterator favs = selList.iterator(); favs.hasNext();) { + for (Iterator<?> favs = selList.iterator(); favs.hasNext();) { Object config = favs.next(); i= getFavorites().indexOf(config); movedFavs[i + direction]= config; @@ -205,7 +212,7 @@ public class FavoritesDialog extends TrayDialog { for (int j = 0; j < movedFavs.length; j++) { Object config = movedFavs[j]; if (config != null) { - getFavorites().add(j, config); + getFavorites().add(j, (ILaunchConfiguration) config); } } getFavoritesTable().refresh(); @@ -225,9 +232,10 @@ public class FavoritesDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); - getShell().setText(MessageFormat.format(LaunchConfigurationsMessages.FavoritesDialog_1, new String[]{getModeLabel()})); + getShell().setText(MessageFormat.format(LaunchConfigurationsMessages.FavoritesDialog_1, new Object[] { getModeLabel() })); createFavoritesArea(composite); handleFavoriteSelectionChanged(); return composite; @@ -236,6 +244,7 @@ public class FavoritesDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Control contents = super.createContents(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getDialogArea(), IDebugHelpContextIds.ORGANIZE_FAVORITES_DIALOG); @@ -292,10 +301,10 @@ public class FavoritesDialog extends TrayDialog { /** * Returns the current list of favorites. */ - protected List getFavorites() { + protected List<ILaunchConfiguration> getFavorites() { if (fFavorites == null) { ILaunchConfiguration[] favs = getInitialFavorites(); - fFavorites = new ArrayList(favs.length); + fFavorites = new ArrayList<ILaunchConfiguration>(favs.length); addAll(favs, fFavorites); } return fFavorites; @@ -322,7 +331,7 @@ public class FavoritesDialog extends TrayDialog { /** * Copies the array into the list */ - protected void addAll(Object[] array, List list) { + protected void addAll(ILaunchConfiguration[] array, List<ILaunchConfiguration> list) { for (int i = 0; i < array.length; i++) { list.add(array[i]); } @@ -341,9 +350,9 @@ public class FavoritesDialog extends TrayDialog { */ protected void handleFavoriteSelectionChanged() { IStructuredSelection selection = (IStructuredSelection)getFavoritesTable().getSelection(); - List favs = getFavorites(); + List<ILaunchConfiguration> favs = getFavorites(); boolean notEmpty = !selection.isEmpty(); - Iterator elements= selection.iterator(); + Iterator<?> elements = selection.iterator(); boolean first= false; boolean last= false; int lastFav= favs.size() - 1; @@ -369,9 +378,11 @@ public class FavoritesDialog extends TrayDialog { public void saveFavorites() { final Job job = new Job(LaunchConfigurationsMessages.FavoritesDialog_8) { + @SuppressWarnings("deprecation") + @Override protected IStatus run(IProgressMonitor monitor) { ILaunchConfiguration[] initial = getInitialFavorites(); - List current = getFavorites(); + List<ILaunchConfiguration> current = getFavorites(); String groupId = getLaunchHistory().getLaunchGroup().getIdentifier(); int taskSize = Math.abs(initial.length-current.size());//get task size @@ -386,7 +397,7 @@ public class FavoritesDialog extends TrayDialog { ILaunchConfigurationWorkingCopy workingCopy = configuration.getWorkingCopy(); workingCopy.setAttribute(IDebugUIConstants.ATTR_DEBUG_FAVORITE, (String)null); workingCopy.setAttribute(IDebugUIConstants.ATTR_DEBUG_FAVORITE, (String)null); - List groups = workingCopy.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List)null); + List<String> groups = workingCopy.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List<String>) null); if (groups != null) { groups.remove(groupId); if (groups.isEmpty()) { @@ -404,13 +415,13 @@ public class FavoritesDialog extends TrayDialog { } // update added favorites - Iterator favs = current.iterator(); + Iterator<ILaunchConfiguration> favs = current.iterator(); while (favs.hasNext()) { - ILaunchConfiguration configuration = (ILaunchConfiguration)favs.next(); + ILaunchConfiguration configuration = favs.next(); try { - List groups = configuration.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List)null); + List<String> groups = configuration.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List<String>) null); if (groups == null) { - groups = new ArrayList(); + groups = new ArrayList<String>(); } if (!groups.contains(groupId)) { groups.add(groupId); @@ -436,13 +447,14 @@ public class FavoritesDialog extends TrayDialog { } - protected ILaunchConfiguration[] getArray(List list) { - return (ILaunchConfiguration[])list.toArray(new ILaunchConfiguration[list.size()]); + protected ILaunchConfiguration[] getArray(List<ILaunchConfiguration> list) { + return list.toArray(new ILaunchConfiguration[list.size()]); } /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { saveFavorites(); super.okPressed(); @@ -451,7 +463,8 @@ public class FavoritesDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() */ - protected IDialogSettings getDialogBoundsSettings() { + @Override + protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsSectionName()); if (section == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterDropDownMenuCreator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterDropDownMenuCreator.java index 507392032..bfaafe5ff 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterDropDownMenuCreator.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterDropDownMenuCreator.java @@ -80,6 +80,7 @@ public class FilterDropDownMenuCreator implements IMenuCreator { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { if(fStore != null) { fStore.setValue(fKey, isChecked()); @@ -103,6 +104,7 @@ public class FilterDropDownMenuCreator implements IMenuCreator { /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#dispose() */ + @Override public void dispose() { fCreatedMenu = null; } @@ -110,6 +112,7 @@ public class FilterDropDownMenuCreator implements IMenuCreator { /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control) */ + @Override public Menu getMenu(Control parent) { if(fCreatedMenu != null) { fCreatedMenu.dispose(); @@ -126,6 +129,7 @@ public class FilterDropDownMenuCreator implements IMenuCreator { //add pref action IAction action = new Action(LaunchConfigurationsMessages.FilterDropDownMenuCreator_3) { + @Override public void run() { SWTFactory.showPreferencePage("org.eclipse.debug.ui.LaunchConfigurations"); //$NON-NLS-1$ } @@ -137,6 +141,7 @@ public class FilterDropDownMenuCreator implements IMenuCreator { /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu) */ + @Override public Menu getMenu(Menu parent) { return fCreatedMenu; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterLaunchConfigurationAction.java index e6fd293d3..2dfc44491 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterLaunchConfigurationAction.java @@ -50,6 +50,7 @@ public class FilterLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { SWTFactory.showPreferencePage("org.eclipse.debug.ui.LaunchConfigurations"); //$NON-NLS-1$ } @@ -57,6 +58,7 @@ public class FilterLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getDescription() */ + @Override public String getDescription() { return LaunchConfigurationsMessages.LaunchConfigurationsDialog_4; } @@ -64,6 +66,7 @@ public class FilterLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getDisabledImageDescriptor() */ + @Override public ImageDescriptor getDisabledImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_FILTER_CONFIGS); } @@ -71,6 +74,7 @@ public class FilterLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_FILTER_CONFIGS); } @@ -78,6 +82,7 @@ public class FilterLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getMenuCreator() */ + @Override public IMenuCreator getMenuCreator() { return fMenuCreator; } @@ -85,6 +90,7 @@ public class FilterLaunchConfigurationAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getToolTipText() */ + @Override public String getToolTipText() { return LaunchConfigurationsMessages.LaunchConfigurationsDialog_4; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchCategoryFilter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchCategoryFilter.java index ae6e65f4b..3abc9efd7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchCategoryFilter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchCategoryFilter.java @@ -40,6 +40,7 @@ public class LaunchCategoryFilter extends ViewerFilter { /** * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { ILaunchConfigurationType type = null; ILaunchConfiguration config = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java index 0c91d5932..0a683b12e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,24 +28,24 @@ import org.eclipse.ui.model.WorkbenchViewerComparator; * Groups configurations by type. * * @since 3.3 - * CONTEXTLAUNCHING */ public class LaunchConfigurationComparator extends WorkbenchViewerComparator { /** * the map of categories of <code>ILaunchConfigurationType</code>s to <code>Integer</code>s entries */ - private static Map fgCategories; + private static Map<ILaunchConfigurationType, Integer> fgCategories; /** * @see org.eclipse.jface.viewers.ViewerComparator#category(java.lang.Object) */ + @Override public int category(Object element) { - Map map = getCategories(); + Map<ILaunchConfigurationType, Integer> map = getCategories(); if (element instanceof ILaunchConfiguration) { ILaunchConfiguration configuration = (ILaunchConfiguration) element; try { - Integer i = (Integer) map.get(configuration.getType()); + Integer i = map.get(configuration.getType()); if (i != null) { return i.intValue(); } @@ -59,19 +59,20 @@ public class LaunchConfigurationComparator extends WorkbenchViewerComparator { * Returns the map of categories * @return the map of categories */ - private Map getCategories() { + private Map<ILaunchConfigurationType, Integer> getCategories() { if (fgCategories == null) { - fgCategories = new HashMap(); - List types = Arrays.asList(DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationTypes()); - Collections.sort(types, new Comparator() { - public int compare(Object o1, Object o2) { - ILaunchConfigurationType t1 = (ILaunchConfigurationType) o1; - ILaunchConfigurationType t2 = (ILaunchConfigurationType) o2; + fgCategories = new HashMap<ILaunchConfigurationType, Integer>(); + List<ILaunchConfigurationType> types = Arrays.asList(DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationTypes()); + Collections.sort(types, new Comparator<ILaunchConfigurationType>() { + @Override + public int compare(ILaunchConfigurationType o1, ILaunchConfigurationType o2) { + ILaunchConfigurationType t1 = o1; + ILaunchConfigurationType t2 = o2; return t1.getName().compareTo(t2.getName()); } }); - Iterator iterator = types.iterator(); + Iterator<ILaunchConfigurationType> iterator = types.iterator(); int i = 0; while (iterator.hasNext()) { fgCategories.put(iterator.next(), new Integer(i)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java index f544212ea..170414a1c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java @@ -36,6 +36,7 @@ public class LaunchConfigurationDialog extends LaunchConfigurationPropertiesDial /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPropertiesDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, ID_LAUNCH_BUTTON, getLaunchButtonText(), true); createButton(parent, ID_CLOSE_BUTTON, LaunchConfigurationsMessages.LaunchConfigurationDialog_Close_1, false); @@ -44,6 +45,7 @@ public class LaunchConfigurationDialog extends LaunchConfigurationPropertiesDial /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPropertiesDialog#getTitleAreaTitle() */ + @Override protected String getTitleAreaTitle() { return LaunchConfigurationsMessages.LaunchConfigurationDialog_Modify_attributes_and_launch__1; } @@ -51,6 +53,7 @@ public class LaunchConfigurationDialog extends LaunchConfigurationPropertiesDial /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SINGLE_LAUNCH_CONFIGURATION_DIALOG; } @@ -58,6 +61,7 @@ public class LaunchConfigurationDialog extends LaunchConfigurationPropertiesDial /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPropertiesDialog#updateButtons() */ + @Override public void updateButtons() { // Launch button getTabViewer().refresh(); @@ -68,6 +72,7 @@ public class LaunchConfigurationDialog extends LaunchConfigurationPropertiesDial /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPropertiesDialog#getDialogSettingsSectionName() */ + @Override protected String getDialogSettingsSectionName() { return IDebugUIConstants.PLUGIN_ID + ".SINGLE_LAUNCH_CONFIGURATION_DIALOG_SECTION"; //$NON-NLS-1$ } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationEditDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationEditDialog.java index 2882cf0cd..bda318063 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationEditDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationEditDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -41,6 +41,7 @@ public class LaunchConfigurationEditDialog extends LaunchConfigurationDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPropertiesDialog#getTitleAreaTitle() */ + @Override protected String getTitleAreaTitle() { return LaunchConfigurationsMessages.LaunchConfigurationEditDialog_0; } @@ -48,6 +49,7 @@ public class LaunchConfigurationEditDialog extends LaunchConfigurationDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPropertiesDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, ID_LAUNCH_BUTTON, LaunchConfigurationsMessages.LaunchConfigurationEditDialog_1, true); if(fShowCancel) { @@ -58,6 +60,7 @@ public class LaunchConfigurationEditDialog extends LaunchConfigurationDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPropertiesDialog#updateButtons() */ + @Override public void updateButtons() { getTabViewer().refresh(); getButton(ID_LAUNCH_BUTTON).setEnabled(getTabViewer().canLaunch() & getTabViewer().canLaunchWithModes() & !getTabViewer().hasDuplicateDelegates()); @@ -66,6 +69,7 @@ public class LaunchConfigurationEditDialog extends LaunchConfigurationDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPropertiesDialog#getDialogSettingsSectionName() */ + @Override protected String getDialogSettingsSectionName() { return IDebugUIConstants.PLUGIN_ID + ".LAUNCH_CONFIGURATION_EDIT_DIALOG_SECTION"; //$NON-NLS-1$ } @@ -73,6 +77,7 @@ public class LaunchConfigurationEditDialog extends LaunchConfigurationDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#buttonPressed(int) */ + @Override protected void buttonPressed(int buttonId) { switch (buttonId) { case ID_LAUNCH_BUTTON: { @@ -90,6 +95,8 @@ public class LaunchConfigurationEditDialog extends LaunchConfigurationDialog { cancelPressed(); break; } + default: + break; } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationFilteredTree.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationFilteredTree.java index 9d11cc45d..c6cfc5d14 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationFilteredTree.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationFilteredTree.java @@ -70,6 +70,7 @@ public final class LaunchConfigurationFilteredTree extends FilteredTree { /** * @see org.eclipse.ui.dialogs.FilteredTree#doCreateTreeViewer(org.eclipse.swt.widgets.Composite, int) */ + @Override protected TreeViewer doCreateTreeViewer(Composite cparent, int style) { treeViewer = new LaunchConfigurationViewer(cparent, style); treeViewer.setLabelProvider(new DecoratingLabelProvider(DebugUITools.newDebugModelPresentation(), PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator())); @@ -83,6 +84,7 @@ public final class LaunchConfigurationFilteredTree extends FilteredTree { } } treeViewer.getControl().addHelpListener(new HelpListener() { + @Override public void helpRequested(HelpEvent evt) { handleHelpRequest(evt); } @@ -93,6 +95,7 @@ public final class LaunchConfigurationFilteredTree extends FilteredTree { /** * @see org.eclipse.ui.dialogs.FilteredTree#createControl(org.eclipse.swt.widgets.Composite, int) */ + @Override protected void createControl(Composite cparent, int treeStyle) { super.createControl(cparent, treeStyle); setBackground(cparent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND)); @@ -102,6 +105,7 @@ public final class LaunchConfigurationFilteredTree extends FilteredTree { * @see org.eclipse.ui.dialogs.FilteredTree#init(int, org.eclipse.ui.dialogs.PatternFilter) * force it to do nothing so that we can initialize the class properly */ + @Override protected void init(int treeStyle, PatternFilter filter) {} /** @@ -131,6 +135,7 @@ public final class LaunchConfigurationFilteredTree extends FilteredTree { /* (non-Javadoc) * @see org.eclipse.ui.dialogs.FilteredTree#textChanged() */ + @Override protected void textChanged() { LaunchConfigurationsDialog dialog = (LaunchConfigurationsDialog)LaunchConfigurationsDialog.getCurrentlyVisibleLaunchConfigurationDialog(); if(dialog == null) { @@ -221,6 +226,7 @@ public final class LaunchConfigurationFilteredTree extends FilteredTree { * * @see org.eclipse.ui.dialogs.FilteredTree#updateToolbar(boolean) */ + @Override protected void updateToolbar(boolean visible) { super.updateToolbar(visible); // update filter count diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java index 5827ad5a9..d759e4421 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,7 +17,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; @@ -99,15 +98,16 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * A comparator for the ordering of launch shortcut extensions * @since 3.3 */ - class ShortcutComparator implements Comparator { + class ShortcutComparator implements Comparator<LaunchShortcutExtension> { /** * @see Comparator#compare(Object, Object) */ - public int compare(Object a, Object b) { - LaunchShortcutExtension shorcutA = (LaunchShortcutExtension)a; + @Override + public int compare(LaunchShortcutExtension a, LaunchShortcutExtension b) { + LaunchShortcutExtension shorcutA = a; String labelA = shorcutA.getLabel(); String pathA = shorcutA.getMenuPath(); - LaunchShortcutExtension shortcutB = (LaunchShortcutExtension)b; + LaunchShortcutExtension shortcutB = b; String labelB = shortcutB.getLabel(); String pathB = shortcutB.getMenuPath(); @@ -148,27 +148,27 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici /** * Launch group extensions, keyed by launch group identifier. */ - protected Map fLaunchGroups; + protected Map<String, LaunchGroupExtension> fLaunchGroups; /** * Launch histories keyed by launch group identifier */ - protected Map fLaunchHistories; + protected Map<String, LaunchHistory> fLaunchHistories; /** * The list of registered implementors of <code>ILaunchHistoryChangedListener</code> */ - protected List fLaunchHistoryChangedListeners = new ArrayList(3); + protected List<ILaunchHistoryChangedListener> fLaunchHistoryChangedListeners = new ArrayList<ILaunchHistoryChangedListener>(3); /** * Launch shortcuts */ - private List fLaunchShortcuts = null; + private List<LaunchShortcutExtension> fLaunchShortcuts = null; /** * Launch shortcuts, cached by perspective ids */ - private Map fLaunchShortcutsByPerspective = null; + private Map<String, List<LaunchShortcutExtension>> fLaunchShortcutsByPerspective = null; /** * Cache of launch configuration tab images with error overlays @@ -238,7 +238,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici if (activitySupport == null) { return configurations; } - List filteredConfigs = new ArrayList(); + List<ILaunchConfiguration> filteredConfigs = new ArrayList<ILaunchConfiguration>(); ILaunchConfigurationType type = null; LaunchConfigurationTypeContribution contribution = null; ILaunchConfiguration configuration = null; @@ -253,7 +253,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici } catch (CoreException e) {DebugUIPlugin.log(e.getStatus());} } - return (ILaunchConfiguration[]) filteredConfigs.toArray(new ILaunchConfiguration[filteredConfigs.size()]); + return filteredConfigs.toArray(new ILaunchConfiguration[filteredConfigs.size()]); } /** @@ -264,20 +264,20 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * @throws CoreException if an exception occurs * @since 3.3 */ - public static ILaunchDelegate[] filterLaunchDelegates(ILaunchConfigurationType type, Set modes) throws CoreException { + public static ILaunchDelegate[] filterLaunchDelegates(ILaunchConfigurationType type, Set<String> modes) throws CoreException { IWorkbenchActivitySupport as = PlatformUI.getWorkbench().getActivitySupport(); ILaunchDelegate[] delegates = type.getDelegates(modes); if(as == null) { return delegates; } - HashSet set = new HashSet(); + HashSet<ILaunchDelegate> set = new HashSet<ILaunchDelegate>(); for(int i = 0; i < delegates.length; i++) { //filter by capabilities if(!WorkbenchActivityHelper.filterItem(new LaunchDelegateContribution(delegates[i]))) { set.add(delegates[i]); } } - return (ILaunchDelegate[]) set.toArray(new ILaunchDelegate[set.size()]); + return set.toArray(new ILaunchDelegate[set.size()]); } /** @@ -287,9 +287,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); launchManager.removeLaunchListener(this); if (fLaunchHistories != null) { - Iterator histories = fLaunchHistories.values().iterator(); - while (histories.hasNext()) { - LaunchHistory history = (LaunchHistory)histories.next(); + for (LaunchHistory history : fLaunchHistories.values()) { history.dispose(); } } @@ -299,11 +297,13 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici /** * @see ILaunchListener#launchRemoved(ILaunch) */ + @Override public void launchRemoved(ILaunch launch) {} /** * @see ILaunchListener#launchChanged(ILaunch) */ + @Override public void launchChanged(ILaunch launch) {} /** @@ -311,6 +311,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * * @see ILaunchListener#launchAdded(ILaunch) */ + @Override public void launchAdded(final ILaunch launch) { removeTerminatedLaunches(launch); } @@ -391,10 +392,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * Notify all launch history listeners that the launch history has changed in some way. */ protected void fireLaunchHistoryChanged() { - Iterator iterator = fLaunchHistoryChangedListeners.iterator(); - ILaunchHistoryChangedListener listener = null; - while (iterator.hasNext()) { - listener = (ILaunchHistoryChangedListener) iterator.next(); + for (ILaunchHistoryChangedListener listener : fLaunchHistoryChangedListeners) { listener.launchHistoryChanged(); } } @@ -409,11 +407,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici Document doc = DebugUIPlugin.getDocument(); Element historyRootElement = doc.createElement(IConfigurationElementConstants.LAUNCH_HISTORY); doc.appendChild(historyRootElement); - - Iterator histories = fLaunchHistories.values().iterator(); - LaunchHistory history = null; - while (histories.hasNext()) { - history = (LaunchHistory)histories.next(); + for (LaunchHistory history : fLaunchHistories.values()) { Element groupElement = doc.createElement(IConfigurationElementConstants.LAUNCH_GROUP); groupElement.setAttribute(IConfigurationElementConstants.ID, history.getLaunchGroup().getIdentifier()); historyRootElement.appendChild(groupElement); @@ -468,8 +462,8 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici } } boolean shouldsave = false; - for(Iterator iter = fLaunchHistories.values().iterator(); iter.hasNext();) { - shouldsave |= ((LaunchHistory)iter.next()).needsSaving(); + for (LaunchHistory history : fLaunchHistories.values()) { + shouldsave |= history.needsSaving(); } if(shouldsave) { IPath historyPath = getHistoryFilePath(); @@ -525,8 +519,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici } // For each child of the root node, construct a launch config handle and add it to // the appropriate history, or set the most recent launch - Collection l = fLaunchHistories.values(); - LaunchHistory[] histories = (LaunchHistory[])l.toArray(new LaunchHistory[l.size()]); + LaunchHistory[] histories = fLaunchHistories.values().toArray(new LaunchHistory[fLaunchHistories.size()]); NodeList list = rootHistoryElement.getChildNodes(); int length = list.getLength(); Node node = null; @@ -591,7 +584,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * @return list of configurations under the element */ private ILaunchConfiguration[] getLaunchConfigurations(Element root) { - List configs = new ArrayList(); + List<ILaunchConfiguration> configs = new ArrayList<ILaunchConfiguration>(); NodeList nodes = root.getChildNodes(); int length = nodes.getLength(); for (int i = 0; i < length; i++) { @@ -615,7 +608,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici } } } - return (ILaunchConfiguration[]) configs.toArray(new ILaunchConfiguration[configs.size()]); + return configs.toArray(new ILaunchConfiguration[configs.size()]); } /** @@ -656,7 +649,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici IConfigurationElement[] infos = extensionPoint.getConfigurationElements(); // Load the configuration elements into a Map - fLaunchShortcuts = new ArrayList(infos.length); + fLaunchShortcuts = new ArrayList<LaunchShortcutExtension>(infos.length); for (int i = 0; i < infos.length; i++) { fLaunchShortcuts.add(new LaunchShortcutExtension(infos[i])); } @@ -674,7 +667,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici IConfigurationElement[] infos= extensionPoint.getConfigurationElements(); // Load the configuration elements into a Map - fLaunchGroups = new HashMap(infos.length); + fLaunchGroups = new HashMap<String, LaunchGroupExtension>(infos.length); LaunchGroupExtension ext = null; for (int i = 0; i < infos.length; i++) { ext = new LaunchGroupExtension(infos[i]); @@ -688,7 +681,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * * @return all launch shortcuts */ - public List getLaunchShortcuts() { + public List<LaunchShortcutExtension> getLaunchShortcuts() { if (fLaunchShortcuts == null) { loadLaunchShortcuts(); } @@ -701,18 +694,16 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * @return a listing of applicable launch shortcuts or an empty list, never <code>null</code> * @since 3.3 */ - public List getLaunchShortcuts(IResource resource) { - List list = new ArrayList(); - List sc = getLaunchShortcuts(); - List ctxt = new ArrayList(); + public List<LaunchShortcutExtension> getLaunchShortcuts(IResource resource) { + List<LaunchShortcutExtension> list = new ArrayList<LaunchShortcutExtension>(); + List<LaunchShortcutExtension> sc = getLaunchShortcuts(); + List<IResource> ctxt = new ArrayList<IResource>(); if(resource != null) { ctxt.add(resource); } IEvaluationContext context = DebugUIPlugin.createEvaluationContext(ctxt); context.addVariable("selection", ctxt); //$NON-NLS-1$ - LaunchShortcutExtension ext = null; - for(Iterator iter = sc.iterator(); iter.hasNext();) { - ext = (LaunchShortcutExtension) iter.next(); + for (LaunchShortcutExtension ext : sc) { try { if(ext.evalEnablementExpression(context, ext.getContextualLaunchEnablementExpression()) && !WorkbenchActivityHelper.filterItem(ext)) { if(!list.contains(ext)) { @@ -732,20 +723,18 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * @param resource the resource context * @return an array of applicable <code>ILaunchConfigurationType</code> ids, or an empty array, never <code>null</code> * @since 3.3 - * CONTEXTLAUNCHING */ public String[] getApplicableConfigurationTypes(IResource resource) { - List types = new ArrayList(); - List exts = getLaunchShortcuts(); - LaunchShortcutExtension ext = null; - List list = new ArrayList(); + List<String> types = new ArrayList<String>(); + List<LaunchShortcutExtension> exts = getLaunchShortcuts(); + List<IResource> list = new ArrayList<IResource>(); list.add(resource); IEvaluationContext context = DebugUIPlugin.createEvaluationContext(list); context.setAllowPluginActivation(true); context.addVariable("selection", list); //$NON-NLS-1$ - HashSet set = new HashSet(); - for(Iterator iter = exts.listIterator(); iter.hasNext();) { - ext = (LaunchShortcutExtension) iter.next(); + HashSet<String> set = new HashSet<String>(); + for (Iterator<LaunchShortcutExtension> iter = exts.listIterator(); iter.hasNext();) { + LaunchShortcutExtension ext = iter.next(); try { if(ext.evalEnablementExpression(context, ext.getContextualLaunchEnablementExpression())) { set.addAll(ext.getAssociatedConfigurationTypes()); @@ -759,15 +748,15 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici } LaunchManager lm = (LaunchManager) DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType type = null; - for(Iterator iter = set.iterator(); iter.hasNext();) { - type = lm.getLaunchConfigurationType((String)iter.next()); + for (String id : set) { + type = lm.getLaunchConfigurationType(id); if(type != null) { if(!types.contains(type) && type.isPublic() && !"org.eclipse.ui.externaltools.builder".equals(type.getCategory())) { //$NON-NLS-1$ types.add(type.getIdentifier()); } } } - return (String[]) types.toArray(new String[types.size()]); + return types.toArray(new String[types.size()]); } /** @@ -779,7 +768,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * @since 3.3 */ public ILaunchConfiguration[] getApplicableLaunchConfigurations(String[] types, IResource resource) { - ArrayList list = new ArrayList(); + ArrayList<ILaunchConfiguration> list = new ArrayList<ILaunchConfiguration>(); try { if(resource != null) { String[] ctypes = types; @@ -787,7 +776,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici ctypes = getApplicableConfigurationTypes(resource); } //copy into collection for hashcode matching - HashSet typeset = new HashSet(ctypes.length); + HashSet<String> typeset = new HashSet<String>(ctypes.length); for(int i = 0; i < ctypes.length; i++) { typeset.add(ctypes[i]); } @@ -817,7 +806,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici list.clear(); DebugPlugin.log(e); } - return (ILaunchConfiguration[]) list.toArray(new ILaunchConfiguration[list.size()]); + return list.toArray(new ILaunchConfiguration[list.size()]); } /** @@ -847,7 +836,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * * @return all launch shortcuts */ - public List getLaunchShortcuts(String category) { + public List<LaunchShortcutExtension> getLaunchShortcuts(String category) { return filterShortcuts(getLaunchShortcuts(), category); } @@ -858,12 +847,9 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * @param category the category to filter by * @return List */ - protected List filterShortcuts(List unfiltered, String category) { - List filtered = new ArrayList(unfiltered.size()); - Iterator iter = unfiltered.iterator(); - LaunchShortcutExtension extension = null; - while (iter.hasNext()){ - extension = (LaunchShortcutExtension)iter.next(); + protected List<LaunchShortcutExtension> filterShortcuts(List<LaunchShortcutExtension> unfiltered, String category) { + List<LaunchShortcutExtension> filtered = new ArrayList<LaunchShortcutExtension>(unfiltered.size()); + for (LaunchShortcutExtension extension : unfiltered) { if (category == null) { if (extension.getCategory() == null) { filtered.add(extension); @@ -886,29 +872,24 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * @deprecated the use of perspectives for launch shortcuts has been * deprecated since 3.1, use a contextualLaunch element instead */ - public List getLaunchShortcuts(String perpsective, String category) { + @Deprecated + public List<LaunchShortcutExtension> getLaunchShortcuts(String perpsective, String category) { if (fLaunchShortcutsByPerspective == null) { - Iterator shortcuts = getLaunchShortcuts().iterator(); - fLaunchShortcutsByPerspective = new HashMap(10); - LaunchShortcutExtension ext = null; - Iterator perspectives = null; - while (shortcuts.hasNext()) { - ext = (LaunchShortcutExtension)shortcuts.next(); - perspectives = ext.getPerspectives().iterator(); - while (perspectives.hasNext()) { - String id = (String)perspectives.next(); - List list = (List)fLaunchShortcutsByPerspective.get(id); - if (list == null) { - list = new ArrayList(4); - fLaunchShortcutsByPerspective.put(id, list); - } - list.add(ext); + fLaunchShortcutsByPerspective = new HashMap<String, List<LaunchShortcutExtension>>(10); + } + for (LaunchShortcutExtension ext : getLaunchShortcuts()) { + for (String id : ext.getPerspectives()) { + List<LaunchShortcutExtension> list = fLaunchShortcutsByPerspective.get(id); + if (list == null) { + list = new ArrayList<LaunchShortcutExtension>(4); + fLaunchShortcutsByPerspective.put(id, list); } + list.add(ext); } } - List list = (List)fLaunchShortcutsByPerspective.get(perpsective); + List<LaunchShortcutExtension> list = fLaunchShortcutsByPerspective.get(perpsective); if (list == null) { - return new ArrayList(); + return Collections.EMPTY_LIST; } return filterShortcuts(list, category); } @@ -922,9 +903,9 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * @return the associated launch configuration from the MRU listing or <code>null</code> if there isn't one * @since 3.3 */ - public ILaunchConfiguration getMRUConfiguration(List configurations, ILaunchGroup group, IResource resource) { + public ILaunchConfiguration getMRUConfiguration(List<ILaunchConfiguration> configurations, ILaunchGroup group, IResource resource) { if(group != null) { - ArrayList candidates = new ArrayList(); + ArrayList<ILaunchConfiguration> candidates = new ArrayList<ILaunchConfiguration>(); LaunchHistory history = getLaunchHistory(group.getIdentifier()); if(history != null) { ILaunchConfiguration[] configs = history.getCompleteLaunchHistory(); @@ -938,12 +919,10 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici } } } - ILaunchConfiguration config = null; if(resource != null) { //first try to find a config that exactly matches the resource mapping, and collect partial matches IResource[] res = null; - for(Iterator iter = candidates.iterator(); iter.hasNext();) { - config = (ILaunchConfiguration) iter.next(); + for (ILaunchConfiguration config : candidates) { try { res = config.getMappedResources(); if(res != null) { @@ -1038,7 +1017,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici if (fLaunchGroups == null) { loadLaunchGroups(); } - return (LaunchGroupExtension)fLaunchGroups.get(id); + return fLaunchGroups.get(id); } /** @@ -1050,8 +1029,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici if (fLaunchGroups == null) { loadLaunchGroups(); } - Collection groups = fLaunchGroups.values(); - return (ILaunchGroup[])groups.toArray(new ILaunchGroup[groups.size()]); + return fLaunchGroups.values().toArray(new ILaunchGroup[fLaunchGroups.size()]); } /** @@ -1061,7 +1039,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici */ public LaunchHistory getLaunchHistory(String id) { loadLaunchHistories(); - return (LaunchHistory)fLaunchHistories.get(id); + return fLaunchHistories.get(id); } /** @@ -1080,7 +1058,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici if (fLaunchHistories == null) { fRestoring = true; ILaunchGroup[] groups = getLaunchGroups(); - fLaunchHistories = new HashMap(groups.length); + fLaunchHistories = new HashMap<String, LaunchHistory>(groups.length); ILaunchGroup extension = null; for (int i = 0; i < groups.length; i++) { extension = groups[i]; @@ -1146,16 +1124,12 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * * @since 3.4.0 */ - public ILaunchGroup getLaunchGroup(ILaunchConfigurationType type, Set modeset) { + public ILaunchGroup getLaunchGroup(ILaunchConfigurationType type, Set<String> modeset) { StringBuffer buff = new StringBuffer(); - Object item = null; - for(Iterator iter = modeset.iterator(); iter.hasNext();) { - item = iter.next(); - if(item instanceof String) { - buff.append(item); - if(iter.hasNext()) { - buff.append(","); //$NON-NLS-1$ - } + for (Iterator<String> iter = modeset.iterator(); iter.hasNext();) { + buff.append(iter.next()); + if (iter.hasNext()) { + buff.append(","); //$NON-NLS-1$ } } return getLaunchGroup(type, buff.toString()); @@ -1200,21 +1174,25 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici /** * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(org.eclipse.core.resources.ISaveContext) */ + @Override public void doneSaving(ISaveContext context) {} /** * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(org.eclipse.core.resources.ISaveContext) */ + @Override public void prepareToSave(ISaveContext context) throws CoreException {} /** * @see org.eclipse.core.resources.ISaveParticipant#rollback(org.eclipse.core.resources.ISaveContext) */ + @Override public void rollback(ISaveContext context) {} /** * @see org.eclipse.core.resources.ISaveParticipant#saving(org.eclipse.core.resources.ISaveContext) */ + @Override public void saving(ISaveContext context) throws CoreException { try { persistLaunchHistory(); @@ -1238,8 +1216,9 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici for (int i = 0; i < size; i++) { String id = groups[i].getIdentifier(); LaunchHistory history = getLaunchHistory(id); - if (history != null) + if (history != null) { history.launchAdded(launch); + } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java index 3ca3eb706..8116486ec 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.Hashtable; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -64,7 +63,7 @@ public class LaunchConfigurationPresentationManager { * to <code>LaunchConfigurationTabGroupExtension</code>. "*" is * used to represent the default tab group (i.e. unspecified mode). */ - private Hashtable fTabGroupExtensions; + private Hashtable<String, Map<Set<String>, LaunchConfigurationTabGroupExtension>> fTabGroupExtensions; /** * contributed tabs are stored by the tab group id that they contribute to. @@ -74,8 +73,14 @@ public class LaunchConfigurationPresentationManager { * * @since 3.3 */ - private Hashtable fContributedTabs; + private Hashtable<String, Hashtable<String, LaunchConfigurationTabExtension>> fContributedTabs; + private static Set<String> ALL_MODES = new HashSet<String>(1); + + static { + ALL_MODES.add("*"); //$NON-NLS-1$ + } + /** * Constructs the singleton launch configuration presentation * manager. @@ -100,30 +105,27 @@ public class LaunchConfigurationPresentationManager { */ private void initializeTabGroupExtensions() { if(fTabGroupExtensions == null) { - fTabGroupExtensions = new Hashtable(); + fTabGroupExtensions = new Hashtable<String, Map<Set<String>, LaunchConfigurationTabGroupExtension>>(); IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_LAUNCH_CONFIGURATION_TAB_GROUPS); IConfigurationElement[] groups = extensionPoint.getConfigurationElements(); LaunchConfigurationTabGroupExtension group = null; String typeId = null; - Map map = null; - List modes = null; + Map<Set<String>, LaunchConfigurationTabGroupExtension> map = null; + List<Set<String>> modes = null; for (int i = 0; i < groups.length; i++) { group = new LaunchConfigurationTabGroupExtension(groups[i]); typeId = group.getTypeIdentifier(); - map = (Map)fTabGroupExtensions.get(typeId); + map = fTabGroupExtensions.get(typeId); if (map == null) { - map = new Hashtable(); + map = new Hashtable<Set<String>, LaunchConfigurationTabGroupExtension>(); fTabGroupExtensions.put(typeId, map); } modes = group.getModes(); if(modes.isEmpty()) { - String mode = "*"; //$NON-NLS-1$ - reportReplacement((LaunchConfigurationTabGroupExtension) map.put(mode, group), group, mode); + reportReplacement(map.put(ALL_MODES, group), group, ALL_MODES); } - Set ms = null; - for(Iterator iter = modes.iterator(); iter.hasNext();) { - ms = (Set) iter.next(); - reportReplacement((LaunchConfigurationTabGroupExtension) map.put(ms, group), group, ms); + for (Set<String> ms : modes) { + reportReplacement(map.put(ms, group), group, ms); } } } @@ -154,16 +156,16 @@ public class LaunchConfigurationPresentationManager { * @since 3.3 */ private void initializeContributedTabExtensions() { - fContributedTabs = new Hashtable(); + fContributedTabs = new Hashtable<String, Hashtable<String, LaunchConfigurationTabExtension>>(); IExtensionPoint epoint = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_LAUNCH_TABS); IConfigurationElement[] elements = epoint.getConfigurationElements(); LaunchConfigurationTabExtension tab = null; - Hashtable element = null; + Hashtable<String, LaunchConfigurationTabExtension> element = null; for(int i = 0; i < elements.length; i++) { tab = new LaunchConfigurationTabExtension(elements[i]); - element = (Hashtable) fContributedTabs.get(tab.getTabGroupId()); + element = fContributedTabs.get(tab.getTabGroupId()); if(element == null) { - element = new Hashtable(); + element = new Hashtable<String, LaunchConfigurationTabExtension>(); element.put(tab.getIdentifier(), tab); fContributedTabs.put(tab.getTabGroupId(), element); } @@ -180,7 +182,7 @@ public class LaunchConfigurationPresentationManager { * @exception CoreException if an exception occurs creating the group */ public ILaunchConfigurationTabGroup getTabGroup(ILaunchConfigurationType type, String mode) throws CoreException { - HashSet modes = new HashSet(); + HashSet<String> modes = new HashSet<String>(); modes.add(mode); LaunchConfigurationTabGroupExtension ext = getExtension(type.getIdentifier(), modes); if (ext == null) { @@ -199,7 +201,7 @@ public class LaunchConfigurationPresentationManager { * @throws CoreException */ public ILaunchConfigurationTabGroup getTabGroup(ILaunchConfiguration config, String mode) throws CoreException { - HashSet modes = new HashSet(); + HashSet<String> modes = new HashSet<String>(); modes.add(mode); LaunchConfigurationTabGroupExtension ext = getExtension(config.getType().getIdentifier(), modes); if (ext == null) { @@ -220,9 +222,9 @@ public class LaunchConfigurationPresentationManager { */ protected LaunchConfigurationTabExtension[] getTabExtensions(String groupid, ILaunchConfiguration config, String mode) throws CoreException { initializeContributedTabExtensions(); - Hashtable tabs = (Hashtable) fContributedTabs.get(groupid); + Hashtable<String, LaunchConfigurationTabExtension> tabs = fContributedTabs.get(groupid); if(tabs != null) { - return filterLaunchTabExtensions((LaunchConfigurationTabExtension[]) tabs.values().toArray(new LaunchConfigurationTabExtension[tabs.size()]), config, mode); + return filterLaunchTabExtensions(tabs.values().toArray(new LaunchConfigurationTabExtension[tabs.size()]), config, mode); } return new LaunchConfigurationTabExtension[0]; } @@ -248,18 +250,18 @@ public class LaunchConfigurationPresentationManager { if(as == null || config == null) { return tabs; } - HashSet set = new HashSet(); + HashSet<LaunchConfigurationTabExtension> set = new HashSet<LaunchConfigurationTabExtension>(); for(int i = 0; i < tabs.length; i ++) { //filter capabilities if(!WorkbenchActivityHelper.filterItem(new LaunchTabContribution(tabs[i]))) { //filter to preferred delegate (if there is one) - HashSet modes = (HashSet) config.getModes(); + Set<String> modes = config.getModes(); modes.add(mode); ILaunchDelegate delegate = config.getPreferredDelegate(modes); if(delegate == null) { delegate = config.getType().getPreferredDelegate(modes); } - Set delegateSet = tabs[i].getDelegateSet(); + Set<String> delegateSet = tabs[i].getDelegateSet(); if(delegate != null) { if(delegateSet.isEmpty() || delegateSet.contains(delegate.getId())) { set.add(tabs[i]); @@ -277,7 +279,7 @@ public class LaunchConfigurationPresentationManager { } } } - return (LaunchConfigurationTabExtension[]) set.toArray(new LaunchConfigurationTabExtension[set.size()]); + return set.toArray(new LaunchConfigurationTabExtension[set.size()]); } /** @@ -288,16 +290,16 @@ public class LaunchConfigurationPresentationManager { * @param mode launch mode identifier * @return launch tab group extension or <code>null</code> */ - protected LaunchConfigurationTabGroupExtension getExtension(String type, Set modes) { + protected LaunchConfigurationTabGroupExtension getExtension(String type, Set<String> modes) { initializeTabGroupExtensions(); - Map map = (Map)fTabGroupExtensions.get(type); + Map<Set<String>, LaunchConfigurationTabGroupExtension> map = fTabGroupExtensions.get(type); if (map != null) { - Object extension = map.get(modes); + LaunchConfigurationTabGroupExtension extension = map.get(modes); if (extension == null) { // get the default tabs - extension = map.get("*"); //$NON-NLS-1$ + extension = map.get(ALL_MODES); } - return (LaunchConfigurationTabGroupExtension)extension; + return extension; } return null; } @@ -314,7 +316,7 @@ public class LaunchConfigurationPresentationManager { * @since 2.1 */ public String getHelpContext(ILaunchConfigurationType type, String mode) throws CoreException { - HashSet modes = new HashSet(); + HashSet<String> modes = new HashSet<String>(); modes.add(mode); LaunchConfigurationTabGroupExtension ext = getExtension(type.getIdentifier(), modes); if (ext == null) { @@ -333,7 +335,7 @@ public class LaunchConfigurationPresentationManager { * @return the description of the given configuration type, possible <code>null</code> */ public String getDescription(ILaunchConfigurationType configType, String mode) { - HashSet modes = new HashSet(); + HashSet<String> modes = new HashSet<String>(); modes.add(mode); LaunchConfigurationTabGroupExtension extension = getExtension(configType.getAttribute(IConfigurationElementConstants.ID), modes); return (extension != null ? extension.getDescription(modes) : null); @@ -345,12 +347,10 @@ public class LaunchConfigurationPresentationManager { * @param modes set of launch mode identifiers * @return sorted list of launch mode names */ - public List getLaunchModeNames(Set modes) { - List names = new ArrayList(); - Iterator iterator = modes.iterator(); + public List<String> getLaunchModeNames(Set<String> modes) { + List<String> names = new ArrayList<String>(); ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager(); - while (iterator.hasNext()) { - String id = (String) iterator.next(); + for (String id : modes) { ILaunchMode mode = manager.getLaunchMode(id); if (mode == null) { names.add(id); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java index 437ce2b30..8fcf468ff 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -66,7 +66,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia * when configuration names are generated * @param group launch group */ - public LaunchConfigurationPropertiesDialog(Shell shell, ILaunchConfiguration launchConfiguration, LaunchGroupExtension group, Set reservednames) { + public LaunchConfigurationPropertiesDialog(Shell shell, ILaunchConfiguration launchConfiguration, LaunchGroupExtension group, Set<String> reservednames) { super(shell, group); fLaunchConfiguration = launchConfiguration; DebugPlugin.getDefault().getLaunchManager().addLaunchConfigurationListener(this); @@ -85,6 +85,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#initializeBounds() */ + @Override protected void initializeBounds() { super.initializeBounds(); resize(); @@ -93,6 +94,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#initializeContent() */ + @Override protected void initializeContent() { ILaunchConfiguration launchConfiguration = getLaunchConfiguration(); if (shouldSetDefaultsOnOpen() && launchConfiguration instanceof ILaunchConfigurationWorkingCopy) { @@ -109,6 +111,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#close() */ + @Override public boolean close() { if (!isSafeToClose()) { return false; @@ -120,6 +123,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#addContent(org.eclipse.swt.widgets.Composite) */ + @Override protected void addContent(Composite dialogComp) { GridData gd; Composite topComp = new Composite(dialogComp, SWT.NONE); @@ -158,6 +162,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { // create OK and Cancel buttons by default createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); @@ -167,6 +172,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#getShellTitle() */ + @Override protected String getShellTitle() { return LaunchConfigurationsMessages.LaunchConfigurationPropertiesDialog_Properties_for__0__2; } @@ -174,6 +180,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.LAUNCH_CONFIGURATION_PROPERTIES_DIALOG; } @@ -181,6 +188,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#updateButtons() */ + @Override public void updateButtons() { getTabViewer().refresh(); getButton(IDialogConstants.OK_ID).setEnabled(getTabViewer().canSave()); @@ -190,6 +198,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { getTabViewer().handleApplyPressed(); super.okPressed(); @@ -198,6 +207,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#open() */ + @Override public int open() { setOpenMode(-1); return super.open(); @@ -206,6 +216,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog#getDialogSettingsSectionName() */ + @Override protected String getDialogSettingsSectionName() { return IDebugUIConstants.PLUGIN_ID + ".LAUNCH_CONFIGURATION_PROPERTIES_DIALOG_SECTION"; //$NON-NLS-1$ } @@ -213,6 +224,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationAdded(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void launchConfigurationAdded(ILaunchConfiguration configuration) { ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager(); if (getLaunchConfiguration().equals(manager.getMovedFrom(configuration))) { @@ -225,10 +237,12 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void launchConfigurationChanged(ILaunchConfiguration configuration) {} /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationRemoved(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void launchConfigurationRemoved(ILaunchConfiguration configuration) {} } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationSelectionDialog.java index 6bc35fa84..949638627 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationSelectionDialog.java @@ -40,6 +40,7 @@ public class LaunchConfigurationSelectionDialog extends AbstractDebugListSelecti /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getDialogSettingsId() */ + @Override protected String getDialogSettingsId() { return DIALOG_SETTINGS; } @@ -47,6 +48,7 @@ public class LaunchConfigurationSelectionDialog extends AbstractDebugListSelecti /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SELECT_LAUNCH_CONFIGURATION_DIALOG; } @@ -54,6 +56,7 @@ public class LaunchConfigurationSelectionDialog extends AbstractDebugListSelecti /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerInput() */ + @Override protected Object getViewerInput() { return fInput; } @@ -61,6 +64,7 @@ public class LaunchConfigurationSelectionDialog extends AbstractDebugListSelecti /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerLabel() */ + @Override protected String getViewerLabel() { return LaunchConfigurationsMessages.LaunchConfigurationSelectionDialog_1; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java index 67cee23ba..dae26a1ee 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -40,18 +40,18 @@ public class LaunchConfigurationTabGroupExtension { * A list of sets of modes that this tab group supports * @since 3.3 */ - private List fModes = null; + private List<Set<String>> fModes = null; /** * A map of mode sets to descriptions * @since 3.3 */ - private Map fDescriptions = null; + private Map<Set<String>, String> fDescriptions = null; /** * Perspectives for each mode */ - private Map fPerspectives = null; + private Map<Set<String>, String> fPerspectives = null; /** * Constructs a launch configuration tab extension based @@ -93,19 +93,19 @@ public class LaunchConfigurationTabGroupExtension { * @return the set of modes specified in the configuration data, or * <code>null</code> */ - protected List getModes() { + protected List<Set<String>> getModes() { if (fModes == null) { - fModes = new ArrayList(); - fPerspectives = new Hashtable(); + fModes = new ArrayList<Set<String>>(); + fPerspectives = new Hashtable<Set<String>, String>(); IConfigurationElement[] modes = fConfig.getChildren(IConfigurationElementConstants.LAUNCH_MODE); if (modes.length > 0) { IConfigurationElement element = null; String perspective = null, mode = null; - Set mset = null; + Set<String> mset = null; for (int i = 0; i < modes.length; i++) { element = modes[i]; mode = element.getAttribute(IConfigurationElementConstants.MODE); - mset = new HashSet(); + mset = new HashSet<String>(); mset.add(mode); fModes.add(mset); perspective = element.getAttribute(IConfigurationElementConstants.PERSPECTIVE); @@ -125,9 +125,9 @@ public class LaunchConfigurationTabGroupExtension { * @param modes the set of launch modes * @return perspective identifier, or <code>null</code> */ - protected String getPerspective(Set modes) { + protected String getPerspective(Set<String> modes) { getModes(); - return (String)fPerspectives.get(modes); + return fPerspectives.get(modes); } /** @@ -181,19 +181,19 @@ public class LaunchConfigurationTabGroupExtension { * @return a description of the Launch Mode if available. If not available, attempts to return * a description of the Launch Configuration. If no appropriate description is found an empty string is returned. */ - public String getDescription(Set modes) { + public String getDescription(Set<String> modes) { String description = null; if(fDescriptions == null) { - fDescriptions = new HashMap(); + fDescriptions = new HashMap<Set<String>, String>(); IConfigurationElement[] children = fConfig.getChildren(IConfigurationElementConstants.LAUNCH_MODE); IConfigurationElement child = null; String mode = null; - HashSet set = null; + HashSet<String> set = null; for (int i = 0; i < children.length; i++) { child = children[i]; mode = child.getAttribute(IConfigurationElementConstants.MODE); if(mode != null) { - set = new HashSet(); + set = new HashSet<String>(); set.add(mode); } description = child.getAttribute(IConfigurationElementConstants.DESCRIPTION); @@ -203,7 +203,7 @@ public class LaunchConfigurationTabGroupExtension { } } - description = (String) fDescriptions.get(modes); + description = fDescriptions.get(modes); if(description == null) { description = fConfig.getAttribute(IConfigurationElementConstants.DESCRIPTION); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java index 7f4b2bb53..25f153593 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -240,7 +240,8 @@ public class LaunchConfigurationTabGroupViewer { fNameWidget = new Text(fGroupComposite, SWT.SINGLE | SWT.BORDER); fNameWidget.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); fNameWidget.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { + @Override + public void modifyText(ModifyEvent e) { if(!fInitializingTabs) { handleNameModified(); } @@ -264,6 +265,7 @@ public class LaunchConfigurationTabGroupViewer { gd.grabExcessHorizontalSpace = true; fOptionsLink.setLayoutData(gd); fOptionsLink.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { //collect the options available try { @@ -274,7 +276,8 @@ public class LaunchConfigurationTabGroupViewer { //set the options to the config Object[] res = sld.getResult(); if(res != null) { - Set modes = (Set) res[0]; + @SuppressWarnings("unchecked") + Set<String> modes = (Set<String>) res[0]; modes.remove(getLaunchConfigurationDialog().getMode()); ILaunchConfigurationWorkingCopy wc = getWorkingCopy(); wc.setModes(modes); @@ -300,6 +303,7 @@ public class LaunchConfigurationTabGroupViewer { Composite buttonComp = SWTFactory.createComposite(blComp, 2, 1, GridData.HORIZONTAL_ALIGN_END); fApplyButton = SWTFactory.createPushButton(buttonComp, LaunchConfigurationsMessages.LaunchConfigurationDialog__Apply_17, null,GridData.HORIZONTAL_ALIGN_END); fApplyButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleApplyPressed(); } @@ -307,6 +311,7 @@ public class LaunchConfigurationTabGroupViewer { fRevertButton = SWTFactory.createPushButton(buttonComp, LaunchConfigurationsMessages.LaunchConfigurationDialog_Revert_2, null, GridData.HORIZONTAL_ALIGN_END); fRevertButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleRevertPressed(); } @@ -338,6 +343,7 @@ public class LaunchConfigurationTabGroupViewer { gd.widthHint = width; link.setLayoutData(gd); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { SWTFactory.showPreferencePage("org.eclipse.debug.ui.PerspectivePreferencePage"); //$NON-NLS-1$ } @@ -363,6 +369,7 @@ public class LaunchConfigurationTabGroupViewer { fTabFolder.setLayoutData(gd); fTabFolder.setFont(parent.getFont()); fTabFolder.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { if (!fInitializingTabs) { handleTabSelected(); @@ -493,7 +500,7 @@ public class LaunchConfigurationTabGroupViewer { text = LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_15; } else { - text = MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_16, new String[] {name}); + text = MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_16, new Object[] { name }); } } else { @@ -523,7 +530,7 @@ public class LaunchConfigurationTabGroupViewer { ILaunchConfigurationWorkingCopy config = getWorkingCopy(); if(config != null) { try { - Set modes = getCurrentModeSet(); + Set<String> modes = getCurrentModeSet(); preferred = config.getPreferredDelegate(modes); if(preferred == null) { preferred = config.getType().getPreferredDelegate(modes); @@ -539,8 +546,8 @@ public class LaunchConfigurationTabGroupViewer { * @return the listing of modes for the current config * @since 3.3 */ - private Set getCurrentModeSet() { - Set set = new HashSet(); + private Set<String> getCurrentModeSet() { + Set<String> set = new HashSet<String>(); ILaunchConfigurationWorkingCopy config = getWorkingCopy(); if(config != null) { try { @@ -582,6 +589,7 @@ public class LaunchConfigurationTabGroupViewer { } else { DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() { + @Override public void run() { setInput0(input); } @@ -615,6 +623,7 @@ public class LaunchConfigurationTabGroupViewer { protected void inputChanged(Object input) { final Object finput = input; Runnable r = new Runnable() { + @Override public void run() { try { fViewform.setRedraw(false); @@ -675,7 +684,7 @@ public class LaunchConfigurationTabGroupViewer { return false; } if (config1.getType().equals(config2.getType())) { - Set modes = getCurrentModeSet(); + Set<String> modes = getCurrentModeSet(); ILaunchDelegate d1 = config1.getPreferredDelegate(modes); if(d1 == null) { d1 = config1.getType().getPreferredDelegate(modes); @@ -744,7 +753,7 @@ public class LaunchConfigurationTabGroupViewer { // Retrieve the current tab group. If there is none, clean up and leave ILaunchConfigurationTabGroup tabGroup = getTabGroup(); if (tabGroup == null) { - IStatus status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_No_tabs_defined_for_launch_configuration_type__0__1, new String[]{type.getName()}), null); + IStatus status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_No_tabs_defined_for_launch_configuration_type__0__1, new Object[] { type.getName() }), null); CoreException e = new CoreException(status); errorDialog(e); fInitializingTabs = false; @@ -774,7 +783,7 @@ public class LaunchConfigurationTabGroupViewer { */ private void showInstanceTabsFor(ILaunchConfigurationType configType) { // try to keep on same tab - Class tabKind = null; + Class<? extends ILaunchConfigurationTab> tabKind = null; if (getActiveTab() != null) { tabKind = getActiveTab().getClass(); } @@ -858,6 +867,7 @@ public class LaunchConfigurationTabGroupViewer { // results from the Runnable final Object[] finalArray = new Object[2]; Runnable runnable = new Runnable() { + @Override public void run() { ILaunchConfigurationTabGroup tabGroup = null; try { @@ -982,12 +992,14 @@ public class LaunchConfigurationTabGroupViewer { */ protected Job createUpdateJob() { return new WorkbenchJob(getControl().getDisplay(), "Update LCD") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (!getControl().isDisposed()) { refreshStatus(); } return Status.OK_STATUS; } + @Override public boolean shouldRun() { return !getControl().isDisposed(); } @@ -1149,7 +1161,7 @@ public class LaunchConfigurationTabGroupViewer { ILaunchConfiguration config = getWorkingCopy(); if(config != null) { try { - Set modes = getCurrentModeSet(); + Set<String> modes = getCurrentModeSet(); ILaunchDelegate[] delegates = LaunchConfigurationManager.filterLaunchDelegates(config.getType(), modes); return delegates.length > 1; } @@ -1207,9 +1219,9 @@ public class LaunchConfigurationTabGroupViewer { } } if(!canLaunchWithModes()) { - Set modes = getCurrentModeSet(); - List names = LaunchConfigurationPresentationManager.getDefault().getLaunchModeNames(modes); - return MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_14, new String[]{names.toString()}); + Set<String> modes = getCurrentModeSet(); + List<String> names = LaunchConfigurationPresentationManager.getDefault().getLaunchModeNames(modes); + return MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_14, new Object[] { names.toString() }); } return null; } @@ -1293,7 +1305,7 @@ public class LaunchConfigurationTabGroupViewer { } // Otherwise, if there's already a config with the same name, complain if (fOriginal != null && !fOriginal.getName().equals(currentName)) { - Set reservednames = ((LaunchConfigurationsDialog)getLaunchConfigurationDialog()).getReservedNameSet(); + Set<String> reservednames = ((LaunchConfigurationsDialog) getLaunchConfigurationDialog()).getReservedNameSet(); if (mgr.isExistingLaunchConfigurationName(currentName) || (reservednames != null ? reservednames.contains(currentName) : false)) { ILaunchConfiguration config = ((LaunchManager)mgr).findLaunchConfiguration(currentName); //config cannot be null at this location since the manager knows the name conflicts @@ -1390,6 +1402,7 @@ public class LaunchConfigurationTabGroupViewer { if (isDirty()) { if(!fWorkingCopy.isLocal()) { IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { saved[0] = ((LaunchConfigurationWorkingCopy)fWorkingCopy).doSave(monitor); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java index 4afaa2150..1d65b3e4f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -41,16 +41,16 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT * * @since 3.5 */ - class TabCollector implements Iterator { + class TabCollector implements Iterator<ILaunchConfigurationTab> { - private HashSet idSet = null; - private ArrayList tabList = null; - private ArrayList extList = null; + private HashSet<String> idSet = null; + private ArrayList<ILaunchConfigurationTab> tabList = null; + private ArrayList<LaunchConfigurationTabExtension> extList = null; - public TabCollector(List tabs, List exts) { - tabList = new ArrayList(tabs); - extList = new ArrayList(exts); - idSet = new HashSet(tabList.size() + extList.size()); + public TabCollector(List<ILaunchConfigurationTab> tabs, List<LaunchConfigurationTabExtension> exts) { + tabList = new ArrayList<ILaunchConfigurationTab>(tabs); + extList = new ArrayList<LaunchConfigurationTabExtension>(exts); + idSet = new HashSet<String>(tabList.size() + extList.size()); } /** @@ -59,8 +59,8 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT * @return the next tab extension tab */ private ILaunchConfigurationTab nextExtensionTab() { - for (Iterator iterator = extList.iterator(); iterator.hasNext();) { - LaunchConfigurationTabExtension launchConfigurationTabExtension = (LaunchConfigurationTabExtension)iterator.next(); + for (Iterator<LaunchConfigurationTabExtension> iterator = extList.iterator(); iterator.hasNext();) { + LaunchConfigurationTabExtension launchConfigurationTabExtension = iterator.next(); String relativeTab = launchConfigurationTabExtension.getRelativeTabId(); if (relativeTab == null || idSet.contains(relativeTab)) { iterator.remove(); @@ -73,6 +73,7 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT /* (non-Javadoc) * @see java.util.Iterator#hasNext() */ + @Override public boolean hasNext() { return extList.size() > 0 || tabList.size() > 0; } @@ -80,14 +81,15 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT /* (non-Javadoc) * @see java.util.Iterator#next() */ - public Object next() { + @Override + public ILaunchConfigurationTab next() { ILaunchConfigurationTab nextTab = nextExtensionTab(); if (nextTab == null) { if (tabList.size() > 0) { - nextTab = (ILaunchConfigurationTab)tabList.remove(0); + nextTab = tabList.remove(0); } else { - LaunchConfigurationTabExtension launchConfigurationTabExtension = (LaunchConfigurationTabExtension)extList.remove(0); + LaunchConfigurationTabExtension launchConfigurationTabExtension = extList.remove(0); nextTab = launchConfigurationTabExtension.getTab(); } } @@ -103,6 +105,7 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT /* (non-Javadoc) * @see java.util.Iterator#remove() */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -113,7 +116,7 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT /** * listing of tab extensions that we have to create */ - private List fTabs = null; + private List<ILaunchConfigurationTab> fTabs = null; private String fMode = null; private ILaunchConfiguration fConfig = null; @@ -132,6 +135,7 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String) */ + @Override public void createTabs(ILaunchConfigurationDialog dialog, String mode) { if(fGroup != null) { fGroup.createTabs(dialog, mode); @@ -142,13 +146,14 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#dispose() */ + @Override public void dispose() { fGroup.dispose(); if(fTabs != null) { - List tabs = Arrays.asList(fGroup.getTabs()); + List<ILaunchConfigurationTab> tabs = Arrays.asList(fGroup.getTabs()); ILaunchConfigurationTab tab = null; for(int i = 0; i < fTabs.size(); i++) { - tab = (ILaunchConfigurationTab)fTabs.get(i); + tab = fTabs.get(i); if(!tabs.contains(tab)) { tab.dispose(); } @@ -160,16 +165,17 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#getTabs() */ + @Override public ILaunchConfigurationTab[] getTabs() { if(fTabs == null) { try { - fTabs = new ArrayList(); + fTabs = new ArrayList<ILaunchConfigurationTab>(); LaunchConfigurationTabExtension[] ext = LaunchConfigurationPresentationManager.getDefault().getTabExtensions(fGroupId, fConfig, fMode); //if there are no extensions bypass and do a raw copy into if(ext.length > 0) { TabCollector collector = new TabCollector(Arrays.asList(fGroup.getTabs()), Arrays.asList(ext)); while(collector.hasNext()) { - Object next = collector.next(); + ILaunchConfigurationTab next = collector.next(); if (next != null) { fTabs.add(next); } @@ -184,19 +190,20 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT } catch (CoreException ce) {DebugUIPlugin.log(ce);} } - return (ILaunchConfigurationTab[]) fTabs.toArray(new ILaunchConfigurationTab[fTabs.size()]); + return fTabs.toArray(new ILaunchConfigurationTab[fTabs.size()]); } /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { fGroup.initializeFrom(configuration); if(fTabs != null) { - List tabs = Arrays.asList(fGroup.getTabs()); + List<ILaunchConfigurationTab> tabs = Arrays.asList(fGroup.getTabs()); ILaunchConfigurationTab tab = null; for(int i = 0; i < fTabs.size(); i++) { - tab = (ILaunchConfigurationTab)fTabs.get(i); + tab = fTabs.get(i); if(!tabs.contains(tab)) { tab.initializeFrom(configuration); } @@ -207,6 +214,8 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#launched(org.eclipse.debug.core.ILaunch) */ + @SuppressWarnings("deprecation") + @Override public void launched(ILaunch launch) { if(fGroup != null) { fGroup.launched(launch); @@ -216,13 +225,14 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { fGroup.performApply(configuration); if(fTabs != null) { - List tabs = Arrays.asList(fGroup.getTabs()); + List<ILaunchConfigurationTab> tabs = Arrays.asList(fGroup.getTabs()); ILaunchConfigurationTab tab = null; for(int i = 0; i < fTabs.size(); i++) { - tab = (ILaunchConfigurationTab)fTabs.get(i); + tab = fTabs.get(i); if(!tabs.contains(tab)) { tab.performApply(configuration); } @@ -233,13 +243,14 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { fGroup.setDefaults(configuration); if(fTabs != null) { - List tabs = Arrays.asList(fGroup.getTabs()); + List<ILaunchConfigurationTab> tabs = Arrays.asList(fGroup.getTabs()); ILaunchConfigurationTab tab = null; for(int i = 0; i < fTabs.size(); i++) { - tab = (ILaunchConfigurationTab)fTabs.get(i); + tab = fTabs.get(i); if(!tabs.contains(tab)) { tab.setDefaults(configuration); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabImageDescriptor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabImageDescriptor.java index 1cb7e1674..77baf43bb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabImageDescriptor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabImageDescriptor.java @@ -46,6 +46,7 @@ public class LaunchConfigurationTabImageDescriptor extends CompositeImageDescrip /** * @see CompositeImageDescriptor#getSize() */ + @Override protected Point getSize() { if (fSize == null) { ImageData data= getBaseImage().getImageData(); @@ -57,6 +58,7 @@ public class LaunchConfigurationTabImageDescriptor extends CompositeImageDescrip /** * @see Object#equals(java.lang.Object) */ + @Override public boolean equals(Object object) { if (!(object instanceof LaunchConfigurationTabImageDescriptor)){ return false; @@ -69,6 +71,7 @@ public class LaunchConfigurationTabImageDescriptor extends CompositeImageDescrip /** * @see Object#hashCode() */ + @Override public int hashCode() { return getBaseImage().hashCode() | getFlags(); } @@ -76,6 +79,7 @@ public class LaunchConfigurationTabImageDescriptor extends CompositeImageDescrip /** * @see CompositeImageDescriptor#drawCompositeImage(int, int) */ + @Override protected void drawCompositeImage(int width, int height) { ImageData bg= getBaseImage().getImageData(); if (bg == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java index 09cdd709b..2d9415b6f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,6 +13,7 @@ package org.eclipse.debug.internal.ui.launchConfigurations; import java.util.ArrayList; import java.util.List; + import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.DebugPlugin; @@ -71,6 +72,7 @@ public class LaunchConfigurationTreeContentProvider implements ITreeContentProvi * * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof ILaunchConfiguration) { return EMPTY_ARRAY; @@ -90,6 +92,7 @@ public class LaunchConfigurationTreeContentProvider implements ITreeContentProvi /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ + @Override public Object getParent(Object element) { if (element instanceof ILaunchConfiguration) { if (!((ILaunchConfiguration)element).exists()) { @@ -109,6 +112,7 @@ public class LaunchConfigurationTreeContentProvider implements ITreeContentProvi /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ + @Override public boolean hasChildren(Object element) { if (element instanceof ILaunchConfiguration) { return false; @@ -122,6 +126,7 @@ public class LaunchConfigurationTreeContentProvider implements ITreeContentProvi * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { ILaunchConfigurationType[] allTypes = getLaunchManager().getLaunchConfigurationTypes(); return filterTypes(allTypes).toArray(); @@ -135,8 +140,8 @@ public class LaunchConfigurationTreeContentProvider implements ITreeContentProvi * @param allTypes the types * @return the given types minus any types that should not be visible. */ - private List filterTypes(ILaunchConfigurationType[] allTypes) { - List filteredTypes= new ArrayList(); + private List<ILaunchConfigurationType> filterTypes(ILaunchConfigurationType[] allTypes) { + List<ILaunchConfigurationType> filteredTypes = new ArrayList<ILaunchConfigurationType>(); String mode = getMode(); LaunchConfigurationTypeContribution contribution; for (int i = 0; i < allTypes.length; i++) { @@ -152,12 +157,14 @@ public class LaunchConfigurationTreeContentProvider implements ITreeContentProvi /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTypeContribution.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTypeContribution.java index 8a7b3c627..155d92e58 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTypeContribution.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTypeContribution.java @@ -34,6 +34,7 @@ class LaunchConfigurationTypeContribution implements IPluginContribution { /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return type.getIdentifier(); } @@ -41,6 +42,7 @@ class LaunchConfigurationTypeContribution implements IPluginContribution { /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return type.getPluginIdentifier(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTypeFilter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTypeFilter.java index 86d5d6035..0d804e5a9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTypeFilter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTypeFilter.java @@ -36,6 +36,7 @@ public class LaunchConfigurationTypeFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if(element instanceof ILaunchConfiguration) { return true; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java index 4aaa18803..5f8866542 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -134,6 +134,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc /** * @see org.eclipse.debug.ui.AbstractDebugView#createViewer(org.eclipse.swt.widgets.Composite) */ + @Override protected Viewer createViewer(Composite parent) { fTree = new LaunchConfigurationFilteredTree(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL, new PatternFilter(), fLaunchGroup, fFilters); fTree.createViewControl(); @@ -146,20 +147,25 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc /** * @see org.eclipse.debug.ui.AbstractDebugView#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class key) { if (key == IContextProvider.class) { return new IContextProvider () { + @Override public int getContextChangeMask() { return SELECTION; } + @Override public IContext getContext(Object target) { String id = fTree.computeContextId(); - if (id!=null) + if (id!=null) { return HelpSystem.getContext(id); + } return null; } + @Override public String getSearchExpression(Object target) { return null; } @@ -182,6 +188,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc /** * @see org.eclipse.debug.ui.AbstractDebugView#createActions() */ + @Override protected void createActions() { fCreateAction = new CreateLaunchConfigurationAction(getViewer(), getLaunchGroup().getMode()); setAction(CreateLaunchConfigurationAction.ID_CREATE_ACTION, fCreateAction); @@ -204,6 +211,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc /** * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.LAUNCH_CONFIGURATION_VIEW; } @@ -211,6 +219,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc /** * @see org.eclipse.debug.ui.AbstractDebugView#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override protected void fillContextMenu(IMenuManager menu) { menu.add(fCreateAction); menu.add(fDuplicateAction); @@ -221,6 +230,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc /** * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager) */ + @Override protected void configureToolBar(IToolBarManager tbm) {} /** @@ -235,6 +245,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc /** * @see org.eclipse.ui.IWorkbenchPart#dispose() */ + @Override public void dispose() { fCreateAction.dispose(); fDeleteAction.dispose(); @@ -247,6 +258,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc /** * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationAdded(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void launchConfigurationAdded(final ILaunchConfiguration configuration) { if(isSupportedConfiguration(configuration)) { //due to notification and async messages we need to collect the moved from config @@ -256,7 +268,8 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc // handle asynchronously: @see bug 198428 - Deadlock deleting launch configuration Display display = DebugUIPlugin.getStandardDisplay(); display.asyncExec(new Runnable() { - public void run() { + @Override + public void run() { if(!fTree.isDisposed()) { handleConfigurationAdded(configuration, from); } @@ -336,11 +349,13 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc /** * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void launchConfigurationChanged(ILaunchConfiguration configuration) {} /** * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationRemoved(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void launchConfigurationRemoved(final ILaunchConfiguration configuration) { // if moved, ignore ILaunchConfiguration to = getLaunchManager().getMovedTo(configuration); @@ -350,7 +365,8 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc // handle asynchronously: @see bug 198428 - Deadlock deleting launch configuration Display display = DebugUIPlugin.getStandardDisplay(); display.asyncExec(new Runnable() { - public void run() { + @Override + public void run() { if(!fTree.isDisposed()) { handleConfigurationRemoved(configuration); } @@ -379,6 +395,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc createContextMenu(getViewer().getControl()); PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, getHelpContextId()); getViewer().getControl().addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { handleKeyPressed(e); } @@ -393,6 +410,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc /** * @see org.eclipse.debug.ui.IDebugView#getViewer() */ + @Override public Viewer getViewer() { return fTree.getLaunchConfigurationViewer(); } @@ -403,7 +421,9 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc */ public void updateFilterLabel() { LaunchConfigurationViewer viewer = (LaunchConfigurationViewer) getViewer(); - fFilteredNotice.setText(MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationView_0, new String[] {Integer.toString(viewer.getNonFilteredChildCount()), Integer.toString(viewer.getTotalChildCount())})); + fFilteredNotice.setText(MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationView_0, new Object[] { + Integer.toString(viewer.getNonFilteredChildCount()), + Integer.toString(viewer.getTotalChildCount()) })); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationViewer.java index dd4eba627..5b1d6f937 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -53,14 +53,15 @@ public class LaunchConfigurationViewer extends TreeViewer { /** * @see org.eclipse.jface.viewers.StructuredViewer#preservingSelection(java.lang.Runnable) */ + @Override protected void preservingSelection(Runnable updateCode) { IStructuredSelection selection = (IStructuredSelection) getSelection(); if(!selection.isEmpty()) { int[] indices = collectIndices(selection.getFirstElement()); updateCode.run(); - ArrayList set = new ArrayList(); + ArrayList<Object> set = new ArrayList<Object>(); Object o = null; - for(Iterator iter = selection.iterator(); iter.hasNext();) { + for (Iterator<?> iter = selection.iterator(); iter.hasNext();) { o = iter.next(); if(o instanceof ILaunchConfiguration) { if(!((ILaunchConfiguration)o).exists()) { @@ -155,6 +156,7 @@ public class LaunchConfigurationViewer extends TreeViewer { /** * @see org.eclipse.jface.viewers.AbstractTreeViewer#remove(java.lang.Object) */ + @Override public void remove(Object elementsOrTreePaths) { super.remove(elementsOrTreePaths); fTotalCount--; @@ -163,6 +165,7 @@ public class LaunchConfigurationViewer extends TreeViewer { /** * @see org.eclipse.jface.viewers.TreeViewer#internalAdd(org.eclipse.swt.widgets.Widget, java.lang.Object, java.lang.Object[]) */ + @Override protected void internalAdd(Widget widget, Object parentElement, Object[] childElements) { super.internalAdd(widget, parentElement, childElements); fTotalCount++; @@ -171,6 +174,7 @@ public class LaunchConfigurationViewer extends TreeViewer { /** * @see org.eclipse.jface.viewers.AbstractTreeViewer#inputChanged(java.lang.Object, java.lang.Object) */ + @Override protected void inputChanged(Object input, Object oldInput) { super.inputChanged(input, oldInput); //calc the total number of items that could be visible in the view diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java index a3d6ee978..e89799379 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -228,7 +228,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /** * set of reserved names that should not be considered when generating a new name for a launch configuration */ - protected Set fReservedNames = null; + protected Set<String> fReservedNames = null; /** * Whether to set default values when opened @@ -305,6 +305,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) */ + @Override protected void buttonPressed(int buttonId) { if (buttonId == ID_LAUNCH_BUTTON) { handleLaunchPressed(); @@ -336,6 +337,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.jface.window.Window#close() */ + @Override public boolean close() { if (!isSafeToClose()) { return false; @@ -358,6 +360,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell); */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(getShellTitle()); @@ -366,6 +369,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.jface.window.Window#create() */ + @Override public void create() { super.create(); if (fTabViewer.getInput() == null) { @@ -376,6 +380,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createButtonBar(Composite parent) { Font font = parent.getFont(); Composite composite = new Composite(parent, SWT.NULL); @@ -425,6 +430,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { Button button = createButton(parent, ID_LAUNCH_BUTTON, getLaunchButtonText(), true); button.setEnabled(false); @@ -434,6 +440,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Control contents = super.createContents(parent); initializeContent(); @@ -444,6 +451,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite dialogComp = (Composite)super.createDialogArea(parent); addContent(dialogComp); @@ -522,6 +530,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun //the view is created to add them to the toolbar createToolbarActions(toolBarManager); fDoubleClickAction = new Action() { + @Override public void run() { IStructuredSelection selection = (IStructuredSelection)fLaunchConfigurationView.getViewer().getSelection(); Object target = selection.getFirstElement(); @@ -542,6 +551,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun control.setLayoutData(gd); viewForm.setContent(viewFormContents); AbstractLaunchConfigurationAction.IConfirmationRequestor requestor = new AbstractLaunchConfigurationAction.IConfirmationRequestor() { + @Override public boolean getConfirmation() { int status = shouldSaveCurrentConfig(); if(status == IDialogConstants.YES_ID) { @@ -558,6 +568,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun getDuplicateAction().setConfirmationRequestor(requestor); getNewAction().setConfirmationRequestor(requestor); ((StructuredViewer) viewer).addPostSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleLaunchConfigurationSelectionChanged(event); getNewAction().setEnabled(getNewAction().isEnabled()); @@ -575,7 +586,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * @since 3.2 */ private ViewerFilter[] createViewerFilters() { - ArrayList filters = new ArrayList(); + ArrayList<ViewerFilter> filters = new ArrayList<ViewerFilter>(); fClosedProjectFilter = new ClosedProjectFilter(); if(DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IInternalDebugUIConstants.PREF_FILTER_LAUNCH_CLOSED)) { filters.add(fClosedProjectFilter); @@ -592,7 +603,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun if(DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IInternalDebugUIConstants.PREF_FILTER_WORKING_SETS)) { filters.add(fWorkingSetsFilter); } - return (ViewerFilter[]) filters.toArray(new ViewerFilter[filters.size()]); + return filters.toArray(new ViewerFilter[filters.size()]); } /** @@ -605,9 +616,10 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationDialog#generateName(java.lang.String) */ + @Override public String generateName(String name) { if (name == null) { - name = IInternalDebugCoreConstants.EMPTY_STRING; + return getLaunchManager().generateLaunchConfigurationName(IInternalDebugCoreConstants.EMPTY_STRING); } return getLaunchManager().generateLaunchConfigurationName(name); } @@ -622,9 +634,9 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * * @since 3.3 */ - public String generateName(String name, Set reservednames) { + public String generateName(String name, Set<String> reservednames) { if(name == null) { - name = IInternalDebugCoreConstants.EMPTY_STRING; + return ((LaunchManager) getLaunchManager()).generateUniqueLaunchConfigurationNameFrom(IInternalDebugCoreConstants.EMPTY_STRING, reservednames); } return ((LaunchManager)getLaunchManager()).generateUniqueLaunchConfigurationNameFrom(name, reservednames); } @@ -632,6 +644,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationDialog#getActiveTab() */ + @Override public ILaunchConfigurationTab getActiveTab() { return fTabViewer.getActiveTab(); } @@ -680,14 +693,16 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() * @since 3.2 */ - protected IDialogSettings getDialogBoundsSettings() { + @Override + protected IDialogSettings getDialogBoundsSettings() { return getDialogSettings(); } /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsStrategy() */ - protected int getDialogBoundsStrategy() { + @Override + protected int getDialogBoundsStrategy() { return DIALOG_PERSISTSIZE; } @@ -785,7 +800,8 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationDialog#getMode() */ - public String getMode() { + @Override + public String getMode() { return getLaunchGroup().getMode(); } @@ -804,7 +820,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * @since 3.3 * */ - public Set getReservedNameSet() { + public Set<String> getReservedNameSet() { return fReservedNames; } @@ -831,7 +847,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun protected String getShellTitle() { String title = null; if(getLaunchGroup() != null) { - title = MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationsDialog_configurations, new String[] {DebugUIPlugin.removeAccelerators(getLaunchGroup().getLabel())}); + title = MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationsDialog_configurations, new Object[] { DebugUIPlugin.removeAccelerators(getLaunchGroup().getLabel()) }); } if (title == null) { title = LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_Configurations_18; @@ -854,7 +870,8 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationDialog#getTabs() */ - public ILaunchConfigurationTab[] getTabs() { + @Override + public ILaunchConfigurationTab[] getTabs() { if (getTabGroup() == null) { return null; } @@ -1005,6 +1022,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.jface.window.Window#initializeBounds() */ + @Override protected void initializeBounds() { IDialogSettings settings = getDialogSettings(); if (fSashForm != null) { @@ -1031,6 +1049,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TitleAreaDialog#getInitialSize() */ + @Override protected Point getInitialSize() { try { getDialogSettings().getInt("DIALOG_HEIGHT"); //$NON-NLS-1$ @@ -1122,6 +1141,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * @see org.eclipse.jface.window.Window#open() * @return the int status of opening the dialog */ + @Override public int open() { int mode = getOpenMode(); setCurrentlyVisibleLaunchConfigurationDialog(this); @@ -1146,7 +1166,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun if(value == null) { value = IInternalDebugCoreConstants.EMPTY_STRING; } - ArrayList list = new ArrayList(); + ArrayList<String> list = new ArrayList<String>(); String[] persisted = value.split(DELIMITER); for(int i = 0; i < persisted.length; i++) { list.add(persisted[i]); @@ -1165,7 +1185,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun } value = IInternalDebugCoreConstants.EMPTY_STRING; //build the preference string - for(Iterator iter = list.iterator(); iter.hasNext();) { + for (Iterator<String> iter = list.iterator(); iter.hasNext();) { value += iter.next() + DELIMITER; } settings.put(DIALOG_EXPANDED_NODES, value); @@ -1183,7 +1203,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun if(value != null) { String[] nodes = value.split(DELIMITER); TreeItem[] items = fLaunchConfigurationView.getTreeViewer().getTree().getItems(); - HashSet toexpand = new HashSet(); + HashSet<Object> toexpand = new HashSet<Object>(); // if we have a selection make sure it is expanded if(fInitialSelection != null && !fInitialSelection.isEmpty()) { Object obj = fInitialSelection.getFirstElement(); @@ -1251,6 +1271,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, org.eclipse.jface.operation.IRunnableWithProgress) */ + @Override public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { if (getShell() != null && getShell().isVisible()) { // Save focus control @@ -1314,6 +1335,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationDialog#setActiveTab(org.eclipse.debug.ui.ILaunchConfigurationTab) */ + @Override public void setActiveTab(ILaunchConfigurationTab tab) { fTabViewer.setActiveTab(tab); } @@ -1321,6 +1343,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationDialog#setActiveTab(int) */ + @Override public void setActiveTab(int index) { fTabViewer.setActiveTab(index); } @@ -1384,6 +1407,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationDialog#setName(java.lang.String) */ + @Override public void setName(String name) { fTabViewer.setName(name); } @@ -1431,7 +1455,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * <code>IDialogConstants</code>. */ private int showDiscardChangesDialog() { - StringBuffer buffer = new StringBuffer(MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationDialog_The_configuration___35, new String[]{fTabViewer.getWorkingCopy().getName()})); + StringBuffer buffer = new StringBuffer(MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationDialog_The_configuration___35, new Object[] { fTabViewer.getWorkingCopy().getName() })); buffer.append(fTabViewer.getErrorMesssage()); buffer.append(LaunchConfigurationsMessages.LaunchConfigurationDialog_Do_you_wish_to_discard_changes_37); MessageDialog dialog = new MessageDialog(getShell(), @@ -1468,7 +1492,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * <code>IDialogConstants</code>. */ private int showSaveChangesDialog() { - String message = MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationDialog_The_configuration___29, new String[]{fTabViewer.getWorkingCopy().getName()}); + String message = MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationDialog_The_configuration___29, new Object[] { fTabViewer.getWorkingCopy().getName() }); MessageDialog dialog = new MessageDialog(getShell(), LaunchConfigurationsMessages.LaunchConfigurationFilteredTree_save_changes, null, @@ -1509,6 +1533,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationDialog#updateButtons() */ + @Override public void updateButtons() { if (!fSettingInput) { // New, Delete, & Duplicate toolbar actions @@ -1525,6 +1550,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationDialog#updateMessage() */ + @Override public void updateMessage() { if (!fSettingInput) { setErrorMessage(fTabViewer.getErrorMesssage()); @@ -1548,8 +1574,10 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(final PropertyChangeEvent event) { WorkbenchJob job = new WorkbenchJob(IInternalDebugCoreConstants.EMPTY_STRING) { + @Override public IStatus runInUIThread(IProgressMonitor monitor) { TreeViewer viewer = fLaunchConfigurationView.getTreeViewer(); boolean newvalue = Boolean.valueOf(event.getNewValue().toString()).booleanValue(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchDelegateContribution.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchDelegateContribution.java index de7828eb3..9e95ce18a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchDelegateContribution.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchDelegateContribution.java @@ -32,6 +32,7 @@ public class LaunchDelegateContribution implements IPluginContribution { /** * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return fDelegate.getId(); } @@ -39,6 +40,7 @@ public class LaunchDelegateContribution implements IPluginContribution { /** * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return fDelegate.getPluginIdentifier(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchDelegateNotAvailableHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchDelegateNotAvailableHandler.java index f81f75084..40beef2de 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchDelegateNotAvailableHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchDelegateNotAvailableHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,6 +17,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.IStatusHandler; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.ui.DebugUITools; +import org.eclipse.debug.ui.ILaunchGroup; import org.eclipse.swt.widgets.Shell; /** @@ -30,6 +31,7 @@ public class LaunchDelegateNotAvailableHandler implements IStatusHandler { /** * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus(IStatus status, Object source) throws CoreException { if(source instanceof Object[]) { Object[] infos = (Object[]) source; @@ -38,8 +40,12 @@ public class LaunchDelegateNotAvailableHandler implements IStatusHandler { final String mode = (String) infos[1]; final Shell shell = DebugUIPlugin.getShell(); Runnable runnable = new Runnable() { + @Override public void run() { - DebugUITools.openLaunchConfigurationDialog(shell, config, DebugUITools.getLaunchGroup(config, mode).getIdentifier(), null); + ILaunchGroup group = DebugUITools.getLaunchGroup(config, mode); + if (group != null) { + DebugUITools.openLaunchConfigurationDialog(shell, config, group.getIdentifier(), null); + } } }; DebugUIPlugin.getStandardDisplay().asyncExec(runnable); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchGroupExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchGroupExtension.java index b1e9beb2f..74431b081 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchGroupExtension.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchGroupExtension.java @@ -75,6 +75,7 @@ public class LaunchGroupExtension implements ILaunchGroup { * * @return the image for this launch group, or <code>null</code> if none */ + @Override public ImageDescriptor getImageDescriptor() { if (fImageDescriptor == null) { fImageDescriptor = createImageDescriptor("image"); //$NON-NLS-1$ @@ -89,6 +90,7 @@ public class LaunchGroupExtension implements ILaunchGroup { * @return the banner image for this launch group, or <code>null</code> if * none */ + @Override public ImageDescriptor getBannerImageDescriptor() { if (fBannerImageDescriptor == null) { fBannerImageDescriptor = createImageDescriptor("bannerImage"); //$NON-NLS-1$ @@ -101,6 +103,7 @@ public class LaunchGroupExtension implements ILaunchGroup { * * @return the label for this launch group */ + @Override public String getLabel() { return getConfigurationElement().getAttribute("label"); //$NON-NLS-1$ } @@ -110,6 +113,7 @@ public class LaunchGroupExtension implements ILaunchGroup { * * @return the id for this launch group */ + @Override public String getIdentifier() { return getConfigurationElement().getAttribute("id"); //$NON-NLS-1$ } @@ -119,6 +123,7 @@ public class LaunchGroupExtension implements ILaunchGroup { * * @return the category for this launch group, possibly <code>null</code> */ + @Override public String getCategory() { return getConfigurationElement().getAttribute("category"); //$NON-NLS-1$ } @@ -128,6 +133,7 @@ public class LaunchGroupExtension implements ILaunchGroup { * * @return the mode for this launch group */ + @Override public String getMode() { return getConfigurationElement().getAttribute("mode"); //$NON-NLS-1$ } @@ -147,6 +153,7 @@ public class LaunchGroupExtension implements ILaunchGroup { * * @return boolean */ + @Override public boolean isPublic() { String string = getConfigurationElement().getAttribute("public"); //$NON-NLS-1$ if (string == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchGroupFilter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchGroupFilter.java index 6fcb9a11a..0ca73482c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchGroupFilter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchGroupFilter.java @@ -39,6 +39,7 @@ public class LaunchGroupFilter extends ViewerFilter { /** * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { ILaunchConfigurationType type = null; ILaunchConfiguration config = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistory.java index 307b09126..7ffb4b4a7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.debug.internal.ui.launchConfigurations; import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; import java.util.List; import java.util.Vector; @@ -33,12 +32,13 @@ import org.eclipse.ui.activities.WorkbenchActivityHelper; /** * A history of launches and favorites for a launch group */ +@SuppressWarnings("deprecation") public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListener { /** * Listing of the complete launch history, which includes favorites in the launched ordering */ - private Vector fCompleteHistory = new Vector(); + private Vector<ILaunchConfiguration> fCompleteHistory = new Vector<ILaunchConfiguration>(); /** * The launch group this history is provided for @@ -48,7 +48,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe /** * Ordered listing of the favorites of this history */ - private Vector fFavorites = new Vector(); + private Vector<ILaunchConfiguration> fFavorites = new Vector<ILaunchConfiguration>(); /** * A new saved flag to prevent save participants from serializing unchanged launch histories. @@ -59,7 +59,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe /** * List of instances of this launch history */ - private static List fgLaunchHistoryInstances = new ArrayList(); + private static List<LaunchHistory> fgLaunchHistoryInstances = new ArrayList<LaunchHistory>(); /** * Creates a new launch history for the given launch group @@ -85,6 +85,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe /** * @see org.eclipse.debug.core.ILaunchListener#launchAdded(org.eclipse.debug.core.ILaunch) */ + @Override public void launchAdded(ILaunch launch) { ILaunchConfiguration configuration = launch.getLaunchConfiguration(); if (configuration != null && !configuration.isWorkingCopy() && DebugUIPlugin.doLaunchConfigurationFiltering(configuration) && accepts(configuration)) { @@ -168,11 +169,13 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe /** * @see org.eclipse.debug.core.ILaunchListener#launchChanged(org.eclipse.debug.core.ILaunch) */ + @Override public void launchChanged(ILaunch launch) {} /** * @see org.eclipse.debug.core.ILaunchListener#launchRemoved(org.eclipse.debug.core.ILaunch) */ + @Override public void launchRemoved(ILaunch launch) {} /** @@ -197,11 +200,9 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe * @return launch history */ public synchronized ILaunchConfiguration[] getHistory() { - Vector history = new Vector(); + Vector<ILaunchConfiguration> history = new Vector<ILaunchConfiguration>(); try { - ILaunchConfiguration config = null; - for(Iterator iter = fCompleteHistory.iterator(); iter.hasNext();) { - config = (ILaunchConfiguration) iter.next(); + for (ILaunchConfiguration config : fCompleteHistory) { if(config.exists() && !fFavorites.contains(config) && DebugUIPlugin.doLaunchConfigurationFiltering(config) && !WorkbenchActivityHelper.filterItem(new LaunchConfigurationTypeContribution(config.getType()))) { @@ -214,7 +215,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe } } catch(CoreException ce) {DebugUIPlugin.log(ce);} - return (ILaunchConfiguration[]) history.toArray(new ILaunchConfiguration[history.size()]); + return history.toArray(new ILaunchConfiguration[history.size()]); } /** @@ -226,11 +227,9 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe * @since 3.3 */ public synchronized ILaunchConfiguration[] getCompleteLaunchHistory() { - Vector history = new Vector(); + Vector<ILaunchConfiguration> history = new Vector<ILaunchConfiguration>(); try { - ILaunchConfiguration config = null; - for(Iterator iter = fCompleteHistory.listIterator(); iter.hasNext();){ - config = (ILaunchConfiguration) iter.next(); + for (ILaunchConfiguration config : fCompleteHistory) { if(config.exists() && DebugUIPlugin.doLaunchConfigurationFiltering(config) && !WorkbenchActivityHelper.filterItem(new LaunchConfigurationTypeContribution(config.getType()))) { history.add(config); @@ -238,7 +237,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe } } catch (CoreException ce) {DebugUIPlugin.log(ce);} - return (ILaunchConfiguration[]) history.toArray(new ILaunchConfiguration[history.size()]); + return history.toArray(new ILaunchConfiguration[history.size()]); } /** @@ -248,7 +247,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe * @return launch favorites */ public synchronized ILaunchConfiguration[] getFavorites() { - return (ILaunchConfiguration[])fFavorites.toArray(new ILaunchConfiguration[fFavorites.size()]); + return fFavorites.toArray(new ILaunchConfiguration[fFavorites.size()]); } /** @@ -257,7 +256,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe * @param favorites */ public synchronized void setFavorites(ILaunchConfiguration[] favorites) { - fFavorites = new Vector(Arrays.asList(favorites)); + fFavorites = new Vector<ILaunchConfiguration>(Arrays.asList(favorites)); setSaved(false); fireLaunchHistoryChanged(); } @@ -315,8 +314,8 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe * Notifies all launch histories that the launch history size has changed. */ public static void launchHistoryChanged() { - for(Iterator iter = fgLaunchHistoryInstances.iterator(); iter.hasNext();) { - ((LaunchHistory) iter.next()).resizeHistory(); + for (LaunchHistory history : fgLaunchHistoryInstances) { + history.resizeHistory(); } } @@ -343,6 +342,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe /** * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationAdded(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void launchConfigurationAdded(ILaunchConfiguration configuration) { ILaunchConfiguration movedFrom = DebugPlugin.getDefault().getLaunchManager().getMovedFrom(configuration); // if this is a move, the launchConfigurationRemoved(...) method will handle updates @@ -363,7 +363,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe */ protected boolean isFavorite(ILaunchConfiguration configuration) throws CoreException { String groupId = getLaunchGroup().getIdentifier(); - List favoriteGroups = configuration.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List)null); + List<String> favoriteGroups = configuration.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List<String>) null); if (favoriteGroups == null) { // check deprecated attributes for backwards compatibility if (groupId.equals(IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP)) { @@ -442,6 +442,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe /** * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void launchConfigurationChanged(ILaunchConfiguration configuration) { checkFavorites(configuration); } @@ -449,6 +450,7 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe /** * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationRemoved(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void launchConfigurationRemoved(ILaunchConfiguration configuration) { synchronized (this) { ILaunchConfiguration newConfig = DebugPlugin.getDefault().getLaunchManager().getMovedTo(configuration); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java index 2d3065476..0e1acb39e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,9 +11,9 @@ package org.eclipse.debug.internal.ui.launchConfigurations; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -52,11 +52,11 @@ import org.eclipse.ui.handlers.IHandlerService; public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContribution { private ImageDescriptor fImageDescriptor = null; - private List fPerspectives = null; + private List<String> fPerspectives = null; private ILaunchShortcut fDelegate = null; - private Set fModes = null; - private Set fAssociatedTypes = null; - private Map fDescriptions = null; + private Set<String> fModes = null; + private Set<String> fAssociatedTypes = null; + private Map<String, String> fDescriptions = null; private IConfigurationElement fContextualLaunchConfigurationElement = null; private Expression fContextualLaunchExpr = null; private Expression fStandardLaunchExpr = null; @@ -82,6 +82,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { LaunchShortcutAction action = new LaunchShortcutAction(fMode, fShortcut); if (action.isEnabled()) { @@ -97,7 +98,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib * The configuration element defining this tab. */ private IConfigurationElement fConfig; - private /* <Pair> */ List fContextLabels; + private/* <Pair> */List<Pair> fContextLabels; /** * Constructs a launch configuration tab extension based @@ -116,11 +117,9 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib * Registers command handlers for launch shortcut key bindings */ private void registerLaunchCommandHandlers() { - Iterator modes = getModes().iterator(); IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getAdapter(IHandlerService.class); if(handlerService != null) { - while (modes.hasNext()) { - String mode = (String) modes.next(); + for (String mode : getModes()) { String id = getId() + "." + mode; //$NON-NLS-1$ IHandler handler = new LaunchCommandHandler(this, mode); handlerService.activateHandler(id, handler); @@ -174,21 +173,21 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib } return fContextualLaunchConfigurationElement; } + /** * Returns the contextual launch label of this shortcut for the named mode. - * <p> - * <samp> - * <launchShortcut...> - * <contextualLaunch> - * <contextLabel mode="run" label="Run Java Application"/> - * <contextLabel mode="debug" label="Debug Java Application"/> + * <pre> + * <launchShortcut...> + * <contextualLaunch> + * <contextLabel mode="run" label="Run Java Application"/> + * <contextLabel mode="debug" label="Debug Java Application"/> * ... - * </contextualLaunch> - * </launchShortcut> - * </samp> + * </contextualLaunch> + * </launchShortcut> + * </pre> * - * @return the contextual label of this shortcut, or <code>null</code> if not - * specified + * @return the contextual label of this shortcut, or <code>null</code> if + * not specified */ public String getContextLabel(String mode) { // remember the list of context labels for this shortcut @@ -198,16 +197,14 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib return null; } IConfigurationElement[] labels = context.getChildren(IConfigurationElementConstants.CONTEXT_LABEL); - fContextLabels = new ArrayList(labels.length); + fContextLabels = new ArrayList<Pair>(labels.length); for (int i = 0; i < labels.length; i++) { fContextLabels.add(new Pair(labels[i].getAttribute(IConfigurationElementConstants.MODE), labels[i].getAttribute(IConfigurationElementConstants.LABEL))); } } // pick out the first occurance of the "name" bound to "mode" - Iterator iter = fContextLabels.iterator(); - while (iter.hasNext()) { - Pair p = (Pair) iter.next(); + for (Pair p : fContextLabels) { if (p.firstAsString().equals(mode)) { return p.secondAsString(); } @@ -221,9 +218,9 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib * @return the set of associated launch configuration type ids * @since 3.3 */ - public Set getAssociatedConfigurationTypes() { + public Set<String> getAssociatedConfigurationTypes() { if(fAssociatedTypes == null) { - fAssociatedTypes = new HashSet(); + fAssociatedTypes = new HashSet<String>(); IConfigurationElement[] children = fConfig.getChildren(IConfigurationElementConstants.CONFIGURATION_TYPES); String id = null; for (int i = 0; i < children.length; i++) { @@ -249,26 +246,23 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib return null; } if(fDescriptions == null) { - fDescriptions = new HashMap(); + fDescriptions = new HashMap<String, String>(); //get the description for the main element first String descr = fConfig.getAttribute(IConfigurationElementConstants.DESCRIPTION); - String lmode = null; - Set modes = getModes(); if(descr != null) { - for(Iterator iter = modes.iterator(); iter.hasNext();) { - lmode = (String) iter.next(); + for (String lmode : getModes()) { fDescriptions.put(lmode, descr); } } //load descriptions for child description elements IConfigurationElement[] children = fConfig.getChildren(IConfigurationElementConstants.DESCRIPTION); for(int i = 0; i < children.length; i++) { - lmode = children[i].getAttribute(IConfigurationElementConstants.MODE); + String lmode = children[i].getAttribute(IConfigurationElementConstants.MODE); descr = children[i].getAttribute(IConfigurationElementConstants.DESCRIPTION); fDescriptions.put(lmode, descr); } } - return (String) fDescriptions.get(mode); + return fDescriptions.get(mode); } /** @@ -388,10 +382,11 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib * @return list of Strings representing perspective identifiers * @deprecated The use of the perspectives element has been deprecated since 3.1. */ - public List getPerspectives() { + @Deprecated + public List<String> getPerspectives() { if (fPerspectives == null) { IConfigurationElement[] perspectives = getConfigurationElement().getChildren(IConfigurationElementConstants.PERSPECTIVE); - fPerspectives = new ArrayList(perspectives.length); + fPerspectives = new ArrayList<String>(perspectives.length); for (int i = 0; i < perspectives.length; i++) { fPerspectives.add(perspectives[i].getAttribute(IConfigurationElementConstants.ID)); } @@ -418,6 +413,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib /** * @see ILaunchShortcut#launch(IEditorPart, String) */ + @Override public void launch(IEditorPart editor, String mode) { ILaunchShortcut shortcut = getDelegate(); if (shortcut != null) { @@ -428,6 +424,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib /** * @see ILaunchShortcut#launch(ISelection, String) */ + @Override public void launch(ISelection selection, String mode) { ILaunchShortcut shortcut = getDelegate(); if (shortcut != null) { @@ -440,14 +437,14 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib * * @return the set of modes this shortcut supports */ - public Set getModes() { + public Set<String> getModes() { if (fModes == null) { String modes= getConfigurationElement().getAttribute(IConfigurationElementConstants.MODES); if (modes == null) { - return new HashSet(0); + return Collections.EMPTY_SET; } StringTokenizer tokenizer= new StringTokenizer(modes, ","); //$NON-NLS-1$ - fModes = new HashSet(tokenizer.countTokens()); + fModes = new HashSet<String>(tokenizer.countTokens()); while (tokenizer.hasMoreTokens()) { fModes.add(tokenizer.nextToken().trim()); } @@ -469,6 +466,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib * Only for debugging * @see java.lang.Object#toString() */ + @Override public String toString() { return getId(); } @@ -476,6 +474,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return getId(); } @@ -483,6 +482,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return fConfig.getContributor().getName(); } @@ -490,6 +490,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchConfigurations(org.eclipse.jface.viewers.ISelection) */ + @Override public ILaunchConfiguration[] getLaunchConfigurations(ISelection selection) { ILaunchShortcut delegate = getDelegate(); if(delegate instanceof ILaunchShortcut2) { @@ -501,6 +502,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchConfigurations(org.eclipse.ui.IEditorPart) */ + @Override public ILaunchConfiguration[] getLaunchConfigurations(IEditorPart editorpart) { ILaunchShortcut delegate = getDelegate(); if(delegate instanceof ILaunchShortcut2) { @@ -512,6 +514,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchableResource(org.eclipse.jface.viewers.ISelection) */ + @Override public IResource getLaunchableResource(ISelection selection) { ILaunchShortcut delegate = getDelegate(); if(delegate instanceof ILaunchShortcut2) { @@ -523,6 +526,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchableResource(org.eclipse.ui.IEditorPart) */ + @Override public IResource getLaunchableResource(IEditorPart editorpart) { ILaunchShortcut delegate = getDelegate(); if(delegate instanceof ILaunchShortcut2) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutSelectionDialog.java index 0a4b61e00..47f78e24d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutSelectionDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -41,7 +41,6 @@ import com.ibm.icu.text.MessageFormat; * @see {@link org.eclipse.debug.internal.ui.actions.ContextLaunchingAction} * * @since 3.3 - * CONTEXTLAUNCHING */ public class LaunchShortcutSelectionDialog extends AbstractDebugListSelectionDialog { @@ -53,7 +52,7 @@ public class LaunchShortcutSelectionDialog extends AbstractDebugListSelectionDia private String fModeName = null; private String fMode = null; private IResource fResource = null; - private List fShortcuts = null; + private List<LaunchShortcutExtension> fShortcuts = null; private Text fDescriptionText = null; /** @@ -62,7 +61,7 @@ public class LaunchShortcutSelectionDialog extends AbstractDebugListSelectionDia * @param resource * @param mode */ - public LaunchShortcutSelectionDialog(List shortcuts, IResource resource, String mode) { + public LaunchShortcutSelectionDialog(List<LaunchShortcutExtension> shortcuts, IResource resource, String mode) { super(DebugUIPlugin.getShell()); setShellStyle(getShellStyle() | SWT.RESIZE); fShortcuts = shortcuts; @@ -73,12 +72,13 @@ public class LaunchShortcutSelectionDialog extends AbstractDebugListSelectionDia if (lmode != null) { fModeName = DebugUIPlugin.removeAccelerators(lmode.getLabel()); } - setTitle(MessageFormat.format(LaunchConfigurationsMessages.LaunchShortcutSelectionDialog_0, new String[] {fModeName})); + setTitle(MessageFormat.format(LaunchConfigurationsMessages.LaunchShortcutSelectionDialog_0, new Object[] { fModeName })); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SELECT_LAUNCH_METHOD_DIALOG; } @@ -86,6 +86,7 @@ public class LaunchShortcutSelectionDialog extends AbstractDebugListSelectionDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getDialogSettingsId() */ + @Override protected String getDialogSettingsId() { return DIALOG_SETTINGS; } @@ -93,9 +94,11 @@ public class LaunchShortcutSelectionDialog extends AbstractDebugListSelectionDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugListSelectionDialog#addViewerListeners(org.eclipse.jface.viewers.StructuredViewer) */ + @Override protected void addViewerListeners(StructuredViewer viewer) { super.addViewerListeners(viewer); viewer.addSelectionChangedListener(new ISelectionChangedListener(){ + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection = event.getSelection(); if (!selection.isEmpty()) { @@ -110,6 +113,7 @@ public class LaunchShortcutSelectionDialog extends AbstractDebugListSelectionDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#addCustomFooterControls(org.eclipse.swt.widgets.Composite) */ + @Override protected void addCustomFooterControls(Composite parent) { super.addCustomFooterControls(parent); Group group = SWTFactory.createGroup(parent, LaunchConfigurationsMessages.LaunchShortcutSelectionDialog_2, 1, 1, GridData.FILL_BOTH); @@ -122,6 +126,7 @@ public class LaunchShortcutSelectionDialog extends AbstractDebugListSelectionDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerInput() */ + @Override protected Object getViewerInput() { return fShortcuts; } @@ -129,18 +134,21 @@ public class LaunchShortcutSelectionDialog extends AbstractDebugListSelectionDia /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerLabel() */ + @Override protected String getViewerLabel() { if(fResource == null) { - return MessageFormat.format(LaunchConfigurationsMessages.LaunchShortcutSelectionDialog_4, new String[] {fModeName.toLowerCase()}); + return MessageFormat.format(LaunchConfigurationsMessages.LaunchShortcutSelectionDialog_4, new Object[] { fModeName.toLowerCase() }); } else { - return MessageFormat.format(LaunchConfigurationsMessages.LaunchShortcutSelectionDialog_1, new String[] {fModeName.toLowerCase(), fResource.getName()}); + return MessageFormat.format(LaunchConfigurationsMessages.LaunchShortcutSelectionDialog_1, new Object[] { + fModeName.toLowerCase(), fResource.getName() }); } } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugListSelectionDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); getButton(IDialogConstants.OK_ID).setEnabled(!getViewer().getSelection().isEmpty()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchTabContribution.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchTabContribution.java index b6bfec2b0..9104e38e1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchTabContribution.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchTabContribution.java @@ -30,6 +30,7 @@ public class LaunchTabContribution implements IPluginContribution { /** * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return fTab.getIdentifier(); } @@ -37,6 +38,7 @@ public class LaunchTabContribution implements IPluginContribution { /** * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return fTab.getPluginIdentifier(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/OrganizeFavoritesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/OrganizeFavoritesAction.java index 5991d5ea7..1a15ac133 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/OrganizeFavoritesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/OrganizeFavoritesAction.java @@ -32,6 +32,7 @@ public class OrganizeFavoritesAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { LaunchHistory history = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchHistory(fGroupId); FavoritesDialog dialog = new FavoritesDialog(DebugUIPlugin.getShell(), history); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java index 2a743d9f2..8e13a460e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -98,7 +98,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe private ILaunchConfigurationType fType = null; private ILaunchDelegate fDelegate = null; - private Map fPerspectives = null; + private Map<Set<String>, String> fPerspectives = null; /** * Constructor @@ -106,10 +106,10 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * @param delegate * @param modes */ - public PerspectiveContext(ILaunchConfigurationType type, ILaunchDelegate delegate, Set modes) { + public PerspectiveContext(ILaunchConfigurationType type, ILaunchDelegate delegate, Set<String> modes) { fType = type; fDelegate = delegate; - fPerspectives = new HashMap(); + fPerspectives = new HashMap<Set<String>, String>(); fPerspectives.put(modes, null); } @@ -121,6 +121,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * </ol> * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object object) { ILaunchDelegate delegate = null; ILaunchConfigurationType type = null; @@ -148,9 +149,24 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe return super.equals(object); } + @Override + public int hashCode() { + if (fType != null) { + int hash = fType.getIdentifier().hashCode(); + if (fDelegate != null) { + hash += fDelegate.hashCode(); + } + return hash; + } + return super.hashCode(); + } + public ILaunchConfigurationType getLaunchConfigurationType() {return fType;} public ILaunchDelegate getLaunchDelegate() {return fDelegate;} - public Map getPersepctiveMap() {return fPerspectives;} + + public Map<Set<String>, String> getPersepctiveMap() { + return fPerspectives; + } /** * Creates a new mapping of the specified perspective id to the specified mode set. @@ -158,9 +174,9 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * @param modes the set of modes * @param pid the id of the perspective */ - public void setPerspective(Set modes, String pid) { + public void setPerspective(Set<String> modes, String pid) { if(fPerspectives == null) { - fPerspectives = new HashMap(); + fPerspectives = new HashMap<Set<String>, String>(); } fPerspectives.put(modes, pid); } @@ -171,9 +187,9 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * @return the perspective id associated with the given mode set, or * <code>null</code>, if there isn't one */ - public String getPerspective(Set modes) { + public String getPerspective(Set<String> modes) { if(fPerspectives != null) { - return (String) fPerspectives.get(modes); + return fPerspectives.get(modes); } return null; } @@ -192,6 +208,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe setRule(AsynchronousSchedulingRuleFactory.getDefault().newSerialPerObjectRule(this)); } + @Override protected IStatus run(final IProgressMonitor monitor) { if (monitor.isCanceled()) { return Status.CANCEL_STATUS; @@ -201,7 +218,8 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe return Status.CANCEL_STATUS; } asyncDisplay.asyncExec(new Runnable() { - public void run() { + @Override + public void run() { IStatus result = null; Throwable throwable = null; try { @@ -236,7 +254,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * * @since 3.3 */ - private Set fPerspectiveContexts = null; + private Set<PerspectiveContext> fPerspectiveContexts = null; /** * id for the 'delegate' attribute @@ -256,7 +274,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * Maps each launch to its perspective context activation. These * are disabled when a launch terminates. */ - private Map fLaunchToContextActivations = new HashMap(); + private Map<ILaunch, IContextActivation[]> fLaunchToContextActivations = new HashMap<ILaunch, IContextActivation[]>(); /** * Called by the debug ui plug-in on startup. @@ -284,14 +302,16 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * * @see ILaunchListener#launchRemoved(ILaunch) */ + @Override public synchronized void launchRemoved(final ILaunch launch) { ISuspendTrigger trigger = (ISuspendTrigger) launch.getAdapter(ISuspendTrigger.class); if (trigger != null) { trigger.removeSuspendTriggerListener(this); } Runnable r= new Runnable() { + @Override public void run() { - IContextActivation[] activations = (IContextActivation[]) fLaunchToContextActivations.remove(launch); + IContextActivation[] activations = fLaunchToContextActivations.remove(launch); if (activations != null) { for (int i = 0; i < activations.length; i++) { IContextActivation activation = activations[i]; @@ -308,6 +328,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * * @see ILaunchListener#launchChanged(ILaunch) */ + @Override public void launchChanged(ILaunch launch) {} /** @@ -316,6 +337,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * * @see ILaunchListener#launchAdded(ILaunch) */ + @Override public synchronized void launchAdded(ILaunch launch) { ISuspendTrigger trigger = (ISuspendTrigger) launch.getAdapter(ISuspendTrigger.class); if (trigger != null) { @@ -340,6 +362,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe final String id = perspectiveId; // switch Job switchJob = new MyUIJob("Perspective Switch Job") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { IWorkbenchWindow window = getWindowForPerspective(id); if (id != null && window != null && shouldSwitchPerspective(window, id, IInternalDebugUIConstants.PREF_SWITCH_TO_PERSPECTIVE)) { @@ -371,7 +394,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe } catch (WorkbenchException e) { DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), LaunchConfigurationsMessages.PerspectiveManager_Error_1, - MessageFormat.format(LaunchConfigurationsMessages.PerspectiveManager_Unable_to_switch_to_perspective___0__2, new String[]{id}), + MessageFormat.format(LaunchConfigurationsMessages.PerspectiveManager_Unable_to_switch_to_perspective___0__2, new Object[] { id }), e); } } @@ -405,9 +428,10 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe */ protected void switchFailed(final Throwable t, final String launchName) { sync(new Runnable() { + @Override public void run() { DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), LaunchConfigurationsMessages.PerspectiveManager_Error_1, - MessageFormat.format(LaunchConfigurationsMessages.PerspectiveManager_Unable_to_switch_perpsectives_as_specified_by_launch___0__4, new String[] {launchName}), + MessageFormat.format(LaunchConfigurationsMessages.PerspectiveManager_Unable_to_switch_perpsectives_as_specified_by_launch___0__4, new Object[] { launchName }), t); }}); } @@ -432,6 +456,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe // window can be accessed final String targetId = perspectiveId; Job switchJob = new MyUIJob("Perspective Switch Job") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { IWorkbenchWindow window = null; if (targetId != null) { @@ -601,7 +626,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe return false; } String perspectiveDesc = getPerspectiveDescription(perspectiveId); - String[] args; + Object[] args; if (perspectiveDesc != null) { args = new String[] { perspectiveName , perspectiveDesc }; } @@ -735,7 +760,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe if (config == null) { return null; } - Set modes = launch.getLaunchConfiguration().getModes(); + Set<String> modes = launch.getLaunchConfiguration().getModes(); modes.add(launch.getLaunchMode()); String perspectiveId = getLaunchPerspective(config.getType(), modes, resolveLaunchDelegate(launch)); if (perspectiveId != null && perspectiveId.equals(IDebugUIConstants.PERSPECTIVE_NONE)) { @@ -754,7 +779,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * * @since 3.3 */ - public String getLaunchPerspective(ILaunchConfigurationType type, Set modes, ILaunchDelegate delegate) { + public String getLaunchPerspective(ILaunchConfigurationType type, Set<String> modes, ILaunchDelegate delegate) { String id = null; PerspectiveContext context = findContext(new PerspectiveContext(type, delegate, modes)); if(context == null || (context != null && !context.getPersepctiveMap().containsKey(modes))) { @@ -785,7 +810,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * @since 3.0 */ public String getLaunchPerspective(ILaunchConfigurationType type, String mode) { - HashSet modes = new HashSet(); + HashSet<String> modes = new HashSet<String>(); modes.add(mode); return getLaunchPerspective(type, modes, null); } @@ -807,7 +832,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * @since 3.0 */ public void setLaunchPerspective(ILaunchConfigurationType type, String mode, String perspective) { - HashSet modes = new HashSet(); + HashSet<String> modes = new HashSet<String>(); modes.add(mode); setLaunchPerspective(type, modes, null, perspective); } @@ -825,7 +850,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * * @since 3.3 */ - public void setLaunchPerspective(ILaunchConfigurationType type, Set modes, ILaunchDelegate delegate, String perspectiveid) { + public void setLaunchPerspective(ILaunchConfigurationType type, Set<String> modes, ILaunchDelegate delegate, String perspectiveid) { PerspectiveContext context = new PerspectiveContext(type, delegate, modes); String id = null; if(!IDebugUIConstants.PERSPECTIVE_NONE.equals(perspectiveid)) { @@ -855,16 +880,12 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * @since 3.3 */ private PerspectiveContext findContext(PerspectiveContext context) { - PerspectiveContext item = null; - Object o = null; - for(Iterator iter = fPerspectiveContexts.iterator(); iter.hasNext();) { - o = iter.next(); - if(context.equals(o)) { - item = (PerspectiveContext) o; - return item; + for (PerspectiveContext c : fPerspectiveContexts) { + if (context.equals(c)) { + return c; } } - return item; + return null; } /** @@ -879,20 +900,16 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe Document doc = DebugUIPlugin.getDocument(); Element root = doc.createElement(IConfigurationElementConstants.LAUNCH_PERSPECTIVES); doc.appendChild(root); - PerspectiveContext context = null; - Map modesets = null; + Map<Set<String>, String> modesets = null; Element element = null; - Set modes = null; String id = null; ILaunchConfigurationType type = null; ILaunchDelegate delegate = null; - for(Iterator iter = fPerspectiveContexts.iterator(); iter.hasNext();) { - context = (PerspectiveContext) iter.next(); + for (PerspectiveContext context : fPerspectiveContexts) { modesets = context.getPersepctiveMap(); type = context.getLaunchConfigurationType(); delegate = context.getLaunchDelegate(); - for(Iterator iter2 = modesets.keySet().iterator(); iter2.hasNext();) { - modes = (Set) iter2.next(); + for (Set<String> modes : modesets.keySet()) { id = context.getPerspective(modes); String defaultId = getDefaultLaunchPerspective(type, delegate, modes); if(id == null && defaultId != null) { @@ -916,25 +933,6 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe } /** - * Returns the default perspective to switch to when a configuration of the given - * type is launched in the given mode, or <code>null</code> if none. - * - * <p> - * Calling this method is equivalent to using the new method <code>getDefaultLaunchPerspective(ILaunchConfigurationType type, ILaunchDelegate delegate, Set modes)</code> - * with a null delegate and the specified mode comprising a set of one mode - * </p> - * - * @param type launch configuration type - * @param mode launch mode - * @return perspective identifier, or <code>null</code> - */ - public String getDefaultLaunchPerspective(ILaunchConfigurationType type, String mode) { - HashSet modes = new HashSet(); - modes.add(mode); - return getDefaultLaunchPerspective(type, null, modes); - } - - /** * Returns the default perspective to switch to when a configuration of the given type is launched by the specified * launch delegate in the given mode set, or <code>null</code> if none * @param type the type @@ -944,7 +942,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * * @since 3.3 */ - public String getDefaultLaunchPerspective(ILaunchConfigurationType type, ILaunchDelegate delegate, Set modes) { + public String getDefaultLaunchPerspective(ILaunchConfigurationType type, ILaunchDelegate delegate, Set<String> modes) { String id = null; if(delegate != null) { id = delegate.getPerspectiveId(modes); @@ -970,7 +968,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * @throws CoreException */ private ILaunchDelegate resolveLaunchDelegate(ILaunch launch) throws CoreException { - Set modes = launch.getLaunchConfiguration().getModes(); + Set<String> modes = launch.getLaunchConfiguration().getModes(); modes.add(launch.getLaunchMode()); ILaunchConfigurationType type = launch.getLaunchConfiguration().getType(); ILaunchDelegate[] delegates = LaunchConfigurationManager.filterLaunchDelegates(type, modes); @@ -992,7 +990,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe */ private void initPerspectives() { if(fPerspectiveContexts == null) { - fPerspectiveContexts = new HashSet(); + fPerspectiveContexts = new HashSet<PerspectiveContext>(); String xml = DebugUIPlugin.getDefault().getPreferenceStore().getString(IInternalDebugUIConstants.PREF_LAUNCH_PERSPECTIVES); if (xml != null && xml.length() > 0) { try { @@ -1001,7 +999,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe LaunchManager lm = (LaunchManager) DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType lctype = null; ILaunchDelegate ldelegate = null; - Set modes = null; + Set<String> modes = null; Node node = null; Element element = null; for (int i = 0; i < list.getLength(); ++i) { @@ -1036,8 +1034,8 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * * @since 3.3 */ - private Set parseModes(String modes) { - HashSet modeset = new HashSet(); + private Set<String> parseModes(String modes) { + HashSet<String> modeset = new HashSet<String>(); String[] ms = modes.split(","); //$NON-NLS-1$ for(int i = 0; i < ms.length; i++) { modeset.add(ms[i].trim()); @@ -1046,14 +1044,16 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe } /** - * Creates a standard comma separated list of the modes from the specified set + * Creates a standard comma separated list of the modes from the specified + * set + * * @param modes the set to write to string - * @return the + * @return the mode set as a string */ - private String createModesetString(Set modes) { + private String createModesetString(Set<String> modes) { String str = IInternalDebugCoreConstants.EMPTY_STRING; if(modes != null) { - for(Iterator iter = modes.iterator(); iter.hasNext();) { + for (Iterator<String> iter = modes.iterator(); iter.hasNext();) { str += iter.next(); if(iter.hasNext()) { str += ","; //$NON-NLS-1$ @@ -1077,6 +1077,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.ISuspendTriggerListener#suspended(org.eclipse.debug.core.ILaunch, java.lang.Object) */ + @Override public void suspended(ILaunch launch, Object context) { handleBreakpointHit(launch); } @@ -1084,21 +1085,25 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe /** * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(org.eclipse.core.resources.ISaveContext) */ + @Override public void doneSaving(ISaveContext context) {} /** * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(org.eclipse.core.resources.ISaveContext) */ + @Override public void prepareToSave(ISaveContext context) throws CoreException {} /** * @see org.eclipse.core.resources.ISaveParticipant#rollback(org.eclipse.core.resources.ISaveContext) */ + @Override public void rollback(ISaveContext context) {} /** * @see org.eclipse.core.resources.ISaveParticipant#saving(org.eclipse.core.resources.ISaveContext) */ + @Override public void saving(ISaveContext context) throws CoreException { try { DebugUIPlugin.getDefault().getPreferenceStore().putValue(IInternalDebugUIConstants.PREF_LAUNCH_PERSPECTIVES, generatePerspectiveXML()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SaveScopeResourcesHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SaveScopeResourcesHandler.java index 5e692cc09..e496a1017 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SaveScopeResourcesHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SaveScopeResourcesHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -86,6 +86,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getContentProvider() */ + @Override protected IContentProvider getContentProvider() { return fContentProvider; } @@ -93,6 +94,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getLabelProvider() */ + @Override protected IBaseLabelProvider getLabelProvider() { return fLabelProvider; } @@ -100,6 +102,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getDialogSettingsId() */ + @Override protected String getDialogSettingsId() { return SETTINGS_ID; } @@ -107,6 +110,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SELECT_RESOURCES_TO_SAVE_DIALOG; } @@ -114,6 +118,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerInput() */ + @Override protected Object getViewerInput() { return fInput; } @@ -121,6 +126,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerLabel() */ + @Override protected String getViewerLabel() { return LaunchConfigurationsMessages.SaveScopeResourcesHandler_2; } @@ -128,11 +134,13 @@ public class SaveScopeResourcesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugCheckboxSelectionDialog#addCustomFooterControls(org.eclipse.swt.widgets.Composite) */ + @Override protected void addCustomFooterControls(Composite parent) { super.addCustomFooterControls(parent); fSavePref = new Button(parent, SWT.CHECK); fSavePref.setText(LaunchConfigurationsMessages.SaveScopeResourcesHandler_1); fSavePref.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { getCheckBoxTableViewer().setAllChecked(fSavePref.getSelection()); } @@ -142,6 +150,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugCheckboxSelectionDialog#okPressed() */ + @Override protected void okPressed() { IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore(); String val = (fSavePref.getSelection() ? MessageDialogWithToggle.ALWAYS : MessageDialogWithToggle.PROMPT); @@ -152,6 +161,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugCheckboxSelectionDialog#addViewerListeners(org.eclipse.jface.viewers.StructuredViewer) */ + @Override protected void addViewerListeners(StructuredViewer viewer) { // Override to remove listener that affects the ok button } @@ -159,6 +169,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.AbstractDebugCheckboxSelectionDialog#isValid() */ + @Override protected boolean isValid() { return true; } @@ -175,6 +186,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { * * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus(IStatus status, Object source) throws CoreException { // retrieve config and projects ILaunchConfiguration config = null; @@ -202,7 +214,8 @@ public class SaveScopeResourcesHandler implements IStatusHandler { return Boolean.FALSE; } else { - boolean cancel = DebugUIPlugin.preLaunchSave(); + @SuppressWarnings("deprecation") + boolean cancel = DebugUIPlugin.preLaunchSave(); return Boolean.valueOf(cancel); } } @@ -215,7 +228,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { * @return the list of dirty editors for this launch to save, never null */ protected IResource[] getScopedDirtyResources(IProject[] projects) { - HashSet dirtyres = new HashSet(); + HashSet<IResource> dirtyres = new HashSet<IResource>(); IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows(); for(int l = 0; l < windows.length; l++) { IWorkbenchPage[] pages = windows[l].getPages(); @@ -233,7 +246,7 @@ public class SaveScopeResourcesHandler implements IStatusHandler { } } } - return (IResource[])dirtyres.toArray(new IResource[dirtyres.size()]); + return dirtyres.toArray(new IResource[dirtyres.size()]); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectFavoritesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectFavoritesDialog.java index a01a608b8..b7e23a1a0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectFavoritesDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectFavoritesDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -40,6 +40,7 @@ public class SelectFavoritesDialog extends AbstractDebugCheckboxSelectionDialog * Content provider for table */ protected class LaunchConfigurationContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { ILaunchConfiguration[] all = null; try { @@ -48,7 +49,7 @@ public class SelectFavoritesDialog extends AbstractDebugCheckboxSelectionDialog DebugUIPlugin.log(e); return new ILaunchConfiguration[0]; } - List list = new ArrayList(all.length); + List<ILaunchConfiguration> list = new ArrayList<ILaunchConfiguration>(all.length); ViewerFilter filter = new LaunchGroupFilter(fHistory.getLaunchGroup()); for (int i = 0; i < all.length; i++) { if (filter.select(null, null, all[i])) { @@ -61,12 +62,14 @@ public class SelectFavoritesDialog extends AbstractDebugCheckboxSelectionDialog return objs; } + @Override public void dispose() {} + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} } private LaunchHistory fHistory; - private List fCurrentFavoriteSet; + private List<ILaunchConfiguration> fCurrentFavoriteSet; /** * Constructor @@ -74,11 +77,11 @@ public class SelectFavoritesDialog extends AbstractDebugCheckboxSelectionDialog * @param history * @param favorites */ - public SelectFavoritesDialog(Shell parentShell, LaunchHistory history, List favorites) { + public SelectFavoritesDialog(Shell parentShell, LaunchHistory history, List<ILaunchConfiguration> favorites) { super(parentShell); fHistory = history; fCurrentFavoriteSet = favorites; - setTitle(MessageFormat.format(LaunchConfigurationsMessages.FavoritesDialog_0, new String[]{getModeLabel()})); + setTitle(MessageFormat.format(LaunchConfigurationsMessages.FavoritesDialog_0, new Object[] { getModeLabel() })); setShowSelectAllButtons(true); } @@ -94,6 +97,7 @@ public class SelectFavoritesDialog extends AbstractDebugCheckboxSelectionDialog /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getDialogSettingsId() */ + @Override protected String getDialogSettingsId() { return IDebugUIConstants.PLUGIN_ID + ".SELECT_FAVORITESS_DIALOG"; //$NON-NLS-1$ } @@ -101,6 +105,7 @@ public class SelectFavoritesDialog extends AbstractDebugCheckboxSelectionDialog /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerInput() */ + @Override protected Object getViewerInput() { return fHistory.getLaunchGroup().getMode(); } @@ -108,6 +113,7 @@ public class SelectFavoritesDialog extends AbstractDebugCheckboxSelectionDialog /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getContentProvider() */ + @Override protected IContentProvider getContentProvider() { return new LaunchConfigurationContentProvider(); } @@ -115,6 +121,7 @@ public class SelectFavoritesDialog extends AbstractDebugCheckboxSelectionDialog /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SELECT_FAVORITES_DIALOG; } @@ -122,6 +129,7 @@ public class SelectFavoritesDialog extends AbstractDebugCheckboxSelectionDialog /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerLabel() */ + @Override protected String getViewerLabel() { return LaunchConfigurationsMessages.FavoritesDialog_7; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchModesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchModesDialog.java index d4d63ea9b..6b26abbc1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchModesDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchModesDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,7 @@ package org.eclipse.debug.internal.ui.launchConfigurations; import java.util.ArrayList; -import java.util.Iterator; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -41,19 +41,29 @@ public class SelectLaunchModesDialog extends AbstractDebugListSelectionDialog{ * Builds labels for list control */ class OptionsLabelProvider implements ILabelProvider { + @Override public Image getImage(Object element) {return null;} + @Override public String getText(Object element) { - Set modes = (Set) element; - List names = LaunchConfigurationPresentationManager.getDefault().getLaunchModeNames(modes); + Set<?> vals = (Set<?>) element; + Set<String> modes = new HashSet<String>(vals.size()); + for (Object o : vals) { + modes.add((String) o); + } + List<String> names = LaunchConfigurationPresentationManager.getDefault().getLaunchModeNames(modes); return names.toString(); } + @Override public void addListener(ILabelProviderListener listener) {} + @Override public void dispose() {} + @Override public boolean isLabelProperty(Object element, String property) {return false;} + @Override public void removeListener(ILabelProviderListener listener) {} } - private List fValidModes = null; + private List<Set<String>> fValidModes = null; /** * Constructor @@ -67,11 +77,9 @@ public class SelectLaunchModesDialog extends AbstractDebugListSelectionDialog{ super(parentShell); super.setTitle(LaunchConfigurationsMessages.SelectLaunchOptionsDialog_3); setShellStyle(getShellStyle() | SWT.RESIZE); - fValidModes = new ArrayList(); - Set modes = configuration.getType().getSupportedModeCombinations(); - Set modeset = null; - for(Iterator iter = modes.iterator(); iter.hasNext();) { - modeset = (Set) iter.next(); + fValidModes = new ArrayList<Set<String>>(); + Set<Set<String>> modes = configuration.getType().getSupportedModeCombinations(); + for (Set<String> modeset : modes) { if(modeset.contains(mode)) { fValidModes.add(modeset); } @@ -81,6 +89,7 @@ public class SelectLaunchModesDialog extends AbstractDebugListSelectionDialog{ /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getDialogSettingsId() */ + @Override protected String getDialogSettingsId() { return IDebugUIConstants.PLUGIN_ID + ".SELECT_LAUNCH_MODES_DIALOG"; //$NON-NLS-1$ } @@ -88,6 +97,7 @@ public class SelectLaunchModesDialog extends AbstractDebugListSelectionDialog{ /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getLabelProvider() */ + @Override protected IBaseLabelProvider getLabelProvider() { return new OptionsLabelProvider(); } @@ -95,6 +105,7 @@ public class SelectLaunchModesDialog extends AbstractDebugListSelectionDialog{ /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerInput() */ + @Override protected Object getViewerInput() { return fValidModes.toArray(); } @@ -102,6 +113,7 @@ public class SelectLaunchModesDialog extends AbstractDebugListSelectionDialog{ /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SELECT_LAUNCH_MODES_DIALOG; } @@ -109,6 +121,7 @@ public class SelectLaunchModesDialog extends AbstractDebugListSelectionDialog{ /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerLabel() */ + @Override protected String getViewerLabel() { return LaunchConfigurationsMessages.SelectLaunchOptionsDialog_4; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java index 5f4e403db..8d4826c70 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -58,7 +58,9 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { * Builds labels for table control */ class DelegatesLabelProvider implements ILabelProvider { + @Override public Image getImage(Object element) {return null;} + @Override public String getText(Object element) { if(element instanceof ILaunchDelegate) { ILaunchDelegate ldp = (ILaunchDelegate) element; @@ -70,9 +72,13 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { } return element.toString(); } + @Override public void addListener(ILabelProviderListener listener) {} + @Override public void dispose() {} + @Override public boolean isLabelProperty(Object element, String property) {return false;} + @Override public void removeListener(ILabelProviderListener listener) {} } @@ -98,6 +104,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#getInitialSize() */ + @Override protected Point getInitialSize() { IDialogSettings settings = getDialogBoundsSettings(); if(settings != null) { @@ -118,6 +125,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getDialogSettingsId() */ + @Override protected String getDialogSettingsId() { return IDebugUIConstants.PLUGIN_ID + ".SELECT_LAUNCHERS_DIALOG"; //$NON-NLS-1$ } @@ -125,6 +133,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SELECT_LAUNCHERS_DIALOG; } @@ -132,6 +141,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getLabelProvider() */ + @Override protected IBaseLabelProvider getLabelProvider() { return new DelegatesLabelProvider(); } @@ -139,6 +149,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerInput() */ + @Override protected Object getViewerInput() { return fDelegates; } @@ -146,6 +157,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#addCustomHeaderControls(org.eclipse.swt.widgets.Composite) */ + @Override protected void addCustomHeaderControls(Composite parent) { Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 2, 1, GridData.FILL_HORIZONTAL, 0, 0); SWTFactory.createWrapLabel(comp, LaunchConfigurationsMessages.SelectLaunchersDialog_2, 2); @@ -157,6 +169,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { GridData gd = (GridData) this.configspecific.getLayoutData(); gd.grabExcessHorizontalSpace = true; this.configspecific.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { boolean checked = ((Button)e.widget).getSelection(); getViewer().getControl().setEnabled(checked); @@ -168,6 +181,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { link.setText(LaunchConfigurationsMessages.SelectLaunchersDialog_4); link.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false)); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { SWTFactory.showPreferencePage("org.eclipse.debug.ui.LaunchDelegatesPreferencePage"); //$NON-NLS-1$ if(!SelectLaunchersDialog.this.configspecific.getSelection()) { @@ -189,9 +203,10 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /** * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { ILaunchDelegate delegate = null; - Set modes = getCurrentModeSet(); + Set<String> modes = getCurrentModeSet(); if(configspecific.getSelection()) { delegate = getSelectedDelegate(); if(delegate != null) { @@ -231,6 +246,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#addCustomFooterControls(org.eclipse.swt.widgets.Composite) */ + @Override protected void addCustomFooterControls(Composite parent) { Group group = SWTFactory.createGroup(parent, LaunchConfigurationsMessages.SelectLaunchersDialog_5, 1, 1, GridData.FILL_BOTH); this.description = SWTFactory.createText(group, SWT.WRAP | SWT.READ_ONLY, 1, GridData.FILL_BOTH); @@ -240,8 +256,8 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /** * @return the complete set of modes that the associated launch configuration is concerned with */ - protected Set getCurrentModeSet() { - Set modes = new HashSet(); + protected Set<String> getCurrentModeSet() { + Set<String> modes = new HashSet<String>(); try { modes = fConfiguration.getModes(); modes.add(fLaunchMode); @@ -253,9 +269,11 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.AbstractDebugCheckboxSelectionDialog#addViewerListeners(org.eclipse.jface.viewers.StructuredViewer) */ + @Override protected void addViewerListeners(StructuredViewer viewer) { // Override super to use custom listeners viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection ss = (IStructuredSelection) event.getSelection(); if(ss != null && !ss.isEmpty()) { @@ -272,6 +290,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#initializeControls() */ + @Override protected void initializeControls() { final Viewer viewer = getViewer(); try { @@ -291,6 +310,7 @@ public class SelectLaunchersDialog extends AbstractDebugListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerLabel() */ + @Override protected String getViewerLabel() { return LaunchConfigurationsMessages.SelectLaunchersDialog_launchers; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetComparator.java index d1a89c6af..2de39f6b4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetComparator.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetComparator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,14 +19,15 @@ import org.eclipse.ui.IWorkingSet; * Comparator for refresh scope launch configuration attribute * <code>ATTR_REFRESH_SCOPE</code>. */ -public class WorkingSetComparator implements Comparator { +public class WorkingSetComparator implements Comparator<String> { /* (non-Javadoc) * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ - public int compare(Object o1, Object o2) { - String one= (String)o1; - String two= (String)o2; + @Override + public int compare(String o1, String o2) { + String one= o1; + String two= o2; if (one == null || two == null) { if (one == two) { return 0; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetsFilter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetsFilter.java index 7220e1cfd..d57ce7108 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetsFilter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetsFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,6 +36,7 @@ public class WorkingSetsFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if(element instanceof ILaunchConfigurationType) { return true; @@ -60,7 +61,7 @@ public class WorkingSetsFilter extends ViewerFilter { return true; } //remove breakpoint working sets - ArrayList ws = new ArrayList(); + ArrayList<IWorkingSet> ws = new ArrayList<IWorkingSet>(); for (int i = 0; i < wsets.length; i++) { if(!IDebugUIConstants.BREAKPOINT_WORKINGSET_ID.equals(wsets[i].getId())) { ws.add(wsets[i]); @@ -70,7 +71,7 @@ public class WorkingSetsFilter extends ViewerFilter { return true; } for (int i = 0; i < resources.length; i++) { - if(workingSetContains((IWorkingSet[]) ws.toArray(new IWorkingSet[ws.size()]), resources[i])) { + if(workingSetContains(ws.toArray(new IWorkingSet[ws.size()]), resources[i])) { return true; } } @@ -88,7 +89,7 @@ public class WorkingSetsFilter extends ViewerFilter { * @since 3.2 */ public static boolean workingSetContains(IWorkingSet[] wsets, IResource res) { - ArrayList parents = new ArrayList(); + ArrayList<IResource> parents = new ArrayList<IResource>(); parents.add(res); while(res != null) { res = res.getParent(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingManager.java index 8590ebb0e..16eb2d14a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2008 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -37,147 +37,166 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingType; * @since 3.1 */ public class MemoryRenderingManager extends AbstractMemoryRenderingBindingsProvider implements IMemoryRenderingManager { - - // map of rendering type ids to valid rendering types - private Map fRenderingTypes = new HashMap(); - - // list of renderingBindings - private List fBindings = new ArrayList(); - - // singleton manager - private static MemoryRenderingManager fgDefault; - - // elements in the memory renderings extension point - public static final String ELEMENT_MEMORY_RENDERING_TYPE = "renderingType"; //$NON-NLS-1$ - public static final String ELEMENT_RENDERING_BINDINGS = "renderingBindings"; //$NON-NLS-1$ - - /** - * Returns the memory rendering manager. - * - * @return the memory rendering manager - */ - public static IMemoryRenderingManager getDefault() { - if (fgDefault == null) { - fgDefault = new MemoryRenderingManager(); - } - return fgDefault; - } - /** - * Construts a new memory rendering manager. Only to be called by DebugUIPlugin. - */ - private MemoryRenderingManager() { - initializeRenderings(); - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingManager#createRendering(java.lang.String) - */ - public IMemoryRendering createRendering(String id) throws CoreException { - IMemoryRenderingType type = getRenderingType(id); - if (type != null) { - return type.createRendering(); - } - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingManager#getRenderingTypes() - */ - public IMemoryRenderingType[] getRenderingTypes() { - Collection types = fRenderingTypes.values(); - return (IMemoryRenderingType[]) types.toArray(new IMemoryRenderingType[types.size()]); - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingManager#getRenderingType(java.lang.String) - */ - public IMemoryRenderingType getRenderingType(String id) { - return (IMemoryRenderingType) fRenderingTypes.get(id); - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#getDefaultRenderingTypes(org.eclipse.debug.core.model.IMemoryBlock) - */ - public IMemoryRenderingType[] getDefaultRenderingTypes(IMemoryBlock block) { - List allTypes = new ArrayList(); - Iterator iterator = fBindings.iterator(); - while (iterator.hasNext()) { - RenderingBindings binding = (RenderingBindings)iterator.next(); - IMemoryRenderingType[] renderingTypes = binding.getDefaultRenderingTypes(block); - for (int i = 0; i < renderingTypes.length; i++) { - IMemoryRenderingType type = renderingTypes[i]; - if (!allTypes.contains(type)) { - allTypes.add(type); - } - } - } - return (IMemoryRenderingType[]) allTypes.toArray(new IMemoryRenderingType[allTypes.size()]); - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#getPrimaryRenderingType(org.eclipse.debug.core.model.IMemoryBlock) - */ - public IMemoryRenderingType getPrimaryRenderingType(IMemoryBlock block) { - Iterator iterator = fBindings.iterator(); - while (iterator.hasNext()) { - RenderingBindings binding = (RenderingBindings)iterator.next(); - IMemoryRenderingType renderingType = binding.getPrimaryRenderingType(block); - if (renderingType != null) { - return renderingType; - } - } - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#getRenderingTypes(org.eclipse.debug.core.model.IMemoryBlock) - */ - public IMemoryRenderingType[] getRenderingTypes(IMemoryBlock block) { - List allTypes = new ArrayList(); - Iterator iterator = fBindings.iterator(); - while (iterator.hasNext()) { - RenderingBindings binding = (RenderingBindings)iterator.next(); - IMemoryRenderingType[] renderingTypes = binding.getRenderingTypes(block); - for (int i = 0; i < renderingTypes.length; i++) { - IMemoryRenderingType type = renderingTypes[i]; - if (!allTypes.contains(type)) { - allTypes.add(type); - } - } - } - return (IMemoryRenderingType[]) allTypes.toArray(new IMemoryRenderingType[allTypes.size()]); - } - - /** - * Processes memory rendering contributions. - */ - private void initializeRenderings() { - IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_MEMORY_RENDERINGS); - IConfigurationElement[] configurationElements = extensionPoint.getConfigurationElements(); - for (int i = 0; i < configurationElements.length; i++) { - IConfigurationElement element= configurationElements[i]; - String name = element.getName(); - if (name.equals(ELEMENT_MEMORY_RENDERING_TYPE)) { - MemoryRenderingType type = new MemoryRenderingType(element); - try { - type.validate(); - fRenderingTypes.put(type.getId(), type); - } catch (CoreException e) { - DebugUIPlugin.log(e); - } - } else if (name.equals(ELEMENT_RENDERING_BINDINGS)) { - RenderingBindings bindings = new RenderingBindings(element); - try { - bindings.validate(); - fBindings.add(bindings); + + // map of rendering type ids to valid rendering types + private Map<String, MemoryRenderingType> fRenderingTypes = new HashMap<String, MemoryRenderingType>(); + + // list of renderingBindings + private List<RenderingBindings> fBindings = new ArrayList<RenderingBindings>(); + + // singleton manager + private static MemoryRenderingManager fgDefault; + + // elements in the memory renderings extension point + public static final String ELEMENT_MEMORY_RENDERING_TYPE = "renderingType"; //$NON-NLS-1$ + public static final String ELEMENT_RENDERING_BINDINGS = "renderingBindings"; //$NON-NLS-1$ + + /** + * Returns the memory rendering manager. + * + * @return the memory rendering manager + */ + public static IMemoryRenderingManager getDefault() { + if (fgDefault == null) { + fgDefault = new MemoryRenderingManager(); + } + return fgDefault; + } + + /** + * Construts a new memory rendering manager. Only to be called by + * DebugUIPlugin. + */ + private MemoryRenderingManager() { + initializeRenderings(); + } + + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.memory.IMemoryRenderingManager#createRendering(java + * .lang.String) + */ + public IMemoryRendering createRendering(String id) throws CoreException { + IMemoryRenderingType type = getRenderingType(id); + if (type != null) { + return type.createRendering(); + } + return null; + } + + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.memory.IMemoryRenderingManager#getRenderingTypes() + */ + @Override + public IMemoryRenderingType[] getRenderingTypes() { + Collection<MemoryRenderingType> types = fRenderingTypes.values(); + return types.toArray(new IMemoryRenderingType[types.size()]); + } + + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.memory.IMemoryRenderingManager#getRenderingType( + * java.lang.String) + */ + @Override + public IMemoryRenderingType getRenderingType(String id) { + return fRenderingTypes.get(id); + } + + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider# + * getDefaultRenderingTypes(org.eclipse.debug.core.model.IMemoryBlock) + */ + @Override + public IMemoryRenderingType[] getDefaultRenderingTypes(IMemoryBlock block) { + List<IMemoryRenderingType> allTypes = new ArrayList<IMemoryRenderingType>(); + Iterator<RenderingBindings> iterator = fBindings.iterator(); + while (iterator.hasNext()) { + RenderingBindings binding = iterator.next(); + IMemoryRenderingType[] renderingTypes = binding.getDefaultRenderingTypes(block); + for (int i = 0; i < renderingTypes.length; i++) { + IMemoryRenderingType type = renderingTypes[i]; + if (!allTypes.contains(type)) { + allTypes.add(type); + } + } + } + return allTypes.toArray(new IMemoryRenderingType[allTypes.size()]); + } + + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider# + * getPrimaryRenderingType(org.eclipse.debug.core.model.IMemoryBlock) + */ + @Override + public IMemoryRenderingType getPrimaryRenderingType(IMemoryBlock block) { + for (RenderingBindings binding : fBindings) { + IMemoryRenderingType renderingType = binding.getPrimaryRenderingType(block); + if (renderingType != null) { + return renderingType; + } + } + return null; + } + + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider# + * getRenderingTypes(org.eclipse.debug.core.model.IMemoryBlock) + */ + @Override + public IMemoryRenderingType[] getRenderingTypes(IMemoryBlock block) { + List<IMemoryRenderingType> allTypes = new ArrayList<IMemoryRenderingType>(); + for (RenderingBindings binding : fBindings) { + IMemoryRenderingType[] renderingTypes = binding.getRenderingTypes(block); + for (int i = 0; i < renderingTypes.length; i++) { + IMemoryRenderingType type = renderingTypes[i]; + if (!allTypes.contains(type)) { + allTypes.add(type); + } + } + } + return allTypes.toArray(new IMemoryRenderingType[allTypes.size()]); + } + + /** + * Processes memory rendering contributions. + */ + private void initializeRenderings() { + IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_MEMORY_RENDERINGS); + IConfigurationElement[] configurationElements = extensionPoint.getConfigurationElements(); + for (int i = 0; i < configurationElements.length; i++) { + IConfigurationElement element = configurationElements[i]; + String name = element.getName(); + if (name.equals(ELEMENT_MEMORY_RENDERING_TYPE)) { + MemoryRenderingType type = new MemoryRenderingType(element); + try { + type.validate(); + fRenderingTypes.put(type.getId(), type); + } catch (CoreException e) { + DebugUIPlugin.log(e); + } + } else if (name.equals(ELEMENT_RENDERING_BINDINGS)) { + RenderingBindings bindings = new RenderingBindings(element); + try { + bindings.validate(); + fBindings.add(bindings); bindings.addListener(new IMemoryRenderingBindingsListener() { + @Override public void memoryRenderingBindingsChanged() { fireBindingsChanged(); - }}); - } catch (CoreException e) { - DebugUIPlugin.log(e); - } - } - } - } + } + }); + } catch (CoreException e) { + DebugUIPlugin.log(e); + } + } + } + } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingType.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingType.java index 85a743eed..5ab614a43 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingType.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingType.java @@ -45,21 +45,24 @@ class MemoryRenderingType implements IMemoryRenderingType { /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingType#getLabel() */ - public String getLabel() { + @Override + public String getLabel() { return fConfigurationElement.getAttribute(ATTR_MEM_RENDERING_TYPE_NAME); } /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingType#getId() */ - public String getId() { + @Override + public String getId() { return fConfigurationElement.getAttribute(ATTR_MEM_RENDERING_TYPE_ID); } /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingType#createRendering() */ - public IMemoryRendering createRendering() throws CoreException { + @Override + public IMemoryRendering createRendering() throws CoreException { if (fDelegate == null) { fDelegate = (IMemoryRenderingTypeDelegate) fConfigurationElement.createExecutableExtension(ATTR_MEM_RENDERING_TYPE_DELEGATE); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/RenderingBindings.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/RenderingBindings.java index 9a0f2b514..2d9d4b31f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/RenderingBindings.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/RenderingBindings.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2011 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -33,263 +33,269 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingManager; import org.eclipse.debug.ui.memory.IMemoryRenderingType; /** - * Represents a renderingBindings element of a memoryRenderings - * contribution. + * Represents a renderingBindings element of a memoryRenderings contribution. * * @since 3.1 */ class RenderingBindings extends AbstractMemoryRenderingBindingsProvider implements IMemoryRenderingBindingsProvider { - - // element - protected IConfigurationElement fConfigurationElement; - - // cached rendering ids - private IMemoryRenderingType[] fAllTypes; - private IMemoryRenderingType[] fRenderingTypes; - private IMemoryRenderingType[] fDefaultTypes; - - // rendering type provider, or null (optional) - private IMemoryRenderingBindingsProvider fProvider; - - // optional exprssion - private Expression fExpression; - - // element attribute - public static final String ATTR_RENDERING_IDS = "renderingIds"; //$NON-NLS-1$ - public static final String ATTR_DEFAULT_IDS = "defaultIds"; //$NON-NLS-1$ - public static final String ATTR_PRIMARY = "primaryId"; //$NON-NLS-1$ - public static final String ATTR_PROVIDER = "class"; //$NON-NLS-1$ - - // empty bindings - private static final IMemoryRenderingType[] EMPTY = new IMemoryRenderingType[0]; - - /** - * Constructs a bindings element from the given contribution. - * - * @param element contribution - */ - RenderingBindings(IConfigurationElement element) { - fConfigurationElement = element; - } - - /** - * Returns the non-default bindings specified by this contribution. - * - * @return the non-default bindings specified by this contribution - */ - private IMemoryRenderingType[] getBindings() { - if (fRenderingTypes == null) { - String ids = fConfigurationElement.getAttribute(ATTR_RENDERING_IDS); - List list = new ArrayList(); - IMemoryRenderingManager manager = getManager(); - if (ids != null) { - String[] strings = ids.split(","); //$NON-NLS-1$ - for (int i = 0; i < strings.length; i++) { - String id = strings[i].trim(); - IMemoryRenderingType type = manager.getRenderingType(id); - if (type != null) { - list.add(type); - } - } - } - // remove any default bindings, in case of duplicate specification - IMemoryRenderingType[] defaultBindings = getDefaultBindings(); - for (int i = 0; i < defaultBindings.length; i++) { - list.remove(defaultBindings[i]); - } - fRenderingTypes = (IMemoryRenderingType[]) list.toArray(new IMemoryRenderingType[list.size()]); - } - return fRenderingTypes; - } - - /** - * Returns the default bindings specified by this contribution. - * - * @return the default bindings specified by this contribution - */ - private IMemoryRenderingType[] getDefaultBindings() { - if (fDefaultTypes == null) { - String ids = fConfigurationElement.getAttribute(ATTR_DEFAULT_IDS); - List list = new ArrayList(); - IMemoryRenderingManager manager = getManager(); - if (ids != null) { - String[] strings = ids.split(","); //$NON-NLS-1$ - for (int i = 0; i < strings.length; i++) { - String id = strings[i].trim(); - IMemoryRenderingType type = manager.getRenderingType(id); - if (type != null) { - list.add(type); - } - } - } - // the primary is also considered a default rendering - String primaryId = getPrimaryId(); - if (primaryId != null) { - IMemoryRenderingType type = manager.getRenderingType(primaryId); - if (type != null) { - list.add(type); - } - } - fDefaultTypes = (IMemoryRenderingType[]) list.toArray(new IMemoryRenderingType[list.size()]); - } - return fDefaultTypes; - } - - /** - * Returns the primary id, or <code>null</code> if none. - * - * @return the primary id, or <code>null</code> if none - */ - private String getPrimaryId() { - return fConfigurationElement.getAttribute(ATTR_PRIMARY); - } - - /** - * Returns the provider for this binding or <code>null</code> of none. - * - * @return the provider for this binding or <code>null</code> of none - */ - protected IMemoryRenderingBindingsProvider getProvider(IMemoryBlock memoryBlock) { - if (isBound(memoryBlock)) - { - if (fProvider == null) { - String name = fConfigurationElement.getAttribute(ATTR_PROVIDER); - if (name != null) { - try { - fProvider = (IMemoryRenderingBindingsProvider) fConfigurationElement.createExecutableExtension(ATTR_PROVIDER); - } catch (CoreException e) { - DebugUIPlugin.log(e); - } - } - - if (fProvider != null) - { + + // element + protected IConfigurationElement fConfigurationElement; + + // cached rendering ids + private IMemoryRenderingType[] fAllTypes; + private IMemoryRenderingType[] fRenderingTypes; + private IMemoryRenderingType[] fDefaultTypes; + + // rendering type provider, or null (optional) + private IMemoryRenderingBindingsProvider fProvider; + + // optional exprssion + private Expression fExpression; + + // element attribute + public static final String ATTR_RENDERING_IDS = "renderingIds"; //$NON-NLS-1$ + public static final String ATTR_DEFAULT_IDS = "defaultIds"; //$NON-NLS-1$ + public static final String ATTR_PRIMARY = "primaryId"; //$NON-NLS-1$ + public static final String ATTR_PROVIDER = "class"; //$NON-NLS-1$ + + // empty bindings + private static final IMemoryRenderingType[] EMPTY = new IMemoryRenderingType[0]; + + /** + * Constructs a bindings element from the given contribution. + * + * @param element contribution + */ + RenderingBindings(IConfigurationElement element) { + fConfigurationElement = element; + } + + /** + * Returns the non-default bindings specified by this contribution. + * + * @return the non-default bindings specified by this contribution + */ + private IMemoryRenderingType[] getBindings() { + if (fRenderingTypes == null) { + String ids = fConfigurationElement.getAttribute(ATTR_RENDERING_IDS); + List<IMemoryRenderingType> list = new ArrayList<IMemoryRenderingType>(); + IMemoryRenderingManager manager = getManager(); + if (ids != null) { + String[] strings = ids.split(","); //$NON-NLS-1$ + for (int i = 0; i < strings.length; i++) { + String id = strings[i].trim(); + IMemoryRenderingType type = manager.getRenderingType(id); + if (type != null) { + list.add(type); + } + } + } + // remove any default bindings, in case of duplicate specification + IMemoryRenderingType[] defaultBindings = getDefaultBindings(); + for (int i = 0; i < defaultBindings.length; i++) { + list.remove(defaultBindings[i]); + } + fRenderingTypes = list.toArray(new IMemoryRenderingType[list.size()]); + } + return fRenderingTypes; + } + + /** + * Returns the default bindings specified by this contribution. + * + * @return the default bindings specified by this contribution + */ + private IMemoryRenderingType[] getDefaultBindings() { + if (fDefaultTypes == null) { + String ids = fConfigurationElement.getAttribute(ATTR_DEFAULT_IDS); + List<IMemoryRenderingType> list = new ArrayList<IMemoryRenderingType>(); + IMemoryRenderingManager manager = getManager(); + if (ids != null) { + String[] strings = ids.split(","); //$NON-NLS-1$ + for (int i = 0; i < strings.length; i++) { + String id = strings[i].trim(); + IMemoryRenderingType type = manager.getRenderingType(id); + if (type != null) { + list.add(type); + } + } + } + // the primary is also considered a default rendering + String primaryId = getPrimaryId(); + if (primaryId != null) { + IMemoryRenderingType type = manager.getRenderingType(primaryId); + if (type != null) { + list.add(type); + } + } + fDefaultTypes = list.toArray(new IMemoryRenderingType[list.size()]); + } + return fDefaultTypes; + } + + /** + * Returns the primary id, or <code>null</code> if none. + * + * @return the primary id, or <code>null</code> if none + */ + private String getPrimaryId() { + return fConfigurationElement.getAttribute(ATTR_PRIMARY); + } + + /** + * Returns the provider for this binding or <code>null</code> of none. + * + * @return the provider for this binding or <code>null</code> of none + */ + protected IMemoryRenderingBindingsProvider getProvider(IMemoryBlock memoryBlock) { + if (isBound(memoryBlock)) { + if (fProvider == null) { + String name = fConfigurationElement.getAttribute(ATTR_PROVIDER); + if (name != null) { + try { + fProvider = (IMemoryRenderingBindingsProvider) fConfigurationElement.createExecutableExtension(ATTR_PROVIDER); + } catch (CoreException e) { + DebugUIPlugin.log(e); + } + } + + if (fProvider != null) { fProvider.addListener(new IMemoryRenderingBindingsListener() { + @Override public void memoryRenderingBindingsChanged() { fireBindingsChanged(); - }}); + } + }); } - } + } } return fProvider; - } - - /** - * Returns whether this binding is applies to the given memory block. - * - * @param block memory block - * @return whether this binding is applies to the given memory block - */ - private boolean isBound(IMemoryBlock block) { - Expression expression = getExpression(); - if (expression != null) { - IEvaluationContext context = DebugUIPlugin.createEvaluationContext(block); - try { - return expression.evaluate(context) == EvaluationResult.TRUE; - } catch (CoreException e) { - DebugUIPlugin.log(e); - return false; - } - } - return true; - } - - /** - * Validates this contribution. - * - * @exception CoreException if invalid - */ - void validate() throws CoreException { - if (fConfigurationElement.getAttribute(ATTR_PROVIDER) != null) { - if (fConfigurationElement.getAttribute(ATTR_RENDERING_IDS) != null || - fConfigurationElement.getAttribute(ATTR_DEFAULT_IDS) != null || - fConfigurationElement.getAttribute(ATTR_PRIMARY) != null) { - Status status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, - "<renderingBindings> element cannot specify other attributes when " + ATTR_PROVIDER + " is present", null); //$NON-NLS-1$ //$NON-NLS-2$ - throw new CoreException(status); - } - } - } - - /** - * Returns this binding's enablement expression, or <code>null</code> if none. - * - * @return enablement expression, or <code>null</code> if none - */ - private Expression getExpression() { - if (fExpression == null) { - IConfigurationElement[] elements = fConfigurationElement.getChildren(ExpressionTagNames.ENABLEMENT); - IConfigurationElement enablement = elements.length > 0 ? elements[0] : null; - if (enablement != null) { - try { - fExpression = ExpressionConverter.getDefault().perform(enablement); - } catch (CoreException e) { - DebugUIPlugin.log(e); - } - } - } - return fExpression; - } + } + + /** + * Returns whether this binding is applies to the given memory block. + * + * @param block memory block + * @return whether this binding is applies to the given memory block + */ + private boolean isBound(IMemoryBlock block) { + Expression expression = getExpression(); + if (expression != null) { + IEvaluationContext context = DebugUIPlugin.createEvaluationContext(block); + try { + return expression.evaluate(context) == EvaluationResult.TRUE; + } catch (CoreException e) { + DebugUIPlugin.log(e); + return false; + } + } + return true; + } + + /** + * Validates this contribution. + * + * @exception CoreException if invalid + */ + void validate() throws CoreException { + if (fConfigurationElement.getAttribute(ATTR_PROVIDER) != null) { + if (fConfigurationElement.getAttribute(ATTR_RENDERING_IDS) != null || fConfigurationElement.getAttribute(ATTR_DEFAULT_IDS) != null || fConfigurationElement.getAttribute(ATTR_PRIMARY) != null) { + Status status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "<renderingBindings> element cannot specify other attributes when " + ATTR_PROVIDER + " is present", null); //$NON-NLS-1$ //$NON-NLS-2$ + throw new CoreException(status); + } + } + } + + /** + * Returns this binding's enablement expression, or <code>null</code> if + * none. + * + * @return enablement expression, or <code>null</code> if none + */ + private Expression getExpression() { + if (fExpression == null) { + IConfigurationElement[] elements = fConfigurationElement.getChildren(ExpressionTagNames.ENABLEMENT); + IConfigurationElement enablement = elements.length > 0 ? elements[0] : null; + if (enablement != null) { + try { + fExpression = ExpressionConverter.getDefault().perform(enablement); + } catch (CoreException e) { + DebugUIPlugin.log(e); + } + } + } + return fExpression; + } + + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider# + * getRenderingTypes(org.eclipse.debug.core.model.IMemoryBlock) + */ + @Override + public IMemoryRenderingType[] getRenderingTypes(IMemoryBlock block) { + if (isBound(block)) { + IMemoryRenderingBindingsProvider provider = getProvider(block); + if (provider == null) { + if (fAllTypes == null) { + IMemoryRenderingType[] defaultBindings = getDefaultBindings(); + IMemoryRenderingType[] bindings = getBindings(); + fAllTypes = new IMemoryRenderingType[defaultBindings.length + bindings.length]; + for (int i = 0; i < defaultBindings.length; i++) { + fAllTypes[i] = defaultBindings[i]; + } + for (int i = 0, j = defaultBindings.length; i < bindings.length; i++, j++) { + fAllTypes[j] = bindings[i]; + } + } + return fAllTypes; + } + return provider.getRenderingTypes(block); + } + return EMPTY; + } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#getRenderingTypes(org.eclipse.debug.core.model.IMemoryBlock) - */ - public IMemoryRenderingType[] getRenderingTypes(IMemoryBlock block) { - if (isBound(block)) { - IMemoryRenderingBindingsProvider provider = getProvider(block); - if (provider == null) { - if (fAllTypes == null) { - IMemoryRenderingType[] defaultBindings = getDefaultBindings(); - IMemoryRenderingType[] bindings = getBindings(); - fAllTypes = new IMemoryRenderingType[defaultBindings.length + bindings.length]; - for (int i = 0; i < defaultBindings.length; i++) { - fAllTypes[i] = defaultBindings[i]; - } - for (int i = 0, j = defaultBindings.length; i < bindings.length; i++, j++) { - fAllTypes[j] = bindings[i]; - } - } - return fAllTypes; - } - return provider.getRenderingTypes(block); - } - return EMPTY; - } + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider# + * getDefaultRenderingTypes(org.eclipse.debug.core.model.IMemoryBlock) + */ + @Override + public IMemoryRenderingType[] getDefaultRenderingTypes(IMemoryBlock block) { + if (isBound(block)) { + IMemoryRenderingBindingsProvider provider = getProvider(block); + if (provider == null) { + return getDefaultBindings(); + } + return provider.getDefaultRenderingTypes(block); + } + return EMPTY; + } + + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider# + * getPrimaryRenderingType(org.eclipse.debug.core.model.IMemoryBlock) + */ + @Override + public IMemoryRenderingType getPrimaryRenderingType(IMemoryBlock block) { + if (isBound(block)) { + IMemoryRenderingBindingsProvider provider = getProvider(block); + if (provider == null) { + String primaryId = getPrimaryId(); + if (primaryId != null) { + return getManager().getRenderingType(primaryId); + } + } else { + return provider.getPrimaryRenderingType(block); + } + } + return null; + } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#getDefaultRenderingTypes(org.eclipse.debug.core.model.IMemoryBlock) - */ - public IMemoryRenderingType[] getDefaultRenderingTypes(IMemoryBlock block) { - if (isBound(block)) { - IMemoryRenderingBindingsProvider provider = getProvider(block); - if (provider == null) { - return getDefaultBindings(); - } - return provider.getDefaultRenderingTypes(block); - } - return EMPTY; - } + private IMemoryRenderingManager getManager() { + return DebugUITools.getMemoryRenderingManager(); + } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#getPrimaryRenderingType(org.eclipse.debug.core.model.IMemoryBlock) - */ - public IMemoryRenderingType getPrimaryRenderingType(IMemoryBlock block) { - if (isBound(block)) { - IMemoryRenderingBindingsProvider provider = getProvider(block); - if (provider == null) { - String primaryId = getPrimaryId(); - if (primaryId != null) { - return getManager().getRenderingType(primaryId); - } - } else { - return provider.getPrimaryRenderingType(block); - } - } - return null; - } - - private IMemoryRenderingManager getManager() { - return DebugUITools.getMemoryRenderingManager(); - } - } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java index b9ef8cb9f..e7bc9874a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.debug.internal.ui.memory.provisional; - import java.math.BigInteger; import java.util.ArrayList; import java.util.Iterator; @@ -134,6 +133,7 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; +import org.eclipse.ui.contexts.IContextActivation; import org.eclipse.ui.contexts.IContextService; import org.eclipse.ui.dialogs.PropertyDialogAction; import org.eclipse.ui.model.IWorkbenchAdapter; @@ -143,100 +143,98 @@ import org.eclipse.ui.progress.UIJob; /** * Abstract implementation of a table rendering. * <p> - * Clients should subclass from this class if they wish to provide a - * table rendering. + * Clients should subclass from this class if they wish to provide a table + * rendering. * </p> * <p> - * + * * The label of the rendering is constructed by retrieving the expression from - * <code>IMemoryBlockExtension</code>. For IMemoryBlock, the label is constructed - * using the memory block's start address. + * <code>IMemoryBlockExtension</code>. For IMemoryBlock, the label is + * constructed using the memory block's start address. * * This rendering manages the change states of its memory bytes if the memory - * block does not opt to manage the change states. For IMemoryBlockExtension, if - * the memory block returns false when #supportsChangeManagement() is called, this - * rendering will calculate the change state for each byte when its content is updated. - * Clients may manages the change states of its memory block by returning true when - * #supportsChangeManagement() is called. This will cause this rendering to stop - * calculating the change states of the memory block. Instead it would rely on the - * attributes returned in the MemoryByte array to determine if a byte has changed. - * For IMemoryBlock, this rendering will manage the change states its content. + * block does not opt to manage the change states. For IMemoryBlockExtension, if + * the memory block returns false when #supportsChangeManagement() is called, + * this rendering will calculate the change state for each byte when its content + * is updated. Clients may manages the change states of its memory block by + * returning true when #supportsChangeManagement() is called. This will cause + * this rendering to stop calculating the change states of the memory block. + * Instead it would rely on the attributes returned in the MemoryByte array to + * determine if a byte has changed. For IMemoryBlock, this rendering will manage + * the change states its content. + * + * When firing change event, be aware of the following: - whenever a change + * event is fired, the content provider for Memory View view checks to see if + * memory has actually changed. - If memory has actually changed, a refresh will + * commence. Changes to the memory block will be computed and will be shown with + * the delta icons. - If memory has not changed, content will not be refreshed. + * However, previous delta information will be erased. The screen will be + * refreshed to show that no memory has been changed. (All delta icons will be + * removed.) * - * When firing change event, be aware of the following: - * - whenever a change event is fired, the content provider for Memory View - * view checks to see if memory has actually changed. - * - If memory has actually changed, a refresh will commence. Changes to the memory block - * will be computed and will be shown with the delta icons. - * - If memory has not changed, content will not be refreshed. However, previous delta information - * will be erased. The screen will be refreshed to show that no memory has been changed. (All - * delta icons will be removed.) - * * Please note that these APIs will be called multiple times by the Memory View. - * To improve performance, debug adapters need to cache the content of its memory block and only - * retrieve updated data when necessary. + * To improve performance, debug adapters need to cache the content of its + * memory block and only retrieve updated data when necessary. * </p> - + * * @since 3.2 */ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRendering implements IPropertyChangeListener, IResettableMemoryRendering { /** - * Property identifier for the selected address in a table rendering - * This property is used for synchronization between renderings. + * Property identifier for the selected address in a table rendering This + * property is used for synchronization between renderings. */ public static final String PROPERTY_SELECTED_ADDRESS = AbstractTableRendering.PROPERTY_SELECTED_ADDRESS; - + /** - * Property identifier for the column size in a table rendering - * This property is used for synchronization between renderings. + * Property identifier for the column size in a table rendering This + * property is used for synchronization between renderings. */ public static final String PROPERTY_COL_SIZE = AbstractTableRendering.PROPERTY_COL_SIZE; - + /** - * Property identifier for the top row address in a table rendering. - * This property is used for synchronization between renderings. + * Property identifier for the top row address in a table rendering. This + * property is used for synchronization between renderings. */ public static final String PROPERTY_TOP_ADDRESS = AbstractTableRendering.PROPERTY_TOP_ADDRESS; - + private static final String ID_ASYNC_TABLE_RENDERING_CONTEXT = "org.eclipse.debug.ui.memory.abstractasynctablerendering"; //$NON-NLS-1$ private static final String ID_GO_TO_ADDRESS_COMMAND = "org.eclipse.debug.ui.command.gotoaddress"; //$NON-NLS-1$ private static final String ID_NEXT_PAGE_COMMAND = "org.eclipse.debug.ui.command.nextpage"; //$NON-NLS-1$ private static final String ID_PREV_PAGE_COMMAND = "org.eclipse.debug.ui.command.prevpage"; //$NON-NLS-1$ - + /** - * Property identifier for the row size in a table rendering - * This property is used for synchronization between renderings. + * Property identifier for the row size in a table rendering This property + * is used for synchronization between renderings. */ public static final String PROPERTY_ROW_SIZE = AbstractTableRendering.PROPERTY_ROW_SIZE; private static final int DEFAULT_BUFFER_THRESHOLD = 1; - + private boolean fActivated = false; - -// TODO: review use of MemorySegment, need to be careful to ensure flexible hierarchy - + + // TODO: review use of MemorySegment, need to be careful to ensure flexible + // hierarchy + private class ToggleAddressColumnAction extends Action { public ToggleAddressColumnAction() { super(); - PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID - + ".ShowAddressColumnAction_context"); //$NON-NLS-1$ + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".ShowAddressColumnAction_context"); //$NON-NLS-1$ updateActionLabel(); } /* * (non-Javadoc) - * * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { fIsShowAddressColumn = !fIsShowAddressColumn; - if (!fIsShowAddressColumn) - { + if (!fIsShowAddressColumn) { fTableViewer.getTable().getColumn(0).setWidth(0); - } - else - { + } else { fTableViewer.getTable().getColumn(0).pack(); } updateActionLabel(); @@ -247,56 +245,54 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende */ private void updateActionLabel() { if (fIsShowAddressColumn) { - setText(DebugUIMessages.ShowAddressColumnAction_0); + setText(DebugUIMessages.ShowAddressColumnAction_0); } else { - setText(DebugUIMessages.ShowAddressColumnAction_1); + setText(DebugUIMessages.ShowAddressColumnAction_1); } } } - - private class NextPageAction extends Action - { - private NextPageAction() - { + + private class NextPageAction extends Action { + private NextPageAction() { super(); setText(DebugUIMessages.AbstractTableRendering_4); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".NextPageAction_context"); //$NON-NLS-1$ } + @Override public void run() { BigInteger address = fContentDescriptor.getLoadAddress(); address = address.add(BigInteger.valueOf(getPageSizeInUnits())); handlePageStartAddressChanged(address); } } - - private class PrevPageAction extends Action - { - private PrevPageAction() - { + + private class PrevPageAction extends Action { + private PrevPageAction() { super(); setText(DebugUIMessages.AbstractTableRendering_6); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".PrevPageAction_context"); //$NON-NLS-1$ } + @Override public void run() { BigInteger address = fContentDescriptor.getLoadAddress(); address = address.subtract(BigInteger.valueOf(getPageSizeInUnits())); handlePageStartAddressChanged(address); } } - - private class RenderingGoToAddressAction extends GoToAddressAction - { + + private class RenderingGoToAddressAction extends GoToAddressAction { public RenderingGoToAddressAction(IMemoryRenderingContainer container, AbstractBaseTableRendering rendering) { super(container, rendering); } - + + @Override public void run() { showGoToAddressComposite(); } } - + private class SwitchPageJob extends UIJob { private Object fLock = new Object(); private boolean fShowMessagePage = false; @@ -308,39 +304,40 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende } private void setShowMessagePage(boolean showMsg) { - synchronized(fLock) - { + synchronized (fLock) { fShowMessagePage = showMsg; } } private void setMessage(String message) { - synchronized(fLock) - { + synchronized (fLock) { fMessage = message; } } + @Override public IStatus runInUIThread(IProgressMonitor monitor) { - - if (fPageBook.isDisposed()) + + if (fPageBook.isDisposed()) { return Status.OK_STATUS; - + } + String msgToShow = null; boolean showMsgPage = false; synchronized (fLock) { msgToShow = fMessage; showMsgPage = fShowMessagePage; } - + if (showMsgPage) { StyledText styleText = null; fShowMessage = true; styleText = fTextViewer.getTextWidget(); - if (styleText != null) + if (styleText != null) { styleText.setText(msgToShow); + } fPageBook.showPage(fTextViewer.getControl()); } else { fShowMessage = false; @@ -349,26 +346,32 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende return Status.OK_STATUS; } } - - - private class SerialByObjectRule implements ISchedulingRule - { - private Object fObject = null; - - public SerialByObjectRule(Object lock) { - fObject = lock; - } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse.core.runtime.jobs.ISchedulingRule) + private class SerialByObjectRule implements ISchedulingRule { + private Object fObject = null; + + public SerialByObjectRule(Object lock) { + fObject = lock; + } + + /* + * (non-Javadoc) + * @see + * org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse + * .core.runtime.jobs.ISchedulingRule) */ + @Override public boolean contains(ISchedulingRule rule) { return rule == this; } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule) + /* + * (non-Javadoc) + * @see + * org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse + * .core.runtime.jobs.ISchedulingRule) */ + @Override public boolean isConflicting(ISchedulingRule rule) { if (rule instanceof SerialByObjectRule) { SerialByObjectRule rRule = (SerialByObjectRule) rule; @@ -377,7 +380,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende return false; } } - + private PageBook fPageBook; private AsyncTableRenderingViewer fTableViewer; private TextViewer fTextViewer; @@ -395,7 +398,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende private int fPostBufferSize = -1; private SashForm fSashForm; private GoToAddressComposite fGoToAddressComposite; - + // actions private GoToAddressAction fGoToAddressAction; private PrintTableRenderingAction fPrintViewTabAction; @@ -407,137 +410,138 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende private PropertyDialogAction fPropertiesDialogAction; private NextPageAction fNextAction; private PrevPageAction fPrevAction; - - private ArrayList fContext = new ArrayList(); + + private ArrayList<IContextActivation> fContext = new ArrayList<IContextActivation>(); private AbstractHandler fGoToAddressHandler; - + private AbstractHandler fNextPageHandler; private AbstractHandler fPrevPageHandler; - + private boolean fIsCreated = false; private boolean fIsDisposed = false; private boolean fIsShowAddressColumn = true; - + private SwitchPageJob fSwitchPageJob = new SwitchPageJob(); private boolean fError = false; - + private PendingPropertyChanges fPendingSyncProperties; - - // list of menu listeners for popupMenuMgr. - private ArrayList fMenuListeners; + + // list of menu listeners for popupMenuMgr. + private ArrayList<IMenuListener> fMenuListeners; private MenuManager fMenuMgr; - + private ISchedulingRule serialByRenderingRule = new SerialByObjectRule(this); - - /** - * Identifier for an empty group preceding all context menu actions - * (value <code>"popUpBegin"</code>). + + /** + * Identifier for an empty group preceding all context menu actions (value + * <code>"popUpBegin"</code>). */ public static final String EMPTY_MEMORY_GROUP = "popUpBegin"; //$NON-NLS-1$ - + /** - * Identifier for an empty group following navigation actions in the rendering - * (value <code>navigationGroup</code>). + * Identifier for an empty group following navigation actions in the + * rendering (value <code>navigationGroup</code>). */ public static final String EMPTY_NAVIGATION_GROUP = "navigationGroup"; //$NON-NLS-1$ - + /** - * Identifier for an empty group following actions that are only applicable in - * non-auto loading mode - * (value <code>nonAutoLoadGroup</code>). + * Identifier for an empty group following actions that are only applicable + * in non-auto loading mode (value <code>nonAutoLoadGroup</code>). */ public static final String EMPTY_NON_AUTO_LOAD_GROUP = "nonAutoLoadGroup"; //$NON-NLS-1$ - + /** - * Identifier for an empty group following properties actions - * (value <code>propertyGroup</code>). + * Identifier for an empty group following properties actions (value + * <code>propertyGroup</code>). */ public static final String EMPTY_PROPERTY_GROUP = "propertyGroup"; //$NON-NLS-1$ - + private ISelectionChangedListener fViewerSelectionChangedListener = new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { updateSyncTopAddress(getTopVisibleAddress()); updateSyncSelectedAddress(getSelectedAddress()); } }; - + private SelectionAdapter fScrollBarSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateSyncTopAddress(getTopVisibleAddress()); } }; - + private IModelChangedListener fModelChangedListener = new IModelChangedListener() { + @Override public void modelChanged(IModelDelta delta, IModelProxy proxy) { - if (delta.getElement() == getMemoryBlock()) - { + if (delta.getElement() == getMemoryBlock()) { showTable(); updateRenderingLabel(isVisible()); } - }}; - + } + }; + private IVirtualContentListener fViewerListener = new IVirtualContentListener() { - + private int startThreshold; private int endThreshold; + @Override public void handledAtBufferStart() { - if (getMemoryBlock() instanceof IMemoryBlockExtension) - { - if (isDynamicLoad() && startThreshold != 0) - { + if (getMemoryBlock() instanceof IMemoryBlockExtension) { + if (isDynamicLoad() && startThreshold != 0) { BigInteger address = getTopVisibleAddress(); - if (address != null && !isAtTopLimit()) + if (address != null && !isAtTopLimit()) { reloadTable(address); + } } } } + @Override public void handleAtBufferEnd() { - if (getMemoryBlock() instanceof IMemoryBlockExtension) - { - if (isDynamicLoad() && endThreshold != 0) - { + if (getMemoryBlock() instanceof IMemoryBlockExtension) { + if (isDynamicLoad() && endThreshold != 0) { BigInteger address = getTopVisibleAddress(); - if (address != null && !isAtBottomLimit()) + if (address != null && !isAtBottomLimit()) { reloadTable(address); + } } } } + @Override public int getThreshold(int bufferEndOrStart) { - + int threshold = DEFAULT_BUFFER_THRESHOLD; - - if (bufferEndOrStart == IVirtualContentListener.BUFFER_START) - { - if (threshold > getPreBufferSize()) - { + + if (bufferEndOrStart == IVirtualContentListener.BUFFER_START) { + if (threshold > getPreBufferSize()) { threshold = getPreBufferSize(); } - } - else - { - if (threshold > getPostBufferSize()) - { + } else { + if (threshold > getPostBufferSize()) { threshold = getPostBufferSize(); } } - - if (bufferEndOrStart == IVirtualContentListener.BUFFER_START) + + if (bufferEndOrStart == IVirtualContentListener.BUFFER_START) { startThreshold = threshold; - else + } else { endThreshold = threshold; - + } + return threshold; - }}; - + } + }; + private IPresentationErrorListener fPresentationErrorListener = new IPresentationErrorListener() { + @Override public void handlePresentationFailure(IStatusMonitor monitor, IStatus status) { showMessage(status.getMessage()); - }}; - - + } + }; + /** * Constructs a new table rendering of the specified type. * @@ -547,71 +551,73 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende super(renderingId); } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IResettableMemoryRendering#resetRendering() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.memory.IResettableMemoryRendering#resetRendering() */ + @Override public void resetRendering() throws DebugException { - if (!fIsCreated) + if (!fIsCreated) { return; + } BigInteger baseAddress = fContentDescriptor.getContentBaseAddress(); fTableViewer.setSelection(baseAddress); reloadTable(baseAddress); fTableViewer.setTopIndex(baseAddress); - if (!isDynamicLoad()) - { + if (!isDynamicLoad()) { updateSyncPageStartAddress(baseAddress); } - + updateSyncSelectedAddress(baseAddress); - updateSyncTopAddress(baseAddress); + updateSyncTopAddress(baseAddress); } + @Override public Control createControl(Composite parent) { - + fPageBook = new PageBook(parent, SWT.NONE); createMessagePage(fPageBook); createTableViewer(fPageBook); addListeners(); - + return fPageBook; } - + /** * Create the error page of this rendering + * * @param parent the parent to add the page to */ - private void createMessagePage(Composite parent) - { - if (fTextViewer == null) - { - fTextViewer = new TextViewer(parent, SWT.WRAP); + private void createMessagePage(Composite parent) { + if (fTextViewer == null) { + fTextViewer = new TextViewer(parent, SWT.WRAP); fTextViewer.setDocument(new Document()); StyledText styleText = fTextViewer.getTextWidget(); styleText.setEditable(false); styleText.setEnabled(false); } } - + /** * @param parent the parent composite */ - private void createTableViewer(final Composite parent) - { + private void createTableViewer(final Composite parent) { StringBuffer buffer = new StringBuffer(); IMemoryRenderingType type = DebugUITools.getMemoryRenderingManager().getRenderingType(getRenderingId()); buffer.append(type.getLabel()); buffer.append(": "); //$NON-NLS-1$ buffer.append(DebugUIMessages.AbstractAsyncTableRendering_2); - + Job job = new Job(buffer.toString()) { + @Override protected IStatus run(IProgressMonitor monitor) { - + // gather information from memory block - initAddressableSize(); + initAddressableSize(); final BigInteger topVisibleAddress = getInitialTopVisibleAddress(); BigInteger mbBaseAddress = null; try { @@ -620,205 +626,216 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende fError = true; showMessage(e.getMessage()); } - - // if it takes too long to get the base address, and user has canceled + + // if it takes too long to get the base address, and user has + // canceled // remove this rendering. - if (monitor.isCanceled()) - { + if (monitor.isCanceled()) { getMemoryRenderingContainer().removeMemoryRendering(AbstractAsyncTableRendering.this); return Status.CANCEL_STATUS; } - + final BigInteger finalMbBaseAddress = mbBaseAddress; final BigInteger initialSelectedAddress = getInitialSelectedAddress(); - - if (monitor.isCanceled()) - { + + if (monitor.isCanceled()) { getMemoryRenderingContainer().removeMemoryRendering(AbstractAsyncTableRendering.this); return Status.CANCEL_STATUS; } - + createContentDescriptor(topVisibleAddress); - - // if it takes too long to get other information, and user has canceled + + // if it takes too long to get other information, and user has + // canceled // remove this rendering. - if (monitor.isCanceled()) - { + if (monitor.isCanceled()) { getMemoryRenderingContainer().removeMemoryRendering(AbstractAsyncTableRendering.this); return Status.CANCEL_STATUS; } - + // batch update on UI thread - UIJob uiJob = new UIJob("Create Table Viewer UI Job"){ //$NON-NLS-1$ + UIJob uiJob = new UIJob("Create Table Viewer UI Job") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor progressMonitor) { - - if (fPageBook.isDisposed()) + + if (fPageBook.isDisposed()) { return Status.OK_STATUS; - + } + fSashForm = new SashForm(parent, SWT.VERTICAL); fTableViewer = new AsyncTableRenderingViewer(AbstractAsyncTableRendering.this, fSashForm, SWT.VIRTUAL | SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.HIDE_SELECTION | SWT.BORDER); GridData data = new GridData(GridData.FILL_BOTH); fTableViewer.getControl().setLayoutData(data); - + createGoToAddressComposite(fSashForm); hideGotoAddressComposite(); - + IMemoryRenderingSite site = getMemoryRenderingContainer().getMemoryRenderingSite(); IMemoryRenderingContainer container = getMemoryRenderingContainer(); fPresentationContext = new MemoryViewPresentationContext(site, container, AbstractAsyncTableRendering.this); fTableViewer.setContext(fPresentationContext); - - // must call this after the context is created as the information is stored in the context + + // must call this after the context is created as the + // information is stored in the context getDynamicLoadFromPreference(); getPageSizeFromPreference(); - + int numberOfLines = getNumLinesToLoad(); fContentDescriptor.setNumLines(numberOfLines); - - if (numberOfLines == 0) - { - // if the table viewer is not initialized yet, add listener - // and load table when we can get the height of the table + + if (numberOfLines == 0) { + // if the table viewer is not initialized yet, add + // listener + // and load table when we can get the height of the + // table fTableViewer.getTable().addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { fTableViewer.getTable().removePaintListener(this); fContentDescriptor.setNumLines(getNumLinesToLoad()); refresh(); - }}); + } + }); } - + BigInteger baseAddress = finalMbBaseAddress; - if (baseAddress == null) + if (baseAddress == null) { baseAddress = BigInteger.ZERO; - - if (!(getMemoryBlock() instanceof IMemoryBlockExtension) || !isDynamicLoad()) - { - // If not extended memory block, do not create any buffer + } + + if (!(getMemoryBlock() instanceof IMemoryBlockExtension) || !isDynamicLoad()) { + // If not extended memory block, do not create any + // buffer // no scrolling fContentDescriptor.setPreBuffer(0); fContentDescriptor.setPostBuffer(0); - } - + } + setupInitialFormat(); fTableViewer.setCellModifier(newInternalCellModifier()); fTableViewer.getTable().setHeaderVisible(true); - fTableViewer.getTable().setLinesVisible(true); + fTableViewer.getTable().setLinesVisible(true); fTableViewer.addPresentationErrorListener(fPresentationErrorListener); fTableViewer.setInput(getMemoryBlock()); fTableViewer.resizeColumnsToPreferredSize(); fTableViewer.setTopIndex(topVisibleAddress); - + fTableViewer.setSelection(initialSelectedAddress); - // SET UP FONT + // SET UP FONT // set to a non-proportional font fTableViewer.getTable().setFont(JFaceResources.getFont(IInternalDebugUIConstants.FONT_NAME)); - - if (!fError) + + if (!fError) { showTable(); - + } + fTableViewer.addVirtualContentListener(fViewerListener); - + // create context menu // create pop up menu for the rendering createActions(); IMenuListener menuListener = new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager mgr) { fillContextMenu(mgr); } }; createPopupMenu(fTableViewer.getControl(), menuListener); createPopupMenu(fTableViewer.getCursor(), menuListener); - + fTableViewer.addSelectionChangedListener(fViewerSelectionChangedListener); fTableViewer.getTable().getVerticalBar().addSelectionListener(fScrollBarSelectionListener); - - // add resize listener to figure out number of visible lines - // so that the viewer get refreshed with the correct number of lines on the + + // add resize listener to figure out number of visible + // lines + // so that the viewer get refreshed with the correct + // number of lines on the // next refresh request fTableViewer.getTable().addListener(SWT.Resize, new Listener() { + @Override public void handleEvent(Event event) { - if (!fTableViewer.getTable().isDisposed()) + if (!fTableViewer.getTable().isDisposed()) { fContentDescriptor.setNumLines(getNumLinesToLoad()); - }}); - + } + } + }); + createToolTip(); - - if (isActivated()) - { + + if (isActivated()) { activatePageActions(); } - + // now the rendering is successfully created - fIsCreated = true; - + fIsCreated = true; + return Status.OK_STATUS; - }}; + } + }; uiJob.setSystem(true); uiJob.schedule(); - + return Status.OK_STATUS; - }}; - + } + }; + job.schedule(); } - + /** * Create popup menu for this rendering + * * @param control - control to create the popup menu for * @param menuListener - listener to notify when popup menu is about to show */ - private void createPopupMenu(Control control, IMenuListener menuListener) - { + private void createPopupMenu(Control control, IMenuListener menuListener) { IMemoryRenderingContainer container = getMemoryRenderingContainer(); - if (fMenuMgr == null) - { + if (fMenuMgr == null) { fMenuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$ fMenuMgr.setRemoveAllWhenShown(true); IMemoryRenderingSite site = container.getMemoryRenderingSite(); String menuId = container.getId(); - + ISelectionProvider selProvider = site.getSite().getSelectionProvider(); - + addMenuListener(menuListener); site.getSite().registerContextMenu(menuId, fMenuMgr, selProvider); } - + addMenuListener(menuListener); - + Menu popupMenu = fMenuMgr.createContextMenu(control); control.setMenu(popupMenu); } - private void addMenuListener(IMenuListener menuListener) { - if (fMenuListeners == null) - fMenuListeners = new ArrayList(); - - if (!fMenuListeners.contains(menuListener)) - { + if (fMenuListeners == null) { + fMenuListeners = new ArrayList<IMenuListener>(); + } + + if (!fMenuListeners.contains(menuListener)) { fMenuMgr.addMenuListener(menuListener); fMenuListeners.add(menuListener); } } private BigInteger getInitialSelectedAddress() { - // figure out selected address + // figure out selected address BigInteger selectedAddress = (BigInteger) getSynchronizedProperty(AbstractAsyncTableRendering.PROPERTY_SELECTED_ADDRESS); - if (selectedAddress == null) - { + if (selectedAddress == null) { if (getMemoryBlock() instanceof IMemoryBlockExtension) { try { selectedAddress = ((IMemoryBlockExtension) getMemoryBlock()).getBigBaseAddress(); } catch (DebugException e) { selectedAddress = BigInteger.ZERO; } - + if (selectedAddress == null) { - selectedAddress =BigInteger.ZERO; + selectedAddress = BigInteger.ZERO; } } else { @@ -828,101 +845,92 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende } return selectedAddress; } - - private void addListeners() - { + + private void addListeners() { DebugUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this); addRenderingToSyncService(); JFaceResources.getFontRegistry().addListener(this); } - - private void removeListeners() - { + + private void removeListeners() { DebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this); removeRenderingFromSyncService(); JFaceResources.getFontRegistry().removeListener(this); - - if (fMenuListeners != null) - { - Iterator iter = fMenuListeners.iterator(); - while (iter.hasNext()) - { - fMenuMgr.removeMenuListener((IMenuListener)iter.next()); + + if (fMenuListeners != null) { + Iterator<IMenuListener> iter = fMenuListeners.iterator(); + while (iter.hasNext()) { + fMenuMgr.removeMenuListener(iter.next()); } - + fMenuListeners.clear(); } } - - private void addRenderingToSyncService() - { + + private void addRenderingToSyncService() { IMemoryRenderingSynchronizationService syncService = getMemoryRenderingContainer().getMemoryRenderingSite().getSynchronizationService(); - - if (syncService == null) + + if (syncService == null) { return; - + } + syncService.addPropertyChangeListener(this, null); } - - private void removeRenderingFromSyncService() - { + + private void removeRenderingFromSyncService() { IMemoryRenderingSynchronizationService syncService = getMemoryRenderingContainer().getMemoryRenderingSite().getSynchronizationService(); - - if (syncService == null) + + if (syncService == null) { return; - - syncService.removePropertyChangeListener(this); + } + + syncService.removePropertyChangeListener(this); } - - private void initAddressableSize() - { - // set up addressable size and figure out number of bytes required per line + + private void initAddressableSize() { + // set up addressable size and figure out number of bytes required per + // line fAddressableSize = -1; try { - if (getMemoryBlock() instanceof IMemoryBlockExtension) - fAddressableSize = ((IMemoryBlockExtension)getMemoryBlock()).getAddressableSize(); - else + if (getMemoryBlock() instanceof IMemoryBlockExtension) { + fAddressableSize = ((IMemoryBlockExtension) getMemoryBlock()).getAddressableSize(); + } else { fAddressableSize = 1; + } } catch (DebugException e1) { DebugUIPlugin.log(e1); // log error and default to 1 fAddressableSize = 1; return; - + } - if (fAddressableSize < 1) - { + if (fAddressableSize < 1) { DebugUIPlugin.logErrorMessage("Invalid addressable size"); //$NON-NLS-1$ fAddressableSize = 1; } } - + private BigInteger getInitialTopVisibleAddress() { BigInteger topVisibleAddress = (BigInteger) getSynchronizedProperty(AbstractAsyncTableRendering.PROPERTY_TOP_ADDRESS); - if (topVisibleAddress == null) - { - if (getMemoryBlock() instanceof IMemoryBlockExtension) - { + if (topVisibleAddress == null) { + if (getMemoryBlock() instanceof IMemoryBlockExtension) { try { - topVisibleAddress = ((IMemoryBlockExtension)getMemoryBlock()).getBigBaseAddress(); + topVisibleAddress = ((IMemoryBlockExtension) getMemoryBlock()).getBigBaseAddress(); } catch (DebugException e1) { topVisibleAddress = new BigInteger("0"); //$NON-NLS-1$ } - } - else - { + } else { topVisibleAddress = BigInteger.valueOf(getMemoryBlock().getStartAddress()); } } return topVisibleAddress; } - + private void setupInitialFormat() { - + boolean validated = validateInitialFormat(); - - if (!validated) - { + + if (!validated) { // pop up dialog to ask user for default values StringBuffer msgBuffer = new StringBuffer(DebugUIMessages.AbstractTableRendering_20); msgBuffer.append(" "); //$NON-NLS-1$ @@ -932,179 +940,162 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende msgBuffer.append("\n"); //$NON-NLS-1$ msgBuffer.append(DebugUIMessages.AbstractTableRendering_18); msgBuffer.append("\n\n"); //$NON-NLS-1$ - + int bytePerLine = fBytePerLine; int columnSize = fColumnSize; - + // initialize this value to populate the dialog properly fBytePerLine = getDefaultRowSize() / getAddressableSize(); fColumnSize = getDefaultColumnSize() / getAddressableSize(); FormatTableRenderingDialog dialog = new FormatTableRenderingDialog(this, DebugUIPlugin.getShell()); dialog.openError(msgBuffer.toString()); - + // restore to original value before formatting fBytePerLine = bytePerLine; fColumnSize = columnSize; - + bytePerLine = dialog.getRowSize() * getAddressableSize(); columnSize = dialog.getColumnSize() * getAddressableSize(); - + format(bytePerLine, columnSize); - } - else - { - // Row size is stored as number of addressable units in preference store + } else { + // Row size is stored as number of addressable units in preference + // store int bytePerLine = getDefaultRowSize(); // column size is now stored as number of addressable units int columnSize = getDefaultColumnSize(); - - // format memory block with specified "bytesPerLine" and "columnSize" + + // format memory block with specified "bytesPerLine" and + // "columnSize" boolean ok = format(bytePerLine, columnSize); - - if (!ok) - { - // this is to ensure that the rest of the rendering can be created + + if (!ok) { + // this is to ensure that the rest of the rendering can be + // created // and we can recover from a format error format(bytePerLine, bytePerLine); } } } - - private boolean validateInitialFormat() - { + + private boolean validateInitialFormat() { int rowSize = getDefaultRowSize(); int columnSize = getDefaultColumnSize(); - - if (rowSize < columnSize || rowSize % columnSize != 0 || rowSize == 0 || columnSize == 0) - { + + if (rowSize < columnSize || rowSize % columnSize != 0 || rowSize == 0 || columnSize == 0) { return false; } return true; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#getControl() */ + @Override public Control getControl() { return fPageBook; } - /* (non-Javadoc) - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse + * .jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { - if (!fIsCreated) + if (!fIsCreated) { return; - + } + // if memory view table font has changed - if (event.getProperty().equals(IInternalDebugUIConstants.FONT_NAME)) - { - if (!fIsDisposed) - { + if (event.getProperty().equals(IInternalDebugUIConstants.FONT_NAME)) { + if (!fIsDisposed) { Font memoryViewFont = JFaceResources.getFont(IInternalDebugUIConstants.FONT_NAME); - setFont(memoryViewFont); + setFont(memoryViewFont); } return; } - + Object evtSrc = event.getSource(); // always update page size, only refresh if the table is visible if (event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PAGE_SIZE)) { getPageSizeFromPreference(); } - if (event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PRE_BUFFER_SIZE)) - { + if (event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PRE_BUFFER_SIZE)) { getPreBufferSizeFromPreference(); fContentDescriptor.setPreBuffer(getPreBufferSize()); } - if (event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_POST_BUFFER_SIZE)) - { + if (event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_POST_BUFFER_SIZE)) { getPostBufferSizeFromPreference(); - fContentDescriptor.setPostBuffer(getPostBufferSize()); + fContentDescriptor.setPostBuffer(getPostBufferSize()); } - + // do not handle event if the rendering is displaying an error // or if it's not visible - if (isDisplayingError() || !isVisible()) - { + if (isDisplayingError() || !isVisible()) { handlePropertiesChangeWhenHidden(event); return; } - - - if (event.getProperty().equals(IDebugUIConstants.PREF_PADDED_STR) || - event.getProperty().equals(IDebugUIConstants.PREF_CHANGED_DEBUG_ELEMENT_COLOR) || - event.getProperty().equals(IDebugUIConstants.PREF_MEMORY_HISTORY_KNOWN_COLOR) || - event.getProperty().equals(IDebugUIConstants.PREF_MEMORY_HISTORY_UNKNOWN_COLOR)) - { - if (!fIsDisposed) - { + + if (event.getProperty().equals(IDebugUIConstants.PREF_PADDED_STR) || event.getProperty().equals(IDebugUIConstants.PREF_CHANGED_DEBUG_ELEMENT_COLOR) || event.getProperty().equals(IDebugUIConstants.PREF_MEMORY_HISTORY_KNOWN_COLOR) || event.getProperty().equals(IDebugUIConstants.PREF_MEMORY_HISTORY_UNKNOWN_COLOR)) { + if (!fIsDisposed) { fTableViewer.refresh(false); } return; } - - if (event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PRE_BUFFER_SIZE) || - event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_POST_BUFFER_SIZE)) - { - if (!fIsDisposed) - { + + if (event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PRE_BUFFER_SIZE) || event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_POST_BUFFER_SIZE)) { + if (!fIsDisposed) { fTableViewer.refresh(true); } return; } - + if (event.getProperty().equals(IDebugPreferenceConstants.PREF_DYNAMIC_LOAD_MEM)) { handleDyanicLoadChanged(); return; } - + if (event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PAGE_SIZE)) { - if (!isDynamicLoad()) - { + if (!isDynamicLoad()) { int pageSize = DebugUIPlugin.getDefault().getPreferenceStore().getInt(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PAGE_SIZE); handlePageSizeChanged(pageSize); } return; } - - if (evtSrc == this) + + if (evtSrc == this) { return; - - if (evtSrc instanceof IMemoryRendering) - { - IMemoryRendering rendering = (IMemoryRendering)evtSrc; + } + + if (evtSrc instanceof IMemoryRendering) { + IMemoryRendering rendering = (IMemoryRendering) evtSrc; IMemoryBlock memoryBlock = rendering.getMemoryBlock(); - - // do not handle event from renderings displaying other memory blocks - if (memoryBlock != getMemoryBlock()) + + // do not handle event from renderings displaying other memory + // blocks + if (memoryBlock != getMemoryBlock()) { return; + } } - + String propertyName = event.getProperty(); Object value = event.getNewValue(); - - if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_SELECTED_ADDRESS) && value instanceof BigInteger) - { - selectedAddressChanged((BigInteger)value); - } - else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_COL_SIZE) && value instanceof Integer) - { - columnSizeChanged(((Integer)value).intValue()); - } - else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_ROW_SIZE) && value instanceof Integer) - { - rowSizeChanged(((Integer)value).intValue()); - } - else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_TOP_ADDRESS) && value instanceof BigInteger) - { - topVisibleAddressChanged((BigInteger)value); - } - else if (propertyName.equals(IInternalDebugUIConstants.PROPERTY_PAGE_START_ADDRESS) && value instanceof BigInteger) - { - handlePageStartAddressChanged((BigInteger)value); + + if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_SELECTED_ADDRESS) && value instanceof BigInteger) { + selectedAddressChanged((BigInteger) value); + } else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_COL_SIZE) && value instanceof Integer) { + columnSizeChanged(((Integer) value).intValue()); + } else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_ROW_SIZE) && value instanceof Integer) { + rowSizeChanged(((Integer) value).intValue()); + } else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_TOP_ADDRESS) && value instanceof BigInteger) { + topVisibleAddressChanged((BigInteger) value); + } else if (propertyName.equals(IInternalDebugUIConstants.PROPERTY_PAGE_START_ADDRESS) && value instanceof BigInteger) { + handlePageStartAddressChanged((BigInteger) value); } } @@ -1116,303 +1107,281 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende // only refresh if in non-auto-load mode fContentDescriptor.setNumLines(pageSize); refresh(); - } - - private void handlePropertiesChangeWhenHidden(PropertyChangeEvent event) - { - if (fPendingSyncProperties == null) + } + + private void handlePropertiesChangeWhenHidden(PropertyChangeEvent event) { + if (fPendingSyncProperties == null) { return; - + } + String propertyName = event.getProperty(); Object value = event.getNewValue(); - - if (event.getSource() instanceof IMemoryRendering) - { - IMemoryRendering rendering = (IMemoryRendering)event.getSource(); - if (rendering == this || rendering.getMemoryBlock() != getMemoryBlock()) - { + + if (event.getSource() instanceof IMemoryRendering) { + IMemoryRendering rendering = (IMemoryRendering) event.getSource(); + if (rendering == this || rendering.getMemoryBlock() != getMemoryBlock()) { return; } } - - if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_COL_SIZE) && value instanceof Integer) - { - fPendingSyncProperties.setColumnSize(((Integer)value).intValue()); - } - else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_ROW_SIZE) && value instanceof Integer) - { - fPendingSyncProperties.setRowSize(((Integer)value).intValue()); - } - - else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_SELECTED_ADDRESS) && value instanceof BigInteger) - { - fPendingSyncProperties.setSelectedAddress((BigInteger)value); - } - else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_TOP_ADDRESS) && value instanceof BigInteger) - { - fPendingSyncProperties.setTopVisibleAddress((BigInteger)value); - } - else if (propertyName.equals(IInternalDebugUIConstants.PROPERTY_PAGE_START_ADDRESS) && value instanceof BigInteger) - { - fPendingSyncProperties.setPageStartAddress((BigInteger)value); + + if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_COL_SIZE) && value instanceof Integer) { + fPendingSyncProperties.setColumnSize(((Integer) value).intValue()); + } else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_ROW_SIZE) && value instanceof Integer) { + fPendingSyncProperties.setRowSize(((Integer) value).intValue()); } - else if (event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PAGE_SIZE)) { + + else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_SELECTED_ADDRESS) && value instanceof BigInteger) { + fPendingSyncProperties.setSelectedAddress((BigInteger) value); + } else if (propertyName.equals(AbstractAsyncTableRendering.PROPERTY_TOP_ADDRESS) && value instanceof BigInteger) { + fPendingSyncProperties.setTopVisibleAddress((BigInteger) value); + } else if (propertyName.equals(IInternalDebugUIConstants.PROPERTY_PAGE_START_ADDRESS) && value instanceof BigInteger) { + fPendingSyncProperties.setPageStartAddress((BigInteger) value); + } else if (event.getProperty().equals(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PAGE_SIZE)) { int pageSize = DebugUIPlugin.getDefault().getPreferenceStore().getInt(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PAGE_SIZE); fPendingSyncProperties.setPageSize(pageSize); } } - - private void topVisibleAddressChanged(final BigInteger address) - { + + private void topVisibleAddressChanged(final BigInteger address) { final Runnable runnable = new Runnable() { + @Override public void run() { - if (fTableViewer.getTable().isDisposed()) + if (fTableViewer.getTable().isDisposed()) { return; - + } + doTopVisibleAddressChanged(address); - }}; + } + }; runOnUIThread(runnable); } - + /** * @param address the changed address */ private void doTopVisibleAddressChanged(final BigInteger address) { - if (fIsDisposed) + if (fIsDisposed) { return; - - if (!isDynamicLoad()) - { + } + + if (!isDynamicLoad()) { fTableViewer.setTopIndex(address); fTableViewer.topIndexChanged(); return; } - - if (!isAtTopBuffer(address) && !isAtBottomBuffer(address)) - { + + if (!isAtTopBuffer(address) && !isAtBottomBuffer(address)) { fTableViewer.setTopIndex(address); fTableViewer.topIndexChanged(); - } - else - { + } else { reloadTable(address); } } - - private boolean isAtBottomBuffer(BigInteger address) - { + + private boolean isAtBottomBuffer(BigInteger address) { int idx = fTableViewer.indexOf(address); - if (idx < 0) + if (idx < 0) { return true; - + } + int bottomIdx = idx + getNumberOfVisibleLines(); int elementsCnt = fTableViewer.getVirtualContentModel().getElements().length; int numLinesLeft = elementsCnt - bottomIdx; - - if (numLinesLeft < fViewerListener.getThreshold(IVirtualContentListener.BUFFER_END)) + + if (numLinesLeft < fViewerListener.getThreshold(IVirtualContentListener.BUFFER_END)) { return true; - + } + return false; } - - private boolean isAtTopBuffer(BigInteger address) - { + + private boolean isAtTopBuffer(BigInteger address) { int topIdx = fTableViewer.indexOf(address); - if (topIdx < fViewerListener.getThreshold(IVirtualContentListener.BUFFER_START)) + if (topIdx < fViewerListener.getThreshold(IVirtualContentListener.BUFFER_START)) { return true; - + } + return false; } - - private void runOnUIThread(final Runnable runnable) - { - if (Display.getCurrent() != null) - { + + private void runOnUIThread(final Runnable runnable) { + if (Display.getCurrent() != null) { runnable.run(); - } - else - { - UIJob job = new UIJob("Async Table Rendering UI Job"){ //$NON-NLS-1$ - + } else { + UIJob job = new UIJob("Async Table Rendering UI Job") { //$NON-NLS-1$ + + @Override public IStatus runInUIThread(IProgressMonitor monitor) { runnable.run(); return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } } - - private void selectedAddressChanged(final BigInteger address) - { + + private void selectedAddressChanged(final BigInteger address) { Runnable runnable = new Runnable() { - public void run() { - - if (fTableViewer.getTable().isDisposed()) + @Override + public void run() { + + if (fTableViewer.getTable().isDisposed()) { return; - + } + // call this to make the table viewer to reload when needed int i = fTableViewer.indexOf(address); - if (i < 0) - { + if (i < 0) { // the model may not have been populated yet, // try to predict if the address will be in the buffer boolean contained = isAddressBufferred(address); - if (!contained) + if (!contained) { topVisibleAddressChanged(address); + } } fTableViewer.setSelection(address); } }; - + runOnUIThread(runnable); } - - private boolean isAddressBufferred(BigInteger address) - { + + private boolean isAddressBufferred(BigInteger address) { // figure out the buffer top address BigInteger loadAddress = fContentDescriptor.getLoadAddress(); loadAddress = MemoryViewUtil.alignToBoundary(loadAddress, getAddressableUnitPerLine()); int unitPerLine = getAddressableUnitPerLine(); - + loadAddress = loadAddress.subtract(BigInteger.valueOf(getPreBufferSize() * unitPerLine)); - + // figure out the buffer end address int numLines = fContentDescriptor.getNumLines(); - BigInteger bufferEnd = loadAddress.add(BigInteger.valueOf(fContentDescriptor.getPostBuffer()*unitPerLine)); - bufferEnd = bufferEnd.add(BigInteger.valueOf(numLines*unitPerLine + unitPerLine)); - + BigInteger bufferEnd = loadAddress.add(BigInteger.valueOf(fContentDescriptor.getPostBuffer() * unitPerLine)); + bufferEnd = bufferEnd.add(BigInteger.valueOf(numLines * unitPerLine + unitPerLine)); + // see if the address is contained based on current content descriptor - if (address.compareTo(loadAddress) >= 0 && address.compareTo(bufferEnd) <= 0) + if (address.compareTo(loadAddress) >= 0 && address.compareTo(bufferEnd) <= 0) { return true; - + } + return false; } - - private void setFont(Font font) - { + + private void setFont(Font font) { // set font fTableViewer.getTable().setFont(font); - fTableViewer.getCursor().setFont(font); + fTableViewer.getCursor().setFont(font); } - + private int getDefaultColumnSize() { - + // default to global preference store IPreferenceStore prefStore = DebugUITools.getPreferenceStore(); int columnSize = prefStore.getInt(IDebugPreferenceConstants.PREF_COLUMN_SIZE); - // actual column size is number of addressable units * size of the addressable unit + // actual column size is number of addressable units * size of the + // addressable unit columnSize = columnSize * getAddressableSize(); - + // check synchronized col size - Integer colSize = (Integer)getSynchronizedProperty(AbstractAsyncTableRendering.PROPERTY_COL_SIZE); - if (colSize != null) - { + Integer colSize = (Integer) getSynchronizedProperty(AbstractAsyncTableRendering.PROPERTY_COL_SIZE); + if (colSize != null) { // column size is stored as actual number of bytes in synchronizer - int syncColSize = colSize.intValue(); - if (syncColSize > 0) - { + int syncColSize = colSize.intValue(); + if (syncColSize > 0) { columnSize = syncColSize; - } - } - else - { - IPersistableDebugElement elmt = (IPersistableDebugElement)getMemoryBlock().getAdapter(IPersistableDebugElement.class); + } + } else { + IPersistableDebugElement elmt = (IPersistableDebugElement) getMemoryBlock().getAdapter(IPersistableDebugElement.class); int defaultColSize = -1; - - if (elmt != null) - { - if (elmt.supportsProperty(this, IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL)) + + if (elmt != null) { + if (elmt.supportsProperty(this, IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL)) { defaultColSize = getDefaultFromPersistableElement(IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL); + } } - - if (defaultColSize <= 0) - { + + if (defaultColSize <= 0) { // if not provided, get default by model defaultColSize = getDefaultColumnSizeByModel(getMemoryBlock().getModelIdentifier()); } - - if (defaultColSize > 0) + + if (defaultColSize > 0) { columnSize = defaultColSize * getAddressableSize(); + } } return columnSize; } private int getDefaultRowSize() { - + int rowSize = DebugUITools.getPreferenceStore().getInt(IDebugPreferenceConstants.PREF_ROW_SIZE); int bytePerLine = rowSize * getAddressableSize(); - + // check synchronized row size - Integer size = (Integer)getSynchronizedProperty(AbstractAsyncTableRendering.PROPERTY_ROW_SIZE); - if (size != null) - { + Integer size = (Integer) getSynchronizedProperty(AbstractAsyncTableRendering.PROPERTY_ROW_SIZE); + if (size != null) { // row size is stored as actual number of bytes in synchronizer - int syncRowSize = size.intValue(); - if (syncRowSize > 0) - { + int syncRowSize = size.intValue(); + if (syncRowSize > 0) { bytePerLine = syncRowSize; - } - } - else - { + } + } else { int defaultRowSize = -1; - IPersistableDebugElement elmt = (IPersistableDebugElement)getMemoryBlock().getAdapter(IPersistableDebugElement.class); - if (elmt != null) - { - if (elmt.supportsProperty(this, IDebugPreferenceConstants.PREF_ROW_SIZE_BY_MODEL)) - { + IPersistableDebugElement elmt = (IPersistableDebugElement) getMemoryBlock().getAdapter(IPersistableDebugElement.class); + if (elmt != null) { + if (elmt.supportsProperty(this, IDebugPreferenceConstants.PREF_ROW_SIZE_BY_MODEL)) { defaultRowSize = getDefaultFromPersistableElement(IDebugPreferenceConstants.PREF_ROW_SIZE_BY_MODEL); return defaultRowSize * getAddressableSize(); } } - - if (defaultRowSize <= 0) + + if (defaultRowSize <= 0) { // no synchronized property, ask preference store by id defaultRowSize = getDefaultRowSizeByModel(getMemoryBlock().getModelIdentifier()); - - if (defaultRowSize > 0) + } + + if (defaultRowSize > 0) { bytePerLine = defaultRowSize * getAddressableSize(); + } } return bytePerLine; } - + /** * Returns the addressable size of this rendering's memory block in bytes. * * @return the addressable size of this rendering's memory block in bytes */ + @Override public int getAddressableSize() { return fAddressableSize; } - - private Object getSynchronizedProperty(String propertyId) - { + + private Object getSynchronizedProperty(String propertyId) { IMemoryRenderingSynchronizationService syncService = getMemoryRenderingContainer().getMemoryRenderingSite().getSynchronizationService(); - - if (syncService == null) + + if (syncService == null) { return null; - - return syncService.getProperty(getMemoryBlock(), propertyId); + } + + return syncService.getProperty(getMemoryBlock(), propertyId); } - + private int getDefaultFromPersistableElement(String propertyId) { int defaultValue = -1; - IPersistableDebugElement elmt = (IPersistableDebugElement)getMemoryBlock().getAdapter(IPersistableDebugElement.class); - if (elmt != null) - { + IPersistableDebugElement elmt = (IPersistableDebugElement) getMemoryBlock().getAdapter(IPersistableDebugElement.class); + if (elmt != null) { try { Object valueMB = elmt.getProperty(this, propertyId); - if (valueMB != null && !(valueMB instanceof Integer)) - { + if (valueMB != null && !(valueMB instanceof Integer)) { IStatus status = DebugUIPlugin.newErrorStatus("Model returned invalid type on " + propertyId, null); //$NON-NLS-1$ DebugUIPlugin.log(status); } - - if (valueMB != null) - { - Integer value = (Integer)valueMB; + + if (valueMB != null) { + Integer value = (Integer) valueMB; defaultValue = value.intValue(); } } catch (CoreException e) { @@ -1421,41 +1390,36 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende } return defaultValue; } - + /** * @param modelId the {@link String} model id * @return default number of addressable units per line for the model */ - private int getDefaultRowSizeByModel(String modelId) - { + private int getDefaultRowSizeByModel(String modelId) { int row = DebugUITools.getPreferenceStore().getInt(getRowPrefId(modelId)); - if (row == 0) - { + if (row == 0) { DebugUITools.getPreferenceStore().setValue(getRowPrefId(modelId), IDebugPreferenceConstants.PREF_ROW_SIZE_DEFAULT); } - + row = DebugUITools.getPreferenceStore().getInt(getRowPrefId(modelId)); return row; - + } - + /** * @param modelId the {@link String} model id * @return default number of addressable units per column for the model */ - private int getDefaultColumnSizeByModel(String modelId) - { + private int getDefaultColumnSizeByModel(String modelId) { int col = DebugUITools.getPreferenceStore().getInt(getColumnPrefId(modelId)); - if (col == 0) - { + if (col == 0) { DebugUITools.getPreferenceStore().setValue(getColumnPrefId(modelId), IDebugPreferenceConstants.PREF_COLUMN_SIZE_DEFAULT); } - + col = DebugUITools.getPreferenceStore().getInt(getColumnPrefId(modelId)); return col; } - - + private String getRowPrefId(String modelId) { String rowPrefId = IDebugPreferenceConstants.PREF_ROW_SIZE + ":" + modelId; //$NON-NLS-1$ return rowPrefId; @@ -1465,160 +1429,158 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende String colPrefId = IDebugPreferenceConstants.PREF_COLUMN_SIZE + ":" + modelId; //$NON-NLS-1$ return colPrefId; } - + /** * Format view tab based on the bytes per line and column. * - * @param bytesPerLine - number of bytes per line, possible values: (1 / 2 / 4 / 8 / 16 / 32 / 64/ 128) * addressableSize - * @param columnSize - number of bytes per column, possible values: (1 / 2 / 4 / 8 / 16 / 32/ 64 / 128) * addressableSize + * @param bytesPerLine - number of bytes per line, possible values: (1 / 2 / + * 4 / 8 / 16 / 32 / 64/ 128) * addressableSize + * @param columnSize - number of bytes per column, possible values: (1 / 2 / + * 4 / 8 / 16 / 32/ 64 / 128) * addressableSize * @return true if format is successful, false, otherwise */ - public boolean format(int bytesPerLine, int columnSize) - { - + @Override + public boolean format(int bytesPerLine, int columnSize) { + // bytes per cell must be divisible to bytesPerLine - if (bytesPerLine % columnSize != 0) - { + if (bytesPerLine % columnSize != 0) { return false; } - - if (bytesPerLine < columnSize) - { + + if (bytesPerLine < columnSize) { return false; } - + // do not format if the view tab is already in that format - if(fBytePerLine == bytesPerLine && fColumnSize == columnSize){ + if (fBytePerLine == bytesPerLine && fColumnSize == columnSize) { return false; } - + fBytePerLine = bytesPerLine; fColumnSize = columnSize; formatViewer(); updateSyncRowSize(); updateSyncColSize(); - + return true; } - - + /** * Returns the number of addressable units per row. - * + * * @return number of addressable units per row */ + @Override public int getAddressableUnitPerLine() { return fBytePerLine / getAddressableSize(); } - + /** * Returns the number of addressable units per column. * * @return number of addressable units per column */ + @Override public int getAddressableUnitPerColumn() { return fColumnSize / getAddressableSize(); } - - + /** - * This method estimates the number of visible lines in the rendering - * table. + * This method estimates the number of visible lines in the rendering table. + * * @return estimated number of visible lines in the table */ - private int getNumberOfVisibleLines() - { - if(fTableViewer == null) + private int getNumberOfVisibleLines() { + if (fTableViewer == null) { return -1; - + } + Table table = fTableViewer.getTable(); int height = fTableViewer.getTable().getSize().y; - + // when table is not yet created, height is zero - if (height == 0) - { + if (height == 0) { // make use of the table viewer to estimate table size height = fTableViewer.getTable().getParent().getSize().y; } - - if (height == 0) - { + + if (height == 0) { return 0; } - + // height of border int border = fTableViewer.getTable().getHeaderHeight(); - + // height of scroll bar int scroll = fTableViewer.getTable().getHorizontalBar().getSize().y; - // height of table is table's area minus border and scroll bar height - height = height-border-scroll; + // height of table is table's area minus border and scroll bar height + height = height - border - scroll; // calculate number of visible lines int lineHeight = getMinTableItemHeight(table); - - int numberOfLines = height/lineHeight; - - if (numberOfLines <= 0) + + int numberOfLines = height / lineHeight; + + if (numberOfLines <= 0) { return 0; - - return numberOfLines; + } + + return numberOfLines; } - - private int getMinTableItemHeight(Table table){ - + + private int getMinTableItemHeight(Table table) { + // Hack to get around Linux GTK problem. // On Linux GTK, table items have variable item height as - // carriage returns are actually shown in a cell. Some rows will be - // taller than others. When calculating number of visible lines, we - // need to find the smallest table item height. Otherwise, the rendering - // underestimates the number of visible lines. As a result the rendering + // carriage returns are actually shown in a cell. Some rows will be + // taller than others. When calculating number of visible lines, we + // need to find the smallest table item height. Otherwise, the rendering + // underestimates the number of visible lines. As a result the rendering // will not be able to get more memory as needed. - if (MemoryViewUtil.isLinuxGTK()) - { + if (MemoryViewUtil.isLinuxGTK()) { // check each of the items and find the minimum TableItem[] items = table.getItems(); int minHeight = table.getItemHeight(); - for (int i=0; i<items.length; i++) - { - if (items[i].getData() != null) + for (int i = 0; i < items.length; i++) { + if (items[i].getData() != null) { minHeight = Math.min(items[i].getBounds(0).height, minHeight); + } } - + return minHeight; - + } return table.getItemHeight(); } - - private BigInteger getMemoryBlockBaseAddress() throws DebugException - { - if (getMemoryBlock() instanceof IMemoryBlockExtension) - return ((IMemoryBlockExtension)getMemoryBlock()).getBigBaseAddress(); - else + + private BigInteger getMemoryBlockBaseAddress() throws DebugException { + if (getMemoryBlock() instanceof IMemoryBlockExtension) { + return ((IMemoryBlockExtension) getMemoryBlock()).getBigBaseAddress(); + } else { return BigInteger.valueOf(getMemoryBlock().getStartAddress()); + } } - + /** * Displays the given message on the error page + * * @param message - the message to display */ - protected void showMessage(final String message) - { + protected void showMessage(final String message) { fSwitchPageJob.setShowMessagePage(true); fSwitchPageJob.setMessage(message); fSwitchPageJob.schedule(); } - + /** * Returns the number of bytes displayed in a single column cell. * * @return the number of bytes displayed in a single column cell */ - public int getBytesPerColumn() - { + @Override + public int getBytesPerColumn() { return fColumnSize; } @@ -1627,53 +1589,52 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende * * @return the number of bytes displayed in a row */ - public int getBytesPerLine() - { + @Override + public int getBytesPerLine() { return fBytePerLine; } - + /** * Returns whether the error page is displayed. * * @return whether the error page is displayed */ - public boolean isDisplayingError() - { + public boolean isDisplayingError() { return fShowMessage; } - + /** * Displays the content of the table viewer. */ - public void showTable() - { + public void showTable() { fSwitchPageJob.setShowMessagePage(false); fSwitchPageJob.schedule(); } - + private BigInteger getTopVisibleAddress() { - - if (fTableViewer == null) + + if (fTableViewer == null) { return BigInteger.valueOf(0); + } Table table = fTableViewer.getTable(); int topIndex = table.getTopIndex(); - if (topIndex < 0) { return null; } + if (topIndex < 0) { + return null; + } - if (table.getItemCount() > topIndex) - { - MemorySegment topItem = (MemorySegment)table.getItem(topIndex).getData(); - if (topItem != null) - { + if (table.getItemCount() > topIndex) { + MemorySegment topItem = (MemorySegment) table.getItem(topIndex).getData(); + if (topItem != null) { return topItem.getAddress(); } } return null; } - - private synchronized void reloadTable(final BigInteger topAddress) { - + + private synchronized void reloadTable(final BigInteger topAddress) { + if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { DebugUIPlugin.trace(this + " reload at: " + topAddress.toString(16)); //$NON-NLS-1$ } @@ -1683,82 +1644,80 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende fTableViewer.refresh(); } - - private boolean isAtTopLimit() - { + + private boolean isAtTopLimit() { BigInteger startAddress = fContentDescriptor.getStartAddress(); startAddress = MemoryViewUtil.alignToBoundary(startAddress, getAddressableUnitPerLine()); AbstractVirtualContentTableModel model = fTableViewer.getVirtualContentModel(); - - if (model != null) - { + + if (model != null) { Object key = model.getKey(0); - if (key instanceof BigInteger) - { - BigInteger startBufferAddress = (BigInteger)key; + if (key instanceof BigInteger) { + BigInteger startBufferAddress = (BigInteger) key; startBufferAddress = MemoryViewUtil.alignToBoundary(startBufferAddress, getAddressableUnitPerLine()); - - if (startAddress.compareTo(startBufferAddress) == 0) + + if (startAddress.compareTo(startBufferAddress) == 0) { return true; + } } } return false; } - - private boolean isAtBottomLimit() - { + + private boolean isAtBottomLimit() { BigInteger endAddress = fContentDescriptor.getEndAddress(); endAddress = MemoryViewUtil.alignToBoundary(endAddress, getAddressableUnitPerLine()); - + AbstractVirtualContentTableModel model = fTableViewer.getVirtualContentModel(); - if (model != null) - { + if (model != null) { int numElements = model.getElements().length; - Object key = model.getKey(numElements-1); - if (key instanceof BigInteger) - { - BigInteger endBufferAddress = (BigInteger)key; + Object key = model.getKey(numElements - 1); + if (key instanceof BigInteger) { + BigInteger endBufferAddress = (BigInteger) key; endBufferAddress = MemoryViewUtil.alignToBoundary(endBufferAddress, getAddressableUnitPerLine()); - - if (endAddress.compareTo(endBufferAddress) == 0) + + if (endAddress.compareTo(endBufferAddress) == 0) { return true; + } } } - - return false; + + return false; } - + private void formatViewer() { - + fTableViewer.disposeColumns(); fTableViewer.disposeCellEditors(); doFormatTable(); fTableViewer.setColumnHeaders(getColumnProperties()); fTableViewer.showColumnHeader(true); - + Table table = fTableViewer.getTable(); int colCnt = table.getColumnCount(); CellEditor[] editors = new CellEditor[fTableViewer.getTable().getColumnCount()]; - for (int i=0; i<colCnt; i++) - { + for (int i = 0; i < colCnt; i++) { editors[i] = createCellEditor(table, i); } - + fTableViewer.setCellEditors(editors); - + fTableViewer.formatViewer(); - + // This resize needs to happen after the viewer has finished // getting the labels. - // This fix is a hack to delay the resize until the viewer has a chance to get - // the setData event from the UI thread. Otherwise, the columns will be + // This fix is a hack to delay the resize until the viewer has a chance + // to get + // the setData event from the UI thread. Otherwise, the columns will be // squeezed together. - UIJob job = new UIJob("resize to fit"){ //$NON-NLS-1$ + UIJob job = new UIJob("resize to fit") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { resizeColumnsToPreferredSize(); return Status.OK_STATUS; - }}; - + } + }; + job.setSystem(true); job.schedule(); } @@ -1766,246 +1725,253 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende private void doFormatTable() { int bytesPerLine = getBytesPerLine(); int columnSize = getBytesPerColumn(); - int numColumns = bytesPerLine/columnSize; - + int numColumns = bytesPerLine / columnSize; + Table table = fTableViewer.getTable(); - TableColumn column0 = new TableColumn(table,SWT.LEFT,0); - column0.setText(DebugUIMessages.AbstractTableRendering_2); - + TableColumn column0 = new TableColumn(table, SWT.LEFT, 0); + column0.setText(DebugUIMessages.AbstractTableRendering_2); + // create new byte columns - TableColumn [] byteColumns = new TableColumn[numColumns]; - for (int i=0;i<byteColumns.length; i++) - { - TableColumn column = new TableColumn(table, SWT.LEFT, i+1); + TableColumn[] byteColumns = new TableColumn[numColumns]; + for (int i = 0; i < byteColumns.length; i++) { + TableColumn column = new TableColumn(table, SWT.LEFT, i + 1); byteColumns[i] = column; } - - //Empty column for cursor navigation - TableColumn emptyCol = new TableColumn(table,SWT.LEFT,byteColumns.length+1); + + // Empty column for cursor navigation + TableColumn emptyCol = new TableColumn(table, SWT.LEFT, byteColumns.length + 1); emptyCol.setText(" "); //$NON-NLS-1$ emptyCol.setWidth(1); emptyCol.setResizable(false); - table.setHeaderVisible(true); - - // allow clients to override column labels - setColumnHeadings(); - - } - - private String[] getColumnProperties() - { - int numColumns = getAddressableUnitPerLine()/getAddressableUnitPerColumn(); + table.setHeaderVisible(true); + + // allow clients to override column labels + setColumnHeadings(); + + } + + private String[] getColumnProperties() { + int numColumns = getAddressableUnitPerLine() / getAddressableUnitPerColumn(); // +2 to include properties for address and navigation column - String[] columnProperties = new String[numColumns+2]; + String[] columnProperties = new String[numColumns + 2]; columnProperties[0] = TableRenderingLine.P_ADDRESS; - + int addressableUnit = getAddressableUnitPerColumn(); // use column beginning offset to the row address as properties - for (int i=1; i<columnProperties.length-1; i++) - { - // column properties are stored as number of addressable units from the + for (int i = 1; i < columnProperties.length - 1; i++) { + // column properties are stored as number of addressable units from + // the // the line address - columnProperties[i] = Integer.toHexString((i-1)*addressableUnit); + columnProperties[i] = Integer.toHexString((i - 1) * addressableUnit); } - + // Empty column for cursor navigation - columnProperties[columnProperties.length-1] = " "; //$NON-NLS-1$ + columnProperties[columnProperties.length - 1] = " "; //$NON-NLS-1$ return columnProperties; } - - /** - * Create a cell editor from the specified composite and column. - * @param composite parent composite that the cell editor is to be created from. + + /** + * Create a cell editor from the specified composite and column. + * + * @param composite parent composite that the cell editor is to be created + * from. * @param column the column where the cell editor is required * @return the cell editor for editing memory * * @since 3.3 - * + * */ protected CellEditor createCellEditor(Composite composite, int column) { - - return new TextCellEditor(composite); - } - - - private ICellModifier newInternalCellModifier() - { - return new AsyncTableRenderingCellModifier(this, createCellModifier()); - } - - /** - * Create a custom cell modifier for this rendering. Return null - * if the default cell modifier is to be used. - * @return the cell modifier for this rendering, or <code>null</code> if the - * default cell modifier is to be used. - * - * @since 3.3 - * - */ - protected ICellModifier createCellModifier() { - return null; - } - - /* (non-Javadoc) + + return new TextCellEditor(composite); + } + + private ICellModifier newInternalCellModifier() { + return new AsyncTableRenderingCellModifier(this, createCellModifier()); + } + + /** + * Create a custom cell modifier for this rendering. Return null if the + * default cell modifier is to be used. + * + * @return the cell modifier for this rendering, or <code>null</code> if the + * default cell modifier is to be used. + * + * @since 3.3 + * + */ + protected ICellModifier createCellModifier() { + return null; + } + + /* + * (non-Javadoc) * @see org.eclipse.debug.ui.memory.AbstractMemoryRendering#dispose() */ + @Override public void dispose() { - - if (fIsDisposed) + + if (fIsDisposed) { return; - + } + fIsDisposed = true; - + removeListeners(); - - if (fMenuMgr != null) - { + + if (fMenuMgr != null) { fMenuMgr.removeAll(); fMenuMgr.dispose(); fMenuMgr = null; } - - if (fTableViewer != null) - { - if (fViewerListener != null) + + if (fTableViewer != null) { + if (fViewerListener != null) { fTableViewer.removeVirtualContentListener(fViewerListener); - - if (fPresentationErrorListener != null) + } + + if (fPresentationErrorListener != null) { fTableViewer.removePresentationErrorListener(fPresentationErrorListener); - + } + fTableViewer.removeSelectionChangedListener(fViewerSelectionChangedListener); fTableViewer.getTable().getVerticalBar().removeSelectionListener(fScrollBarSelectionListener); - + fTableViewer.dispose(); } - + if (fPresentationContext != null) { - fPresentationContext.dispose(); + fPresentationContext.dispose(); } - - if (fToolTipShell != null && !fToolTipShell.isDisposed()) - { + + if (fToolTipShell != null && !fToolTipShell.isDisposed()) { fToolTipShell.dispose(); fToolTipShell = null; } - + fIsDisposed = true; - + super.dispose(); } - + /** - * Updates the label of this rendering, optionally displaying the - * base address of this rendering's memory block. + * Updates the label of this rendering, optionally displaying the base + * address of this rendering's memory block. * * @param showAddress whether to display the base address of this - * rendering's memory block in this rendering's label + * rendering's memory block in this rendering's label */ - protected void updateRenderingLabel(final boolean showAddress) - { - Job job = new Job("Update Rendering Label"){ //$NON-NLS-1$ + protected void updateRenderingLabel(final boolean showAddress) { + Job job = new Job("Update Rendering Label") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { - if (fIsDisposed) + if (fIsDisposed) { return Status.OK_STATUS; + } fLabel = buildLabel(showAddress); firePropertyChangedEvent(new PropertyChangeEvent(AbstractAsyncTableRendering.this, IBasicPropertyConstants.P_TEXT, null, fLabel)); return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.setRule(serialByRenderingRule); job.schedule(); } - + private String buildLabel(boolean showAddress) { String label = IInternalDebugCoreConstants.EMPTY_STRING; - if (getMemoryBlock() instanceof IMemoryBlockExtension) - { - label = ((IMemoryBlockExtension)getMemoryBlock()).getExpression(); - - if (label == null) - { - label = DebugUIMessages.AbstractTableRendering_8; - } - - if (label.startsWith("&")) //$NON-NLS-1$ + if (getMemoryBlock() instanceof IMemoryBlockExtension) { + label = ((IMemoryBlockExtension) getMemoryBlock()).getExpression(); + + if (label == null) { + label = DebugUIMessages.AbstractTableRendering_8; + } + + if (label.startsWith("&")) { //$NON-NLS-1$ label = "&" + label; //$NON-NLS-1$ - + } + try { - if (showAddress && ((IMemoryBlockExtension)getMemoryBlock()).getBigBaseAddress() != null) - { + if (showAddress && ((IMemoryBlockExtension) getMemoryBlock()).getBigBaseAddress() != null) { label += " : 0x"; //$NON-NLS-1$ - label += ((IMemoryBlockExtension)getMemoryBlock()).getBigBaseAddress().toString(16).toUpperCase(); + label += ((IMemoryBlockExtension) getMemoryBlock()).getBigBaseAddress().toString(16).toUpperCase(); } } catch (DebugException e) { // do nothing, the label will not show the address } - } - else - { + } else { long address = getMemoryBlock().getStartAddress(); label = Long.toHexString(address).toUpperCase(); } - + String preName = DebugUITools.getMemoryRenderingManager().getRenderingType(getRenderingId()).getLabel(); - - if (preName != null) + + if (preName != null) { label += " <" + preName + ">"; //$NON-NLS-1$ //$NON-NLS-2$ - + } + return decorateLabel(label); } - - /* Returns the label of this rendering. - * + + /* + * Returns the label of this rendering. * @return label of this rendering */ + @Override public String getLabel() { - - if (fLabel == null) - { + + if (fLabel == null) { fLabel = DebugUIMessages.AbstractAsyncTableRendering_1; updateRenderingLabel(isVisible()); } - + return fLabel; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { - - if (adapter == IColorProvider.class) + + if (adapter == IColorProvider.class) { return getColorProviderAdapter(); - - if (adapter == ILabelProvider.class) + } + + if (adapter == ILabelProvider.class) { return getLabelProviderAdapter(); - - if (adapter == IFontProvider.class) + } + + if (adapter == IFontProvider.class) { return getFontProviderAdapter(); - - if (adapter == IModelChangedListener.class) - { + } + + if (adapter == IModelChangedListener.class) { return fModelChangedListener; } - - if (adapter == IWorkbenchAdapter.class) - { + + if (adapter == IWorkbenchAdapter.class) { // needed workbench adapter to fill the title of property page if (fWorkbenchAdapter == null) { fWorkbenchAdapter = new IWorkbenchAdapter() { + @Override public Object[] getChildren(Object o) { return new Object[0]; } - + + @Override public ImageDescriptor getImageDescriptor(Object object) { return null; } - + + @Override public String getLabel(Object o) { return AbstractAsyncTableRendering.this.getLabel(); } - + + @Override public Object getParent(Object o) { return null; } @@ -2013,105 +1979,106 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende } return fWorkbenchAdapter; } - - if (adapter == TableRenderingContentDescriptor.class) + + if (adapter == TableRenderingContentDescriptor.class) { return getContentDescriptor(); - + } + return super.getAdapter(adapter); } - + /** - * Returns the number of characters a byte will convert to - * or -1 if unknown. + * Returns the number of characters a byte will convert to or -1 if unknown. * - * @return the number of characters a byte will convert to - * or -1 if unknown + * @return the number of characters a byte will convert to or -1 if unknown */ - public int getNumCharsPerByte() - { + @Override + public int getNumCharsPerByte() { return -1; } - + /** * Create actions for this rendering */ protected void createActions() { - + fCopyToClipboardAction = new AsyncCopyTableRenderingAction(this, fTableViewer); fGoToAddressAction = new RenderingGoToAddressAction(getMemoryRenderingContainer(), this); fResetMemoryBlockAction = new ResetToBaseAddressAction(this); - + fPrintViewTabAction = new AsyncPrintTableRenderingAction(this, fTableViewer); - - fFormatRenderingAction = new FormatTableRenderingAction(this); + + fFormatRenderingAction = new FormatTableRenderingAction(this); fReformatAction = new ReformatAction(this); fToggleAddressColumnAction = new ToggleAddressColumnAction(); - + IMemoryRenderingSite site = getMemoryRenderingContainer().getMemoryRenderingSite(); - if (site.getSite().getSelectionProvider() != null) - { - fPropertiesDialogAction = new PropertyDialogAction(site.getSite(),site.getSite().getSelectionProvider()); + if (site.getSite().getSelectionProvider() != null) { + fPropertiesDialogAction = new PropertyDialogAction(site.getSite(), site.getSite().getSelectionProvider()); } - + fNextAction = new NextPageAction(); fPrevAction = new PrevPageAction(); } - + /** * Returns the currently selected address in this rendering. * * @return the currently selected address in this rendering */ + @Override public BigInteger getSelectedAddress() { - if (!fIsCreated) + if (!fIsCreated) { return null; - + } + Object key = fTableViewer.getSelectionKey(); - - if (key != null && key instanceof BigInteger) - return (BigInteger)key; - + + if (key != null && key instanceof BigInteger) { + return (BigInteger) key; + } + return null; } /** * Returns the currently selected content in this rendering as MemoryByte. * - * @return the currently selected content in array of MemoryByte. - * Returns an empty array if the selected address is out of buffered range. + * @return the currently selected content in array of MemoryByte. Returns an + * empty array if the selected address is out of buffered range. */ - public MemoryByte[] getSelectedAsBytes() - { - if (getSelectedAddress() == null) + @Override + public MemoryByte[] getSelectedAsBytes() { + if (getSelectedAddress() == null) { return new MemoryByte[0]; - + } + Object key = fTableViewer.getSelectionKey(); AbstractVirtualContentTableModel model = fTableViewer.getVirtualContentModel(); - - if (model != null) - { - model = (AbstractVirtualContentTableModel)fTableViewer.getModel(); + + if (model != null) { + model = (AbstractVirtualContentTableModel) fTableViewer.getModel(); int row = model.indexOfKey(key); Object element = model.getElement(row); int col = model.columnOf(element, key); - + // check precondition - if (col <= 0 || col > getBytesPerLine()/getBytesPerColumn()) - { + if (col <= 0 || col > getBytesPerLine() / getBytesPerColumn()) { return new MemoryByte[0]; } - - if (!(element instanceof MemorySegment)) + + if (!(element instanceof MemorySegment)) { return new MemoryByte[0]; - - MemorySegment line = (MemorySegment)element; - int offset = (col-1)*(getAddressableUnitPerColumn()*getAddressableSize()); - + } + + MemorySegment line = (MemorySegment) element; + int offset = (col - 1) * (getAddressableUnitPerColumn() * getAddressableSize()); + // make a copy of the bytes to ensure that data cannot be changed // by caller - MemoryByte[] bytes = line.getBytes(offset, getAddressableUnitPerColumn()*getAddressableSize()); + MemoryByte[] bytes = line.getBytes(offset, getAddressableUnitPerColumn() * getAddressableSize()); MemoryByte[] retBytes = new MemoryByte[bytes.length]; - + System.arraycopy(bytes, 0, retBytes, 0, bytes.length); return retBytes; } @@ -2123,82 +2090,73 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende * * @return the currently selected content in this rendering */ + @Override public String getSelectedAsString() { - if (getSelectedAddress() == null) + if (getSelectedAddress() == null) { return IInternalDebugCoreConstants.EMPTY_STRING; - + } + MemoryByte[] bytes = getSelectedAsBytes(); - if (bytes.length > 0) - { + if (bytes.length > 0) { return getString(this.getRenderingId(), getSelectedAddress(), bytes); - } - else + } else { return IInternalDebugCoreConstants.EMPTY_STRING; - + } + } /** - * Moves the cursor to the specified address. - * Will load more memory if the address is not currently visible. + * Moves the cursor to the specified address. Will load more memory if the + * address is not currently visible. * * @param address address to position cursor at * @throws DebugException if an exception occurs */ + @Override public void goToAddress(final BigInteger address) throws DebugException { - - if (!fIsCreated || fTableViewer.getVirtualContentModel() == null) + + if (!fIsCreated || fTableViewer.getVirtualContentModel() == null) { return; + } final int keyIndex = fTableViewer.getVirtualContentModel().indexOfKey(address); if (keyIndex < 0) { // if not extended memory block // do not allow user to go to an address that's out of range - if (!(getMemoryBlock() instanceof IMemoryBlockExtension)) - { - Status stat = new Status( - IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), - DebugException.NOT_SUPPORTED, DebugUIMessages.AbstractTableRendering_11, null - ); + if (!(getMemoryBlock() instanceof IMemoryBlockExtension)) { + Status stat = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), DebugException.NOT_SUPPORTED, DebugUIMessages.AbstractTableRendering_11, null); DebugException e = new DebugException(stat); throw e; } - + BigInteger startAdd = fContentDescriptor.getStartAddress(); BigInteger endAdd = fContentDescriptor.getEndAddress(); - - if (address.compareTo(startAdd) < 0 || - address.compareTo(endAdd) > 0) - { - Status stat = new Status( - IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), - DebugException.NOT_SUPPORTED, DebugUIMessages.AbstractTableRendering_11, null - ); + + if (address.compareTo(startAdd) < 0 || address.compareTo(endAdd) > 0) { + Status stat = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), DebugException.NOT_SUPPORTED, DebugUIMessages.AbstractTableRendering_11, null); DebugException e = new DebugException(stat); throw e; } } - - Runnable runnable = new Runnable(){ + + Runnable runnable = new Runnable() { + @Override public void run() { showTable(); - if (keyIndex >=0) - { + if (keyIndex >= 0) { // address is within range, set cursor and reveal fTableViewer.setSelection(address); updateSyncTopAddress(getTopVisibleAddress()); updateSyncSelectedAddress(address); - } - else - { + } else { // load at the address fTableViewer.setSelection(address); reloadTable(address); updateSyncSelectedAddress(address); - if (!isDynamicLoad()) - { + if (!isDynamicLoad()) { updateSyncPageStartAddress(address); } updateSyncTopAddress(address); @@ -2206,374 +2164,373 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende } }; runOnUIThread(runnable); - } - + } + /** - * Refresh the table viewer with the current top visible address. - * Update labels in the memory rendering. + * Refresh the table viewer with the current top visible address. Update + * labels in the memory rendering. */ + @Override public void refresh() { - if (!fIsCreated) + if (!fIsCreated) { return; + } fTableViewer.refresh(); } - /** * Resize column to the preferred size. */ + @Override public void resizeColumnsToPreferredSize() { - if (!fIsCreated) + if (!fIsCreated) { return; + } fTableViewer.resizeColumnsToPreferredSize(); - if (!fIsShowAddressColumn) - { + if (!fIsShowAddressColumn) { final TableColumn column = fTableViewer.getTable().getColumn(0); column.addControlListener(new ControlListener() { + @Override public void controlMoved(ControlEvent e) { } + @Override public void controlResized(ControlEvent e) { column.removeControlListener(this); column.setWidth(0); - }}); + } + }); } } /** * Updates labels of this rendering. */ - public void updateLabels() - { - if (!fIsCreated) + @Override + public void updateLabels() { + if (!fIsCreated) { return; + } - UIJob job = new UIJob("updateLabels"){ //$NON-NLS-1$ + UIJob job = new UIJob("updateLabels") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { - + // do not handle if the rendering is already disposed - if (fPageBook.isDisposed()) + if (fPageBook.isDisposed()) { return Status.OK_STATUS; - + } + // update tab labels updateRenderingLabel(true); - - if (fTableViewer != null) - { + + if (fTableViewer != null) { // update column labels setColumnHeadings(); - + // rebuild cache and force labels to be refreshed fTableViewer.formatViewer(); } return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } - + /** * Fills the context menu for this rendering * * @param menu menu to fill */ - protected void fillContextMenu(IMenuManager menu) { - + protected void fillContextMenu(IMenuManager menu) { + menu.add(new Separator(EMPTY_MEMORY_GROUP)); menu.add(new Separator()); menu.add(fResetMemoryBlockAction); menu.add(fGoToAddressAction); menu.add(new Separator(EMPTY_NAVIGATION_GROUP)); - + menu.add(new Separator()); menu.add(fFormatRenderingAction); - if (!isDynamicLoad() && getMemoryBlock() instanceof IMemoryBlockExtension) - { + if (!isDynamicLoad() && getMemoryBlock() instanceof IMemoryBlockExtension) { menu.add(new Separator()); menu.add(fPrevAction); menu.add(fNextAction); menu.add(new Separator(EMPTY_NON_AUTO_LOAD_GROUP)); } - + menu.add(new Separator()); menu.add(fReformatAction); menu.add(fToggleAddressColumnAction); menu.add(new Separator()); menu.add(fCopyToClipboardAction); menu.add(fPrintViewTabAction); - if (fPropertiesDialogAction != null) - { + if (fPropertiesDialogAction != null) { menu.add(new Separator()); menu.add(fPropertiesDialogAction); menu.add(new Separator(EMPTY_PROPERTY_GROUP)); } - + menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); } - - private int getPageSizeInUnits() - { + + private int getPageSizeInUnits() { return fPageSize * getAddressableUnitPerLine(); } - - private void getPageSizeFromPreference() - { + + private void getPageSizeFromPreference() { fPageSize = DebugUIPlugin.getDefault().getPreferenceStore().getInt(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PAGE_SIZE); } - - private void getPreBufferSizeFromPreference() - { + + private void getPreBufferSizeFromPreference() { fPreBufferSize = DebugUIPlugin.getDefault().getPreferenceStore().getInt(IDebugPreferenceConstants.PREF_TABLE_RENDERING_PRE_BUFFER_SIZE); } - - private void getPostBufferSizeFromPreference() - { + + private void getPostBufferSizeFromPreference() { fPostBufferSize = DebugUIPlugin.getDefault().getPreferenceStore().getInt(IDebugPreferenceConstants.PREF_TABLE_RENDERING_POST_BUFFER_SIZE); } - + private void updateDynamicLoadProperty() { - - boolean value = DebugUIPlugin - .getDefault() - .getPreferenceStore() - .getBoolean(IDebugPreferenceConstants.PREF_DYNAMIC_LOAD_MEM); - - if (value != isDynamicLoad()) - { + + boolean value = DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugPreferenceConstants.PREF_DYNAMIC_LOAD_MEM); + + if (value != isDynamicLoad()) { setDynamicLoad(value); - + if (!fIsDisposed) { if (isDynamicLoad()) { fContentDescriptor.setPostBuffer(getPostBufferSize()); fContentDescriptor.setPreBuffer(getPreBufferSize()); fContentDescriptor.setNumLines(getNumberOfVisibleLines()); - + } else { fContentDescriptor.setPostBuffer(0); fContentDescriptor.setPreBuffer(0); fContentDescriptor.setNumLines(fPageSize); - } + } } } } - - private void getDynamicLoadFromPreference() - { + + private void getDynamicLoadFromPreference() { setDynamicLoad(DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugPreferenceConstants.PREF_DYNAMIC_LOAD_MEM)); } - - private boolean isDynamicLoad() - { + + private boolean isDynamicLoad() { return fContentDescriptor.isDynamicLoad(); } - - private int getPageSize() - { + + private int getPageSize() { return fPageSize; } - + private int getNumLinesToLoad() { int numberOfLines = -1; - - if (isDynamicLoad()) + + if (isDynamicLoad()) { numberOfLines = getNumberOfVisibleLines(); - else + } else { numberOfLines = getPageSize(); - + } + return numberOfLines; } - - private void setDynamicLoad(boolean load) - { + + private void setDynamicLoad(boolean load) { fContentDescriptor.setDynamicLoad(load); } - - private void handlePageStartAddressChanged(BigInteger address) - { + + private void handlePageStartAddressChanged(BigInteger address) { // do not handle if in dynamic mode - if (isDynamicLoad()) + if (isDynamicLoad()) { return; - - if (!(getMemoryBlock() instanceof IMemoryBlockExtension)) + } + + if (!(getMemoryBlock() instanceof IMemoryBlockExtension)) { return; - + } + // do not handle event if the base address of the memory // block has changed, wait for debug event to update to // new location - if (isMemoryBlockBaseAddressChanged()) + if (isMemoryBlockBaseAddressChanged()) { return; + } Object key = fTableViewer.getKey(0); - if(key != null) { - if(key.equals(address)) + if (key != null) { + if (key.equals(address)) { return; + } } - + BigInteger start = fContentDescriptor.getStartAddress(); BigInteger end = fContentDescriptor.getEndAddress(); - + // smaller than start address, load at start address - if (address.compareTo(start) < 0) - { - if (isAtTopLimit()) + if (address.compareTo(start) < 0) { + if (isAtTopLimit()) { return; - + } + address = start; } - + // bigger than end address, no need to load, already at top - if (address.compareTo(end) > 0) - { - if (isAtBottomLimit()) + if (address.compareTo(end) > 0) { + if (isAtBottomLimit()) { return; - + } + address = end.subtract(BigInteger.valueOf(getPageSizeInUnits())); } - + fContentDescriptor.setLoadAddress(address); final BigInteger finaladdress = address; Runnable runnable = new Runnable() { + @Override public void run() { - if (fTableViewer.getTable().isDisposed()) + if (fTableViewer.getTable().isDisposed()) { return; - + } + fTableViewer.setTopIndex(finaladdress); refresh(); - }}; - + } + }; + runOnUIThread(runnable); updateSyncPageStartAddress(address); updateSyncTopAddress(address); } + private void handleDyanicLoadChanged() { - + // if currently in dynamic load mode, update page // start address BigInteger pageStart = getTopVisibleAddress(); updateSyncPageStartAddress(pageStart); - + updateDynamicLoadProperty(); - if (isDynamicLoad()) - { + if (isDynamicLoad()) { refresh(); fTableViewer.setTopIndex(pageStart); - } - else - { + } else { handlePageStartAddressChanged(pageStart); } } - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#becomesHidden() */ - public void becomesHidden() { + @Override + public void becomesHidden() { // creates new object for storing potential changes in sync properties - fPendingSyncProperties = new PendingPropertyChanges(); + fPendingSyncProperties = new PendingPropertyChanges(); super.becomesHidden(); - - if (getMemoryBlock() instanceof IMemoryBlockExtension) - updateRenderingLabel(false); + + if (getMemoryBlock() instanceof IMemoryBlockExtension) { + updateRenderingLabel(false); + } } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#becomesVisible() */ + @Override public void becomesVisible() { - - if (!fIsCreated) - { - // label can still be constructed even though the rendering has not finished being + + if (!fIsCreated) { + // label can still be constructed even though the rendering has not + // finished being // initialized updateRenderingLabel(true); super.becomesVisible(); return; } - + // do not do anything if already visible - if (isVisible() == true) - { + if (isVisible() == true) { // super should always be called super.becomesVisible(); return; } - + super.becomesVisible(); - - if (fPendingSyncProperties != null) - { + + if (fPendingSyncProperties != null) { // deal with format boolean format = false; int rowSize = getBytesPerLine(); - if (fPendingSyncProperties.getRowSize() > 0) - { + if (fPendingSyncProperties.getRowSize() > 0) { format = true; rowSize = fPendingSyncProperties.getRowSize(); } - + int colSize = getBytesPerColumn(); - if (fPendingSyncProperties.getColumnSize() > 0) - { + if (fPendingSyncProperties.getColumnSize() > 0) { format = true; colSize = fPendingSyncProperties.getColumnSize(); } - - if (format) + + if (format) { format(rowSize, colSize); - + } + BigInteger selectedAddress = fPendingSyncProperties.getSelectedAddress(); - if (selectedAddress != null) + if (selectedAddress != null) { fTableViewer.setSelection(selectedAddress); - + } + updateDynamicLoadProperty(); - - if (isDynamicLoad()) - { + + if (isDynamicLoad()) { BigInteger topVisibleAddress = fPendingSyncProperties.getTopVisibleAddress(); - if (topVisibleAddress != null) - { + if (topVisibleAddress != null) { fContentDescriptor.setLoadAddress(topVisibleAddress); fTableViewer.setTopIndex(topVisibleAddress); } - } - else if (!(getMemoryBlock() instanceof IMemoryBlockExtension)) - { + } else if (!(getMemoryBlock() instanceof IMemoryBlockExtension)) { BigInteger topVisibleAddress = fPendingSyncProperties.getTopVisibleAddress(); - if (topVisibleAddress != null) + if (topVisibleAddress != null) { fTableViewer.setTopIndex(topVisibleAddress); - } - else - { - if (fPendingSyncProperties.getPageSize() > 0) - { + } + } else { + if (fPendingSyncProperties.getPageSize() > 0) { fPageSize = fPendingSyncProperties.getPageSize(); fContentDescriptor.setNumLines(fPageSize); } - + BigInteger pageStartAddress = fPendingSyncProperties.getPageStartAddress(); - if (pageStartAddress != null) + if (pageStartAddress != null) { fContentDescriptor.setLoadAddress(pageStartAddress); - + } + fTableViewer.setTopIndex(pageStartAddress); } - + showTable(); refresh(); } updateRenderingLabel(true); - + Job job = new Job("becomesVisible") //$NON-NLS-1$ { + @Override protected IStatus run(IProgressMonitor monitor) { - if (fIsDisposed) + if (fIsDisposed) { return Status.OK_STATUS; + } try { fContentDescriptor.updateContentBaseAddress(); } catch (DebugException e) { @@ -2584,163 +2541,177 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende }; job.setSystem(true); job.schedule(); - + // discard these properties fPendingSyncProperties = null; } - + /** * Handle column size changed event from synchronizer + * * @param newColumnSize the new column size */ private void columnSizeChanged(final int newColumnSize) { // ignore event if rendering is not visible - if (!isVisible()) + if (!isVisible()) { return; + } Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { int rowSize = getBytesPerLine(); - if (rowSize < newColumnSize) + if (rowSize < newColumnSize) { rowSize = newColumnSize; - + } + format(rowSize, newColumnSize); } }); } - + /** * @param newRowSize - new row size in number of bytes */ - private void rowSizeChanged(final int newRowSize) - { + private void rowSizeChanged(final int newRowSize) { // ignore event if rendering is not visible - if (!isVisible()) + if (!isVisible()) { return; - + } + Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { int colSize = getBytesPerColumn(); - if (newRowSize < colSize) + if (newRowSize < colSize) { colSize = newRowSize; - + } + format(newRowSize, colSize); } - }); + }); } - + /** * update selected address in synchronizer if update is true. + * * @param address the address to update */ private void updateSyncSelectedAddress(BigInteger address) { - - if (!fIsCreated) + + if (!fIsCreated) { return; + } PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractAsyncTableRendering.PROPERTY_SELECTED_ADDRESS, null, address); firePropertyChangedEvent(event); } - + /** * update column size in synchronizer */ private void updateSyncColSize() { - - if (!fIsCreated) + + if (!fIsCreated) { return; - + } + PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractAsyncTableRendering.PROPERTY_COL_SIZE, null, new Integer(fColumnSize)); firePropertyChangedEvent(event); } - + /** * update column size in synchronizer */ private void updateSyncRowSize() { - - if (!fIsCreated) + + if (!fIsCreated) { return; - + } + PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractAsyncTableRendering.PROPERTY_ROW_SIZE, null, new Integer(fBytePerLine)); firePropertyChangedEvent(event); } - + /** * update top visible address in synchronizer + * * @param address the address to update */ private void updateSyncTopAddress(BigInteger address) { - - if (!fIsCreated) + + if (!fIsCreated) { return; + } PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractAsyncTableRendering.PROPERTY_TOP_ADDRESS, null, address); firePropertyChangedEvent(event); } - + private void updateSyncPageStartAddress(BigInteger address) { - - if (!fIsCreated) + + if (!fIsCreated) { return; - - if (isMemoryBlockBaseAddressChanged()) + } + + if (isMemoryBlockBaseAddressChanged()) { return; - + } + PropertyChangeEvent event = new PropertyChangeEvent(this, IInternalDebugUIConstants.PROPERTY_PAGE_START_ADDRESS, null, address); firePropertyChangedEvent(event); } - + /** * Returns the color provider for this rendering's memory block or * <code>null</code> if none. * <p> - * By default a color provider is obtained by asking this rendering's - * memory block for its {@link IColorProvider} adapter. When the color - * provider is queried for color information, it is provided with a - * {@link MemoryRenderingElement} as an argument. + * By default a color provider is obtained by asking this rendering's memory + * block for its {@link IColorProvider} adapter. When the color provider is + * queried for color information, it is provided with a + * {@link MemoryRenderingElement} as an argument. * </p> - * @return the color provider for this rendering's memory block, - * or <code>null</code> + * + * @return the color provider for this rendering's memory block, or + * <code>null</code> */ - protected IColorProvider getColorProviderAdapter() - { - return (IColorProvider)getMemoryBlock().getAdapter(IColorProvider.class); + protected IColorProvider getColorProviderAdapter() { + return (IColorProvider) getMemoryBlock().getAdapter(IColorProvider.class); } - + /** * Returns the label provider for this rendering's memory block or * <code>null</code> if none. * <p> - * By default a label provider is obtained by asking this rendering's - * memory block for its {@link ILabelProvider} adapter. When the label - * provider is queried for label information, it is provided with a - * {@link MemoryRenderingElement} as an argument. + * By default a label provider is obtained by asking this rendering's memory + * block for its {@link ILabelProvider} adapter. When the label provider is + * queried for label information, it is provided with a + * {@link MemoryRenderingElement} as an argument. * </p> - * @return the label provider for this rendering's memory block, - * or <code>null</code> + * + * @return the label provider for this rendering's memory block, or + * <code>null</code> */ - protected ILabelProvider getLabelProviderAdapter() - { - return (ILabelProvider)getMemoryBlock().getAdapter(ILabelProvider.class); + protected ILabelProvider getLabelProviderAdapter() { + return (ILabelProvider) getMemoryBlock().getAdapter(ILabelProvider.class); } - + /** * Returns the font provider for this rendering's memory block or * <code>null</code> if none. * <p> - * By default a font provider is obtained by asking this rendering's - * memory block for its {@link IFontProvider} adapter. When the font - * provider is queried for font information, it is provided with a - * {@link MemoryRenderingElement} as an argument. + * By default a font provider is obtained by asking this rendering's memory + * block for its {@link IFontProvider} adapter. When the font provider is + * queried for font information, it is provided with a + * {@link MemoryRenderingElement} as an argument. * </p> - * @return the font provider for this rendering's memory block, - * or <code>null</code> + * + * @return the font provider for this rendering's memory block, or + * <code>null</code> */ - protected IFontProvider getFontProviderAdapter() - { - return (IFontProvider)getMemoryBlock().getAdapter(IFontProvider.class); + protected IFontProvider getFontProviderAdapter() { + return (IFontProvider) getMemoryBlock().getAdapter(IFontProvider.class); } - + /** * Returns the table presentation for this rendering's memory block or * <code>null</code> if none. @@ -2748,102 +2719,106 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende * By default a table presentation is obtained by asking this rendering's * memory block for its {@link IMemoryBlockTablePresentation} adapter. * </p> - * @return the table presentation for this rendering's memory block, - * or <code>null</code> + * + * @return the table presentation for this rendering's memory block, or + * <code>null</code> */ - protected IMemoryBlockTablePresentation getTablePresentationAdapter() - { - return (IMemoryBlockTablePresentation)getMemoryBlock().getAdapter(IMemoryBlockTablePresentation.class); + protected IMemoryBlockTablePresentation getTablePresentationAdapter() { + return (IMemoryBlockTablePresentation) getMemoryBlock().getAdapter(IMemoryBlockTablePresentation.class); } - + /** * Setup the viewer so it supports hovers to show the offset of each field */ private void createToolTip() { - - fToolTipShell = new Shell(DebugUIPlugin.getShell(), SWT.ON_TOP | SWT.RESIZE ); + + fToolTipShell = new Shell(DebugUIPlugin.getShell(), SWT.ON_TOP | SWT.RESIZE); GridLayout gridLayout = new GridLayout(); gridLayout.numColumns = 1; gridLayout.marginWidth = 2; gridLayout.marginHeight = 0; fToolTipShell.setLayout(gridLayout); fToolTipShell.setBackground(fTableViewer.getTable().getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); - + final Control toolTipControl = createToolTipControl(fToolTipShell); - - if (toolTipControl == null) - { + + if (toolTipControl == null) { // if client decide not to use tooltip support fToolTipShell.dispose(); return; } - - MouseTrackAdapter listener = new MouseTrackAdapter(){ - + + MouseTrackAdapter listener = new MouseTrackAdapter() { + private TableItem fTooltipItem = null; private int fCol = -1; - - public void mouseExit(MouseEvent e){ - - if (!fToolTipShell.isDisposed()) + + @Override + public void mouseExit(MouseEvent e) { + + if (!fToolTipShell.isDisposed()) { fToolTipShell.setVisible(false); + } fTooltipItem = null; } - - public void mouseHover(MouseEvent e){ - + + @Override + public void mouseHover(MouseEvent e) { + Point hoverPoint = new Point(e.x, e.y); Control control = null; - - if (e.widget instanceof Control) - control = (Control)e.widget; - - if (control == null) + + if (e.widget instanceof Control) { + control = (Control) e.widget; + } + + if (control == null) { return; - + } + hoverPoint = control.toDisplay(hoverPoint); TableItem item = getItem(hoverPoint); int column = getColumn(hoverPoint); - - //Only if there is a change in hover - if(this.fTooltipItem != item || fCol != column){ - - //Keep Track of the latest hover + + // Only if there is a change in hover + if (this.fTooltipItem != item || fCol != column) { + + // Keep Track of the latest hover fTooltipItem = item; fCol = column; - - if(item != null){ + + if (item != null) { toolTipAboutToShow(toolTipControl, fTooltipItem, column); - - //Setting location of the tooltip + + // Setting location of the tooltip Rectangle shellBounds = fToolTipShell.getBounds(); shellBounds.x = hoverPoint.x; shellBounds.y = hoverPoint.y + item.getBounds(0).height; - + fToolTipShell.setBounds(shellBounds); fToolTipShell.pack(); - + fToolTipShell.setVisible(true); - } - else { + } else { fToolTipShell.setVisible(false); } } } }; - + fTableViewer.getTable().addMouseTrackListener(listener); fTableViewer.getCursor().addMouseTrackListener(listener); } - + /** - * Creates the control used to display tool tips for cells in this table. By default - * a label is used to display the address of the cell. Clients may override this - * method to create custom tooltip controls. + * Creates the control used to display tool tips for cells in this table. By + * default a label is used to display the address of the cell. Clients may + * override this method to create custom tooltip controls. * <p> - * Also see the methods <code>getToolTipText(...)</code> and + * Also see the methods <code>getToolTipText(...)</code> and * <code>toolTipAboutToShow(...)</code>. * </p> + * * @param composite parent for the tooltip control * @return the tooltip control to be displayed * @since 3.2 @@ -2852,89 +2827,88 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende Control fToolTipLabel = new Label(composite, SWT.NONE); fToolTipLabel.setForeground(fTableViewer.getTable().getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND)); fToolTipLabel.setBackground(fTableViewer.getTable().getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); - fToolTipLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | - GridData.VERTICAL_ALIGN_CENTER)); + fToolTipLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_CENTER)); return fToolTipLabel; } - + /** - * Bug with table widget,BUG 113015, the widget is not able to return the correct - * table item if SWT.FULL_SELECTION is not on when the table is created. - * Created the following function to work around the problem. - * We can remove this method when the bug is fixed. + * Bug with table widget,BUG 113015, the widget is not able to return the + * correct table item if SWT.FULL_SELECTION is not on when the table is + * created. Created the following function to work around the problem. We + * can remove this method when the bug is fixed. + * * @param point the given {@link Point} to find the {@link TableItem} for - * @return the table item where the point is located, return null if the item cannot be located. + * @return the table item where the point is located, return null if the + * item cannot be located. */ - private TableItem getItem(Point point) - { + private TableItem getItem(Point point) { TableItem[] items = fTableViewer.getTable().getItems(); - for (int i=0; i<items.length; i++) - { + for (int i = 0; i < items.length; i++) { TableItem item = items[i]; - if (item.getData() != null) - { + if (item.getData() != null) { Point start = new Point(item.getBounds(0).x, item.getBounds(0).y); start = fTableViewer.getTable().toDisplay(start); Point end = new Point(start.x + item.getBounds(0).width, start.y + item.getBounds(0).height); - - if (start.y < point.y && point.y < end.y) + + if (start.y < point.y && point.y < end.y) { return item; + } } } return null; } - + /** * Method for figuring out which column the point is located. + * * @param point the {@link Point} the get the column number for - * @return the column index where the point is located, return -1 if column is not found. + * @return the column index where the point is located, return -1 if column + * is not found. */ - private int getColumn(Point point) - { + private int getColumn(Point point) { int colCnt = fTableViewer.getTable().getColumnCount(); - + TableItem item = null; - for (int i=0; i<fTableViewer.getTable().getItemCount(); i++) - { + for (int i = 0; i < fTableViewer.getTable().getItemCount(); i++) { item = fTableViewer.getTable().getItem(i); - if (item.getData() != null) + if (item.getData() != null) { break; + } } - - if (item != null) - { - for (int i=0; i<colCnt; i++) - { + + if (item != null) { + for (int i = 0; i < colCnt; i++) { Point start = new Point(item.getBounds(i).x, item.getBounds(i).y); start = fTableViewer.getTable().toDisplay(start); Point end = new Point(start.x + item.getBounds(i).width, start.y + item.getBounds(i).height); - - if (start.x < point.x && end.x > point.x) + + if (start.x < point.x && end.x > point.x) { return i; + } } } return -1; } - + /** - * Called when the tool tip is about to show in this rendering. - * Clients who overrides <code>createTooltipControl</code> may need to - * also override this method to ensure that the tooltip shows up properly - * in their customized control. + * Called when the tool tip is about to show in this rendering. Clients who + * overrides <code>createTooltipControl</code> may need to also override + * this method to ensure that the tooltip shows up properly in their + * customized control. * <p> * By default a text tooltip is displayed, and the contents for the tooltip * are generated by the <code>getToolTipText(...)</code> method. * </p> + * * @param toolTipControl - the control for displaying the tooltip * @param item - the table item where the mouse is pointing. * @param col - the column at which the mouse is pointing. * @since 3.2 */ - protected void toolTipAboutToShow(Control toolTipControl, TableItem item, - int col) { + protected void toolTipAboutToShow(Control toolTipControl, TableItem item, int col) { if (toolTipControl instanceof Label) { Object address = fTableViewer.getKey(fTableViewer.getTable().indexOf(item), col); - if (address != null && address instanceof BigInteger) { + if (address != null && address instanceof BigInteger) { Object data = item.getData(); if (data instanceof MemorySegment) { MemorySegment line = (MemorySegment) data; @@ -2944,110 +2918,101 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende int end = start + getBytesPerColumn(); MemoryByte[] bytes = line.getBytes(start, end); - String str = getToolTipText((BigInteger)address, bytes); + String str = getToolTipText((BigInteger) address, bytes); - if (str != null) + if (str != null) { ((Label) toolTipControl).setText(str); + } } else { - String str = getToolTipText((BigInteger)address, - new MemoryByte[] {}); + String str = getToolTipText((BigInteger) address, new MemoryByte[] {}); - if (str != null) + if (str != null) { ((Label) toolTipControl).setText(str); + } } } } } } - + /** - * Returns the text to display in a tool tip at the specified address - * for the specified bytes. By default the address of the bytes is displayed. + * Returns the text to display in a tool tip at the specified address for + * the specified bytes. By default the address of the bytes is displayed. * Subclasses may override. * - * @param address address of cell that tool tip is displayed for + * @param address address of cell that tool tip is displayed for * @param bytes the bytes in the cell * @return the tooltip text for the memory bytes located at the specified * address * @since 3.2 */ - protected String getToolTipText(BigInteger address, MemoryByte[] bytes) - { + protected String getToolTipText(BigInteger address, MemoryByte[] bytes) { StringBuffer buf = new StringBuffer("0x"); //$NON-NLS-1$ buf.append(address.toString(16).toUpperCase()); - + return buf.toString(); } - - private void setColumnHeadings() - { + + private void setColumnHeadings() { String[] columnLabels = new String[0]; - + IMemoryBlockTablePresentation presentation = getTablePresentationAdapter(); - if (presentation != null) - { - columnLabels = presentation.getColumnLabels(getMemoryBlock(), getBytesPerLine(), getBytesPerLine()/getBytesPerColumn()); + if (presentation != null) { + columnLabels = presentation.getColumnLabels(getMemoryBlock(), getBytesPerLine(), getBytesPerLine() / getBytesPerColumn()); } - + // check that column labels returned are not null - if (columnLabels == null) + if (columnLabels == null) { columnLabels = new String[0]; - - int numByteColumns = fBytePerLine/fColumnSize; - + } + + int numByteColumns = fBytePerLine / fColumnSize; + TableColumn[] columns = fTableViewer.getTable().getColumns(); - - int j=0; - for (int i=1; i<columns.length-1; i++) - { + + int j = 0; + for (int i = 1; i < columns.length - 1; i++) { // if the number of column labels returned is correct // use supplied column labels - if (columnLabels.length == numByteColumns) - { + if (columnLabels.length == numByteColumns) { columns[i].setText(columnLabels[j]); j++; - } - else - { + } else { // otherwise, use default int addressableUnit = getAddressableUnitPerColumn(); - if (addressableUnit >= 4) - { - columns[i].setText(Integer.toHexString(j*addressableUnit).toUpperCase() + - " - " + Integer.toHexString(j*addressableUnit+addressableUnit-1).toUpperCase()); //$NON-NLS-1$ - } - else - { - columns[i].setText(Integer.toHexString(j*addressableUnit).toUpperCase()); + if (addressableUnit >= 4) { + columns[i].setText(Integer.toHexString(j * addressableUnit).toUpperCase() + " - " + Integer.toHexString(j * addressableUnit + addressableUnit - 1).toUpperCase()); //$NON-NLS-1$ + } else { + columns[i].setText(Integer.toHexString(j * addressableUnit).toUpperCase()); } j++; } } } - + /** * * Return this rendering's viewer + * * @return this rendering's viewer */ - public StructuredViewer getViewer() - { + public StructuredViewer getViewer() { return fTableViewer; } - - private boolean isMemoryBlockBaseAddressChanged() - { + + private boolean isMemoryBlockBaseAddressChanged() { try { BigInteger address = getMemoryBlockBaseAddress(); BigInteger oldBaseAddress = fContentDescriptor.getContentBaseAddress(); - if (!oldBaseAddress.equals(address)) + if (!oldBaseAddress.equals(address)) { return true; + } } catch (DebugException e) { // fail silently } return false; } - + /** * @param topVisibleAddress the address to get the description for */ @@ -3058,23 +3023,21 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende fContentDescriptor.setLoadAddress(topVisibleAddress); try { fContentDescriptor.updateContentBaseAddress(); - + } catch (DebugException e) { fError = true; showMessage(e.getMessage()); } - + fContentDescriptor.setAddressableSize(getAddressableSize()); - + try { int addressSize = 4; - if (getMemoryBlock() instanceof IMemoryBlockExtension) - { - IMemoryBlockExtension extMb = (IMemoryBlockExtension)getMemoryBlock(); + if (getMemoryBlock() instanceof IMemoryBlockExtension) { + IMemoryBlockExtension extMb = (IMemoryBlockExtension) getMemoryBlock(); addressSize = extMb.getAddressSize(); - - if (addressSize <= 0) - { + + if (addressSize <= 0) { DebugUIPlugin.logErrorMessage("Invalid address Size: " + addressSize); //$NON-NLS-1$ addressSize = 4; } @@ -3085,104 +3048,115 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende fError = true; showMessage(e.getMessage()); } finally { - if (fContentDescriptor.getAddressSize() <= 0) + if (fContentDescriptor.getAddressSize() <= 0) { fContentDescriptor.setAddressSize(4); + } } } - + /** - * Return the number of lines to be bufferred before the top visible line of the memory rendering - * @return number of lines to be buffered before the top visible line in the memory rendering + * Return the number of lines to be bufferred before the top visible line of + * the memory rendering + * + * @return number of lines to be buffered before the top visible line in the + * memory rendering */ - private int getPreBufferSize() - { - if (fPreBufferSize < 0) + private int getPreBufferSize() { + if (fPreBufferSize < 0) { getPreBufferSizeFromPreference(); - + } + return fPreBufferSize; } - + /** - * Returns the number of lines to be bufferred after the last visible line in the memory rendering - * @return the number of lines to be bufferred after the last visible line in the memory rendering + * Returns the number of lines to be bufferred after the last visible line + * in the memory rendering + * + * @return the number of lines to be bufferred after the last visible line + * in the memory rendering */ - private int getPostBufferSize() - { - if (fPostBufferSize < 0) + private int getPostBufferSize() { + if (fPostBufferSize < 0) { getPostBufferSizeFromPreference(); - + } + return fPostBufferSize; } - - private TableRenderingContentDescriptor getContentDescriptor() - { + + private TableRenderingContentDescriptor getContentDescriptor() { return fContentDescriptor; } - - private void createGoToAddressComposite(Composite parent) - { + + private void createGoToAddressComposite(Composite parent) { fGoToAddressComposite = new GoToAddressComposite(); fGoToAddressComposite.createControl(parent); Button button = fGoToAddressComposite.getButton(IDialogConstants.OK_ID); - if (button != null) - { + if (button != null) { button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { doGoToAddress(); } }); - + button = fGoToAddressComposite.getButton(IDialogConstants.CANCEL_ID); - if (button != null) - { + if (button != null) { button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { hideGotoAddressComposite(); - }}); + } + }); } } - + fGoToAddressComposite.getExpressionWidget().addSelectionListener(new SelectionAdapter() { + @Override public void widgetDefaultSelected(SelectionEvent e) { doGoToAddress(); - }}); - + } + }); + fGoToAddressComposite.getExpressionWidget().addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { - if (e.keyCode == SWT.ESC) + if (e.keyCode == SWT.ESC) { hideGotoAddressComposite(); + } super.keyPressed(e); - }}); + } + }); } - + private void showGoToAddressComposite() { - + String selectedStr = getSelectedAsString(); Text text = fGoToAddressComposite.getExpressionWidget(); text.setText(selectedStr); text.setSelection(0, text.getCharCount()); - + double height = fGoToAddressComposite.getHeight(); double canvasHeight = fSashForm.getParent().getClientArea().height; double tableHeight = canvasHeight - height; - - double tableWeight = (tableHeight/canvasHeight) * 100; + + double tableWeight = (tableHeight / canvasHeight) * 100; double textWeight = (height / canvasHeight) * 100; - fSashForm.setWeights(new int[]{(int)tableWeight, (int)textWeight}); + fSashForm.setWeights(new int[] { (int) tableWeight, (int) textWeight }); fSashForm.setMaximizedControl(null); - + fGoToAddressComposite.getExpressionWidget().setFocus(); } - - private void hideGotoAddressComposite() - { + + private void hideGotoAddressComposite() { fSashForm.setMaximizedControl(fTableViewer.getControl()); - if (isActivated()) + if (isActivated()) { fTableViewer.getControl().setFocus(); + } } - + /** * */ @@ -3192,139 +3166,139 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende fGoToAddressAction.doGoToAddress(address.toString(16)); hideGotoAddressComposite(); } catch (DebugException e1) { - MemoryViewUtil.openError(DebugUIMessages.GoToAddressAction_Go_to_address_failed, - DebugUIMessages.GoToAddressAction_Go_to_address_failed, e1); - } catch (NumberFormatException e1) - { - MemoryViewUtil.openError(DebugUIMessages.GoToAddressAction_Go_to_address_failed, - DebugUIMessages.GoToAddressAction_Address_is_invalid, e1); + MemoryViewUtil.openError(DebugUIMessages.GoToAddressAction_Go_to_address_failed, DebugUIMessages.GoToAddressAction_Go_to_address_failed, e1); + } catch (NumberFormatException e1) { + MemoryViewUtil.openError(DebugUIMessages.GoToAddressAction_Go_to_address_failed, DebugUIMessages.GoToAddressAction_Address_is_invalid, e1); } } - + + @Override public void activated() { super.activated(); - + fActivated = true; IWorkbench workbench = PlatformUI.getWorkbench(); - ICommandService commandSupport = (ICommandService)workbench.getAdapter(ICommandService.class); - IContextService contextSupport = (IContextService)workbench.getAdapter(IContextService.class); - - if (commandSupport != null && contextSupport != null) - { + ICommandService commandSupport = (ICommandService) workbench.getAdapter(ICommandService.class); + IContextService contextSupport = (IContextService) workbench.getAdapter(IContextService.class); + + if (commandSupport != null && contextSupport != null) { fContext.add(contextSupport.activateContext(ID_ASYNC_TABLE_RENDERING_CONTEXT)); Command gotoCommand = commandSupport.getCommand(ID_GO_TO_ADDRESS_COMMAND); - if (fGoToAddressHandler == null) - { + if (fGoToAddressHandler == null) { fGoToAddressHandler = new AbstractHandler() { + @Override public Object execute(ExecutionEvent event) throws ExecutionException { - if (fSashForm.getMaximizedControl() != null) + if (fSashForm.getMaximizedControl() != null) { fGoToAddressAction.run(); - else + } else { hideGotoAddressComposite(); + } return null; - }}; + } + }; } gotoCommand.setHandler(fGoToAddressHandler); - - // The page up and page down actions can only be activated if the rendering - // is in manual scrolling mode. We are unable to determine the scrolling mode - // until the content descriptor is created. When the rendering is activated, the content - // descriptor may not be created yet. In that case, we cannot activate the shortcuts here. + + // The page up and page down actions can only be activated if the + // rendering + // is in manual scrolling mode. We are unable to determine the + // scrolling mode + // until the content descriptor is created. When the rendering is + // activated, the content + // descriptor may not be created yet. In that case, we cannot + // activate the shortcuts here. // We will activate the shortcut after the rendering is created. - if (fContentDescriptor != null && !isDynamicLoad()) - { + if (fContentDescriptor != null && !isDynamicLoad()) { activatePageActions(); } - } + } } private void activatePageActions() { IWorkbench workbench = PlatformUI.getWorkbench(); - ICommandService commandSupport = (ICommandService)workbench.getAdapter(ICommandService.class); - if (commandSupport != null) - { + ICommandService commandSupport = (ICommandService) workbench.getAdapter(ICommandService.class); + if (commandSupport != null) { Command nextPage = commandSupport.getCommand(ID_NEXT_PAGE_COMMAND); - if (fNextPageHandler == null) - { + if (fNextPageHandler == null) { fNextPageHandler = new AbstractHandler() { - - public Object execute(ExecutionEvent arg0) - throws ExecutionException { + + @Override + public Object execute(ExecutionEvent arg0) throws ExecutionException { fNextAction.run(); return null; - } + } }; } nextPage.setHandler(fNextPageHandler); - + Command prevPage = commandSupport.getCommand(ID_PREV_PAGE_COMMAND); - if (fPrevPageHandler == null) - { + if (fPrevPageHandler == null) { fPrevPageHandler = new AbstractHandler() { - - public Object execute(ExecutionEvent arg0) - throws ExecutionException { + + @Override + public Object execute(ExecutionEvent arg0) throws ExecutionException { fPrevAction.run(); return null; - } + } }; } prevPage.setHandler(fPrevPageHandler); } } + @Override public void deactivated() { - + fActivated = false; - IWorkbench workbench = PlatformUI.getWorkbench(); - ICommandService commandSupport = (ICommandService)workbench.getAdapter(ICommandService.class); - IContextService contextSupport = (IContextService)workbench.getAdapter(IContextService.class); - - if (commandSupport != null && contextSupport != null) - { - // remove handler + IWorkbench workbench = PlatformUI.getWorkbench(); + ICommandService commandSupport = (ICommandService) workbench.getAdapter(ICommandService.class); + IContextService contextSupport = (IContextService) workbench.getAdapter(IContextService.class); + + if (commandSupport != null && contextSupport != null) { + // remove handler Command command = commandSupport.getCommand(ID_GO_TO_ADDRESS_COMMAND); command.setHandler(null); - + command = commandSupport.getCommand(ID_NEXT_PAGE_COMMAND); command.setHandler(null); - + command = commandSupport.getCommand(ID_PREV_PAGE_COMMAND); command.setHandler(null); - if (fContext != null) + if (fContext != null) { contextSupport.deactivateContexts(fContext); + } } super.deactivated(); } - - private boolean isActivated() - { + + private boolean isActivated() { return fActivated; } - + /** - * Returns text for the given memory bytes at the specified address for the specified - * rendering type. This is called by the label provider for. + * Returns text for the given memory bytes at the specified address for the + * specified rendering type. This is called by the label provider for. * Subclasses must override. * * @param renderingTypeId rendering type identifier * @param address address where the bytes belong to * @param data the bytes - * @return a string to represent the memory. Cannot not return <code>null</code>. - * Returns a string to pad the cell if the memory cannot be converted - * successfully. + * @return a string to represent the memory. Cannot not return + * <code>null</code>. Returns a string to pad the cell if the memory + * cannot be converted successfully. */ + @Override abstract public String getString(String renderingTypeId, BigInteger address, MemoryByte[] data); - + /** * Returns bytes for the given text corresponding to bytes at the given - * address for the specified rendering type. This is called by the cell modifier - * when modifying bytes in a memory block. - * Subclasses must convert the string value to an array of bytes. The bytes will - * be passed to the debug adapter for memory block modification. - * Returns <code>null</code> if the bytes cannot be formatted properly. + * address for the specified rendering type. This is called by the cell + * modifier when modifying bytes in a memory block. Subclasses must convert + * the string value to an array of bytes. The bytes will be passed to the + * debug adapter for memory block modification. Returns <code>null</code> if + * the bytes cannot be formatted properly. * * @param renderingTypeId rendering type identifier * @param address address the bytes begin at @@ -3332,5 +3306,6 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende * @param newValue the string to be converted to bytes * @return the bytes converted from a string */ + @Override abstract public byte[] getBytes(String renderingTypeId, BigInteger address, MemoryByte[] currentValues, String newValue); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java index bed96d88a..4d9b480b8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,16 +19,17 @@ import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.ui.IDebugUIConstants; /** - * Abstract implementation of a rendering that translates memory into - * text, displayed in a table. + * Abstract implementation of a rendering that translates memory into text, + * displayed in a table. * <p> - * Clients should subclass from this class if they wish to provide a table - * text rendering with a specific code page. + * Clients should subclass from this class if they wish to provide a table text + * rendering with a specific code page. * </p> + * * @since 3.2 */ -abstract public class AbstractAsyncTextRendering extends AbstractAsyncTableRendering { - +abstract public class AbstractAsyncTextRendering extends AbstractAsyncTableRendering { + private String fCodePage; /** @@ -36,83 +37,78 @@ abstract public class AbstractAsyncTextRendering extends AbstractAsyncTableRende * * @param renderingId memory rendering type identifier */ - public AbstractAsyncTextRendering(String renderingId) - { + public AbstractAsyncTextRendering(String renderingId) { super(renderingId); } - + /** - * Constructs a text rendering of the specified type on the given - * code page. + * Constructs a text rendering of the specified type on the given code page. * * @param renderingId memory rendering type identifier - * @param codePage the name of a supported - * {@link java.nio.charset.Charset </code>charset<code>}, for - * example <code>CP1252</code> + * @param codePage the name of a supported {@link java.nio.charset.Charset + * </code>charset<code>}, for example <code>CP1252</code> */ - public AbstractAsyncTextRendering(String renderingId, String codePage) - { + public AbstractAsyncTextRendering(String renderingId, String codePage) { super(renderingId); fCodePage = codePage; } - + /** - * Sets the code page for this rendering. This does not cause - * the rendering to be updated with the new code page. Clients need - * to update the rendering manually when the code page is changed. + * Sets the code page for this rendering. This does not cause the rendering + * to be updated with the new code page. Clients need to update the + * rendering manually when the code page is changed. * - * @param codePage the name of a supported - * {@link java.nio.charset.Charset </code>charset<code>}, for - * example <code>CP1252</code> + * @param codePage the name of a supported {@link java.nio.charset.Charset + * </code>charset<code>}, for example <code>CP1252</code> */ - public void setCodePage(String codePage) - { + public void setCodePage(String codePage) { fCodePage = codePage; } - + /** - * Returns the current code page used by this rendering. Returns null - * if not set. - * @return Returns the current code page used by this rendering. Returns null - * if not set. + * Returns the current code page used by this rendering. Returns null if not + * set. + * + * @return Returns the current code page used by this rendering. Returns + * null if not set. */ - public String getCodePage() - { + public String getCodePage() { return fCodePage; } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.provisional.AbstractAsyncTableRendering#getString(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[]) + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.ui.views.memory.provisional. + * AbstractAsyncTableRendering#getString(java.lang.String, + * java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[]) */ - public String getString(String dataType, BigInteger address, MemoryByte[] data) { + @Override + public String getString(String dataType, BigInteger address, MemoryByte[] data) { try { String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR); - if(fCodePage == null) + if (fCodePage == null) { return IInternalDebugCoreConstants.EMPTY_STRING; - + } + boolean[] invalid = new boolean[data.length]; boolean hasInvalid = false; byte byteArray[] = new byte[data.length]; - for (int i=0; i<data.length; i++) - { - if (!data[i].isReadable()) - { + for (int i = 0; i < data.length; i++) { + if (!data[i].isReadable()) { invalid[i] = true; hasInvalid = true; } byteArray[i] = data[i].getValue(); } - - if (hasInvalid) - { + + if (hasInvalid) { StringBuffer strBuf = new StringBuffer(); - for (int i=0; i<data.length; i++) - { - if (invalid[i]) + for (int i = 0; i < data.length; i++) { + if (invalid[i]) { strBuf.append(paddedStr); - else - strBuf.append(new String(new byte[]{byteArray[i]}, fCodePage)); + } else { + strBuf.append(new String(new byte[] { byteArray[i] }, fCodePage)); + } } return strBuf.toString(); } @@ -123,20 +119,25 @@ abstract public class AbstractAsyncTextRendering extends AbstractAsyncTableRende return "-- error --"; //$NON-NLS-1$ } } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.provisional.AbstractAsyncTableRendering#getBytes(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String) + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.ui.views.memory.provisional. + * AbstractAsyncTableRendering#getBytes(java.lang.String, + * java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], + * java.lang.String) */ + @Override public byte[] getBytes(String dataType, BigInteger address, MemoryByte[] currentValues, String data) { try { - - if (fCodePage == null) + + if (fCodePage == null) { return new byte[0]; - - byte[] bytes = data.getBytes(fCodePage); + } + + byte[] bytes = data.getBytes(fCodePage); return bytes; - + } catch (UnsupportedEncodingException e) { return new byte[0]; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/MemoryViewPresentationContext.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/MemoryViewPresentationContext.java index 2649243bd..42dd16ee0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/MemoryViewPresentationContext.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/MemoryViewPresentationContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,58 +16,65 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingContainer; import org.eclipse.debug.ui.memory.IMemoryRenderingSite; /** - * Presentation context from the Memory View. This presentation provides additional - * information regarding the originator of the asynchronous request. + * Presentation context from the Memory View. This presentation provides + * additional information regarding the originator of the asynchronous request. * * Clients may reference or subclass from this class. * * @since 3.2 - * + * */ -public class MemoryViewPresentationContext extends PresentationContext { +public class MemoryViewPresentationContext extends PresentationContext { - private IMemoryRenderingContainer fContainer; - private IMemoryRendering fRendering; + private IMemoryRenderingContainer fContainer; + private IMemoryRendering fRendering; private IMemoryRenderingSite fMemoryView; - + /** * Constructs MemoryViewPresentationContext - * @param site - the memory rendering site that this presentation context is for - * @param container - the memory rendering container that this presentation context is for, may be <code>null</code> - * @param rendering - - the memory rendering that this presentation context is for, may be <code>null</code> + * + * @param site - the memory rendering site that this presentation context is + * for + * @param container - the memory rendering container that this presentation + * context is for, may be <code>null</code> + * @param rendering - - the memory rendering that this presentation context + * is for, may be <code>null</code> */ public MemoryViewPresentationContext(IMemoryRenderingSite site, IMemoryRenderingContainer container, IMemoryRendering rendering) { super(site.getSite().getPart()); - + fMemoryView = site; fContainer = container; fRendering = rendering; } - + /** * Returns the memory rendering site that this presentation context is for + * * @return the memory rendering site that this presentation context is for */ - public IMemoryRenderingSite getMemoryRenderingSite() - { + public IMemoryRenderingSite getMemoryRenderingSite() { return fMemoryView; } - + /** - * Returns the memory rendering container that this presentation context is for - * @return the memory rendering container that this presentation context is for, <code>null</code> if none. + * Returns the memory rendering container that this presentation context is + * for + * + * @return the memory rendering container that this presentation context is + * for, <code>null</code> if none. */ - public IMemoryRenderingContainer getMemoryRenderingContainer() - { + public IMemoryRenderingContainer getMemoryRenderingContainer() { return fContainer; } - + /** * Returns the memory rendering that this presentation context is for - * @return the memory rendering that this presentation context is for, <code>null</code> if none. + * + * @return the memory rendering that this presentation context is for, + * <code>null</code> if none. */ - public IMemoryRendering getRendering() - { + public IMemoryRendering getRendering() { return fRendering; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java index 1bf8cfe5e..3ca3eaf7f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java @@ -35,6 +35,7 @@ public class BreakpointContainerLabelProvider extends DebugElementLabelProvider * (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getImageDescriptor(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected ImageDescriptor getImageDescriptor(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { ImageDescriptor desc = super.getImageDescriptor(elementPath, presentationContext, columnId); int flags = computeAdornmentFlags(); @@ -51,6 +52,7 @@ public class BreakpointContainerLabelProvider extends DebugElementLabelProvider * (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementLabelProvider#getChecked(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override public boolean getChecked(TreePath path, IPresentationContext presentationContext) throws CoreException { Object lastSegment = path.getLastSegment(); if (lastSegment instanceof IBreakpointContainer) { @@ -70,6 +72,7 @@ public class BreakpointContainerLabelProvider extends DebugElementLabelProvider * (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementLabelProvider#getGrayed(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override public boolean getGrayed(TreePath path, IPresentationContext presentationContext) throws CoreException { Object lastSegment = path.getLastSegment(); if (lastSegment instanceof IBreakpointContainer) { @@ -100,6 +103,7 @@ public class BreakpointContainerLabelProvider extends DebugElementLabelProvider } // Forward font data requests to the workbench adapter + @Override protected FontData getFontData(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); FontData fontData = super.getFontData(elementPath, presentationContext, columnId); @@ -114,6 +118,7 @@ public class BreakpointContainerLabelProvider extends DebugElementLabelProvider } // Forward foreground color requests to the workbench adapter + @Override protected RGB getForeground(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); RGB rgb = super.getForeground(elementPath, presentationContext, columnId); @@ -128,6 +133,7 @@ public class BreakpointContainerLabelProvider extends DebugElementLabelProvider } // Forward background color requests to the workbench adapter + @Override protected RGB getBackground(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); RGB rgb = super.getBackground(elementPath, presentationContext, columnId); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerMementoProvider.java index aaa5a05f3..9f4c8dbb6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerMementoProvider.java @@ -28,6 +28,7 @@ public class BreakpointContainerMementoProvider extends DebugElementMementoProvi * (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.DebugElementMementoProvider#getElementName(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
*/
+ @Override
protected String getElementName(Object element, IPresentationContext context) throws CoreException {
if (element instanceof IBreakpointContainer) {
IBreakpointContainer container = (IBreakpointContainer) element;
@@ -46,6 +47,7 @@ public class BreakpointContainerMementoProvider extends DebugElementMementoProvi /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementMementoProvider#isEqual(java.lang.Object, org.eclipse.ui.IMemento, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
*/
+ @Override
protected boolean supportsContextId(String id) {
return IDebugUIConstants.ID_BREAKPOINT_VIEW.equals(id);
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContentProvider.java index c66ac4bac..925489fee 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContentProvider.java @@ -25,6 +25,7 @@ public class BreakpointContentProvider extends ElementContentProvider { /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate)
*/
+ @Override
protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException {
return 0;
}
@@ -32,6 +33,7 @@ public class BreakpointContentProvider extends ElementContentProvider { /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate)
*/
+ @Override
protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException {
return null;
}
@@ -39,6 +41,7 @@ public class BreakpointContentProvider extends ElementContentProvider { /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#supportsContextId(java.lang.String)
*/
+ @Override
protected boolean supportsContextId(String id) {
return id.equals(IDebugUIConstants.ID_BREAKPOINT_VIEW);
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointLabelProvider.java index 5e21aada1..59a7c246a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointLabelProvider.java @@ -28,6 +28,7 @@ public class BreakpointLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementLabelProvider#getLabel(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String, int) */ + @Override protected String getLabel(TreePath elementPath, IPresentationContext presentationContext, String columnId, int columnIndex) throws CoreException { if (columnIndex == 0) return super.getLabel(elementPath, presentationContext, columnId, columnIndex); @@ -38,6 +39,7 @@ public class BreakpointLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementLabelProvider#getImageDescriptor(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String, int) */ + @Override protected ImageDescriptor getImageDescriptor(TreePath elementPath, IPresentationContext presentationContext, String columnId, int columnIndex) throws CoreException { if (columnIndex == 0) return super.getImageDescriptor(elementPath, presentationContext, columnId, columnIndex); @@ -49,6 +51,7 @@ public class BreakpointLabelProvider extends DebugElementLabelProvider { * (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementLabelProvider#getChecked(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override public boolean getChecked(TreePath path, IPresentationContext presentationContext) throws CoreException { Object lastSegment = path.getLastSegment(); if (lastSegment instanceof IBreakpoint) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java index 7337ff05e..8d7282b73 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java @@ -21,6 +21,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.eclipse.core.resources.IMarkerDelta; @@ -86,7 +87,7 @@ public class BreakpointManagerContentProvider extends ElementContentProvider /** * Model proxy of the input */ - final private List/*<AbstractModelProxy>*/ fProxies = new ArrayList(1); + final private List<BreakpointManagerProxy> fProxies = new ArrayList<BreakpointManagerProxy>(1); /** * Element comparator, use to compare the ordering of elements for the model @@ -109,20 +110,23 @@ public class BreakpointManagerContentProvider extends ElementContentProvider private IStructuredSelection fDebugContext = StructuredSelection.EMPTY; private IPropertyChangeListener fOrganizersListener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { // For any property changes in breakpoint organizers, refresh the containers. updateContainers(); } }; private IPropertyChangeListener fPresentationContextListener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { presentationPropertyChanged(event); } }; private IDebugContextListener fDebugContextListener = new IDebugContextListener() { - public void debugContextChanged(DebugContextEvent event) { + @Override + public void debugContextChanged(DebugContextEvent event) { InputData.this.debugContextChanged(event); } }; @@ -209,7 +213,7 @@ public class BreakpointManagerContentProvider extends ElementContentProvider } synchronized BreakpointManagerProxy[] getProxies() { - return (BreakpointManagerProxy[])fProxies.toArray(new BreakpointManagerProxy[fProxies.size()]); + return fProxies.toArray(new BreakpointManagerProxy[fProxies.size()]); } /** @@ -342,7 +346,7 @@ public class BreakpointManagerContentProvider extends ElementContentProvider } synchronized(this) { - Set existingBreakpoints = new HashSet(Arrays.asList(fContainer.getBreakpoints())); + Set<IBreakpoint> existingBreakpoints = new HashSet<IBreakpoint>(Arrays.asList(fContainer.getBreakpoints())); // Bug 310879 // Process breakpoints in two passes: first remove breakpoints, then add new ones. @@ -375,7 +379,7 @@ public class BreakpointManagerContentProvider extends ElementContentProvider return; } - Iterator iter = selection.iterator(); + Iterator<?> iter = selection.iterator(); Object firstElement = iter.next(); if (firstElement == null || iter.hasNext()) { return; @@ -390,7 +394,7 @@ public class BreakpointManagerContentProvider extends ElementContentProvider } IBreakpoint[] breakpoints = thread.getBreakpoints(); - Set bpsSet = new HashSet(breakpoints.length * 4/3); + Set<IBreakpoint> bpsSet = new HashSet<IBreakpoint>(breakpoints.length * 4 / 3); for (int i = 0; i< breakpoints.length; i++) { bpsSet.add(breakpoints[i]); } @@ -419,7 +423,7 @@ public class BreakpointManagerContentProvider extends ElementContentProvider * @param breakpoints Breakpoint set to be selected. * @return whether we found a breakpoint to select */ - private boolean buildTrackSelectionDelta(ModelDelta delta, BreakpointContainer container, Set breakpoints) { + private boolean buildTrackSelectionDelta(ModelDelta delta, BreakpointContainer container, Set<IBreakpoint> breakpoints) { Object[] children = container.getChildren(); delta.setChildCount(children.length); for (int i = 0; i < children.length; i++) { @@ -516,9 +520,9 @@ public class BreakpointManagerContentProvider extends ElementContentProvider ModelDelta delta = new ModelDelta(fInput, IModelDelta.NO_CHANGE); // If the change caused a breakpoint to be added (installed) or remove (un-installed) update accordingly. - List removed = new ArrayList(); - List added = new ArrayList(); - List filteredAsList = Arrays.asList(filteredBreakpoints); + List<IBreakpoint> removed = new ArrayList<IBreakpoint>(); + List<IBreakpoint> added = new ArrayList<IBreakpoint>(); + List<IBreakpoint> filteredAsList = Arrays.asList(filteredBreakpoints); for (int i = 0; i < breakpoints.length; i++) { IBreakpoint bp = breakpoints[i]; boolean oldContainedBp = fContainer.contains(bp); @@ -530,13 +534,15 @@ public class BreakpointManagerContentProvider extends ElementContentProvider } } if (!added.isEmpty()) { - breakpointsAdded((IBreakpoint[]) added.toArray(new IBreakpoint[added.size()])); + breakpointsAdded(added.toArray(new IBreakpoint[added.size()])); } if (!removed.isEmpty()) { - breakpointsRemoved((IBreakpoint[]) removed.toArray(new IBreakpoint[removed.size()])); + breakpointsRemoved(removed.toArray(new IBreakpoint[removed.size()])); } for (int i = 0; i < filteredBreakpoints.length; ++i) - appendModelDelta(fContainer, delta, IModelDelta.STATE | IModelDelta.CONTENT, filteredBreakpoints[i]); // content flag triggers detail refresh + { + appendModelDelta(fContainer, delta, IModelDelta.STATE | IModelDelta.CONTENT, filteredBreakpoints[i]); // content flag triggers detail refresh + } if (DebugUIPlugin.DEBUG_BREAKPOINT_DELTAS) { DebugUIPlugin.trace("POST BREAKPOINT DELTA (breakpointsChanged)\n"); //$NON-NLS-1$ @@ -594,8 +600,9 @@ public class BreakpointManagerContentProvider extends ElementContentProvider BreakpointContainer.addChildContainer(container, (BreakpointContainer) refChildren[i], containerDelta); } else if(refChildren[i] instanceof IBreakpoint) { BreakpointContainer.addBreakpoint(container, (IBreakpoint) refChildren[i], containerDelta); - if (newBreakpoint == null) - newBreakpoint = (IBreakpoint) refChildren[i]; + if (newBreakpoint == null) { + newBreakpoint = (IBreakpoint) refChildren[i]; + } } // if a child exist in container, than recursively search into container. And also update the organizer of @@ -650,14 +657,17 @@ public class BreakpointManagerContentProvider extends ElementContentProvider * @see #deleteRemovedElements */ private Object getElement(Object[] collection, Object element) { - for (int i = 0; i < collection.length; ++i) - if (collection[i] instanceof BreakpointContainer && element instanceof BreakpointContainer) { - if (collection[i].equals(element)) - return collection[i]; + for (int i = 0; i < collection.length; ++i) { + if (collection[i] instanceof BreakpointContainer && element instanceof BreakpointContainer) { + if (collection[i].equals(element)) { + return collection[i]; + } } else { - if (collection[i].equals(element)) - return collection[i]; + if (collection[i].equals(element)) { + return collection[i]; + } } + } return null; } @@ -693,21 +703,22 @@ public class BreakpointManagerContentProvider extends ElementContentProvider */ synchronized private void postModelChanged(final IModelDelta delta, boolean select) { for (int i = 0; fProxies != null && i < fProxies.size(); i++) { - ((BreakpointManagerProxy)fProxies.get(i)).postModelChanged(delta, select); + fProxies.get(i).postModelChanged(delta, select); } } } - private class InputDataMap extends LinkedHashMap { + private class InputDataMap<K, V> extends LinkedHashMap<K, V> { private static final long serialVersionUID = 1L; public InputDataMap() { super(1, (float)0.75, true); } - protected boolean removeEldestEntry(java.util.Map.Entry arg0) { + @Override + protected boolean removeEldestEntry(java.util.Map.Entry<K, V> arg0) { InputData data = (InputData)arg0.getValue(); if (size() > getMaxInputsCache() && data.fProxies.isEmpty()) { data.dispose(); @@ -723,11 +734,13 @@ public class BreakpointManagerContentProvider extends ElementContentProvider */ private ISchedulingRule fBreakpointsListenerSchedulingRule = new ISchedulingRule() { - public boolean isConflicting(ISchedulingRule rule) { + @Override + public boolean isConflicting(ISchedulingRule rule) { return rule == this; } - public boolean contains(ISchedulingRule rule) { + @Override + public boolean contains(ISchedulingRule rule) { return rule == this; } }; @@ -735,7 +748,7 @@ public class BreakpointManagerContentProvider extends ElementContentProvider /** * A map of input to info data cache */ - final private Map fInputToData = Collections.synchronizedMap(new InputDataMap()); + final private Map<DefaultBreakpointsViewInput, InputData> fInputToData = Collections.synchronizedMap(new InputDataMap<DefaultBreakpointsViewInput, InputData>()); /** * Flag indicating whether the content provider is currently a breakpoints listener. @@ -757,15 +770,16 @@ public class BreakpointManagerContentProvider extends ElementContentProvider */ protected IBreakpoint[] filterBreakpoints(DefaultBreakpointsViewInput input, IStructuredSelection selectionFilter, IBreakpoint[] breakpoints) { if (selectionFilter != null && !selectionFilter.isEmpty()) { - List targets = getDebugTargets(selectionFilter); - ArrayList retVal = new ArrayList(); + List<IDebugTarget> targets = getDebugTargets(selectionFilter); + ArrayList<IBreakpoint> retVal = new ArrayList<IBreakpoint>(); if (targets != null) { for (int i = 0; i < breakpoints.length; ++i) { - if (supportsBreakpoint(targets, breakpoints[i])) - retVal.add(breakpoints[i]); + if (supportsBreakpoint(targets, breakpoints[i])) { + retVal.add(breakpoints[i]); + } } } - return (IBreakpoint[]) retVal.toArray(new IBreakpoint[retVal.size()]); + return retVal.toArray(new IBreakpoint[retVal.size()]); } else { return breakpoints; } @@ -789,10 +803,10 @@ public class BreakpointManagerContentProvider extends ElementContentProvider * @param breakpoint the breakpoint. * @return true if breakpoint contains in the list of targets. */ - protected boolean supportsBreakpoint(List targets, IBreakpoint breakpoint) { + protected boolean supportsBreakpoint(List<IDebugTarget> targets, IBreakpoint breakpoint) { boolean exist = targets.size() == 0 ? true : false; for (int i = 0; !exist && i < targets.size(); ++i) { - IDebugTarget target = (IDebugTarget) targets.get(i); + IDebugTarget target = targets.get(i); exist |= target.supportsBreakpoint(breakpoint); } return exist; @@ -804,10 +818,10 @@ public class BreakpointManagerContentProvider extends ElementContentProvider * @param ss the selection. * @return list of IDebugTarget object. */ - protected List getDebugTargets(IStructuredSelection ss) { - List debugTargets = new ArrayList(2); + protected List<IDebugTarget> getDebugTargets(IStructuredSelection ss) { + List<IDebugTarget> debugTargets = new ArrayList<IDebugTarget>(2); if (ss != null) { - Iterator i = ss.iterator(); + Iterator<?> i = ss.iterator(); while (i.hasNext()) { Object next = i.next(); if (next instanceof IDebugElement) { @@ -855,11 +869,11 @@ public class BreakpointManagerContentProvider extends ElementContentProvider * @param context Presentation context that was disposed. */ protected void contextDisposed(IPresentationContext context) { - List removed = new ArrayList(1); + List<InputData> removed = new ArrayList<InputData>(1); synchronized (fInputToData) { - for (Iterator itr = fInputToData.entrySet().iterator(); itr.hasNext();) { - Map.Entry entry = (Map.Entry)itr.next(); - IPresentationContext entryContext = ((DefaultBreakpointsViewInput)entry.getKey()).getContext(); + for (Iterator<Entry<DefaultBreakpointsViewInput, InputData>> itr = fInputToData.entrySet().iterator(); itr.hasNext();) { + Map.Entry<DefaultBreakpointsViewInput, InputData> entry = itr.next(); + IPresentationContext entryContext = entry.getKey().getContext(); if (context.equals(entryContext)) { removed.add(entry.getValue()); itr.remove(); @@ -869,7 +883,7 @@ public class BreakpointManagerContentProvider extends ElementContentProvider // Dispose the removed input data for (int i = 0; i < removed.size(); i++) { - ((InputData)removed.get(i)).dispose(); + removed.get(i).dispose(); } } @@ -899,7 +913,7 @@ public class BreakpointManagerContentProvider extends ElementContentProvider * @param proxy the manager proxy */ public void unregisterModelProxy(DefaultBreakpointsViewInput input, BreakpointManagerProxy proxy) { - InputData inputData = (InputData)fInputToData.get(input); + InputData inputData = fInputToData.get(input); if (inputData != null) { inputData.proxyDisposed(proxy); @@ -921,7 +935,7 @@ public class BreakpointManagerContentProvider extends ElementContentProvider InputData data = null; synchronized (fInputToData) { - data = (InputData)fInputToData.get(input); + data = fInputToData.get(input); if (data == null) { data = new InputData(input); fInputToData.put(input, data); @@ -950,14 +964,16 @@ public class BreakpointManagerContentProvider extends ElementContentProvider /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#supportsContextId(java.lang.String) */ - protected boolean supportsContextId(String id) { + @Override + protected boolean supportsContextId(String id) { return id.equals(IDebugUIConstants.ID_BREAKPOINT_VIEW); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ - protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { + @Override + protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { Object input = monitor.getViewerInput(); if (input instanceof DefaultBreakpointsViewInput) { DefaultBreakpointsViewInput bpManagerInput = (DefaultBreakpointsViewInput)input; @@ -972,7 +988,8 @@ public class BreakpointManagerContentProvider extends ElementContentProvider /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ - protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { + @Override + protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { Object input = monitor.getViewerInput(); if (input instanceof DefaultBreakpointsViewInput) { DefaultBreakpointsViewInput bpManagerInput = (DefaultBreakpointsViewInput)input; @@ -990,15 +1007,17 @@ public class BreakpointManagerContentProvider extends ElementContentProvider * (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[]) */ - public void breakpointsAdded(final IBreakpoint[] breakpoints) { + @Override + public void breakpointsAdded(final IBreakpoint[] breakpoints) { new Job("Breakpoints View Update Job") { //$NON-NLS-1$ { setSystem(true); setRule(fBreakpointsListenerSchedulingRule); } - protected IStatus run(IProgressMonitor monitor) { - InputData[] datas = (InputData[])fInputToData.values().toArray(new InputData[0]); + @Override + protected IStatus run(IProgressMonitor monitor) { + InputData[] datas = fInputToData.values().toArray(new InputData[0]); for (int i = 0; i < datas.length; i++) { datas[i].breakpointsAdded(breakpoints); } @@ -1011,15 +1030,17 @@ public class BreakpointManagerContentProvider extends ElementContentProvider * (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) */ - public void breakpointsRemoved(final IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { + @Override + public void breakpointsRemoved(final IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { new Job("Breakpoints View Update Job") { //$NON-NLS-1$ { setSystem(true); setRule(fBreakpointsListenerSchedulingRule); } - protected IStatus run(IProgressMonitor monitor) { - InputData[] datas = (InputData[])fInputToData.values().toArray(new InputData[0]); + @Override + protected IStatus run(IProgressMonitor monitor) { + InputData[] datas = fInputToData.values().toArray(new InputData[0]); for (int i = 0; i < datas.length; i++) { datas[i].breakpointsRemoved(breakpoints); } @@ -1032,15 +1053,17 @@ public class BreakpointManagerContentProvider extends ElementContentProvider * (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) */ - public void breakpointsChanged(final IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { + @Override + public void breakpointsChanged(final IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { new Job("Breakpoints View Update Job") { //$NON-NLS-1$ { setSystem(true); setRule(fBreakpointsListenerSchedulingRule); } - protected IStatus run(IProgressMonitor monitor) { - InputData[] datas = (InputData[])fInputToData.values().toArray(new InputData[0]); + @Override + protected IStatus run(IProgressMonitor monitor) { + InputData[] datas = fInputToData.values().toArray(new InputData[0]); for (int i = 0; i < datas.length; i++) { datas[i].breakpointsChanged(breakpoints); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerInputMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerInputMementoProvider.java index 672a91ea9..ad707d6a2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerInputMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerInputMementoProvider.java @@ -24,6 +24,7 @@ public class BreakpointManagerInputMementoProvider extends DebugElementMementoPr /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.DebugElementMementoProvider#getElementName(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
*/
+ @Override
protected String getElementName(Object element, IPresentationContext context) throws CoreException {
return "BreakpointInputMemento"; //$NON-NLS-1$
}
@@ -31,6 +32,7 @@ public class BreakpointManagerInputMementoProvider extends DebugElementMementoPr /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementMementoProvider#isEqual(java.lang.Object, org.eclipse.ui.IMemento, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
*/
+ @Override
protected boolean supportsContextId(String id) {
return IDebugUIConstants.ID_BREAKPOINT_VIEW.equals(id);
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointMementoProvider.java index ae3cbc083..1b40c721a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointMementoProvider.java @@ -47,6 +47,7 @@ public class BreakpointMementoProvider extends ElementMementoProvider { /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementMementoProvider#encodeElement(java.lang.Object, org.eclipse.ui.IMemento, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
*/
+ @Override
protected boolean encodeElement(Object element, IMemento memento, IPresentationContext context) throws CoreException {
if (element instanceof IBreakpoint) {
@@ -69,6 +70,7 @@ public class BreakpointMementoProvider extends ElementMementoProvider { /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementMementoProvider#isEqual(java.lang.Object, org.eclipse.ui.IMemento, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
*/
+ @Override
protected boolean isEqual(Object element, IMemento memento, IPresentationContext context) throws CoreException {
if (element instanceof IBreakpoint) {
IBreakpoint breakpoint =(IBreakpoint)element;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugElementLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugElementLabelProvider.java index 8dd7a59d3..a34f815d7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugElementLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugElementLabelProvider.java @@ -28,6 +28,7 @@ import org.eclipse.swt.graphics.RGB; */ public class DebugElementLabelProvider extends ElementLabelProvider { + @Override protected String getLabel(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); if (presentationContext instanceof DebugModelPresentationContext) { @@ -37,6 +38,7 @@ public class DebugElementLabelProvider extends ElementLabelProvider { return DebugElementHelper.getLabel(element); } + @Override protected RGB getBackground(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); if (presentationContext instanceof DebugModelPresentationContext) { @@ -46,6 +48,7 @@ public class DebugElementLabelProvider extends ElementLabelProvider { return DebugElementHelper.getBackground(element); } + @Override protected FontData getFontData(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); if (presentationContext instanceof DebugModelPresentationContext) { @@ -56,6 +59,7 @@ public class DebugElementLabelProvider extends ElementLabelProvider { return DebugElementHelper.getFont(element); } + @Override protected RGB getForeground(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); if (presentationContext instanceof DebugModelPresentationContext) { @@ -65,6 +69,7 @@ public class DebugElementLabelProvider extends ElementLabelProvider { return DebugElementHelper.getForeground(element); } + @Override protected ImageDescriptor getImageDescriptor(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); if (presentationContext instanceof DebugModelPresentationContext) { @@ -95,7 +100,8 @@ public class DebugElementLabelProvider extends ElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementLabelProvider#requiresUIJob(org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate[]) */ - protected boolean requiresUIJob(ILabelUpdate[] updates) { + @Override + protected boolean requiresUIJob(ILabelUpdate[] updates) { if (updates.length > 0) { ILabelUpdate update = updates[0]; IPresentationContext context = update.getPresentationContext(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugElementMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugElementMementoProvider.java index 3340c752b..5f2529c89 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugElementMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugElementMementoProvider.java @@ -23,6 +23,7 @@ public abstract class DebugElementMementoProvider extends ElementMementoProvider protected static final String ELEMENT_NAME = "ELEMENT_NAME"; //$NON-NLS-1$ + @Override protected boolean encodeElement(Object element, IMemento memento, IPresentationContext context) throws CoreException { if (supportsContext(context)) { String name = getElementName(element, context); @@ -32,6 +33,7 @@ public abstract class DebugElementMementoProvider extends ElementMementoProvider return false; } + @Override protected boolean isEqual(Object element, IMemento memento, IPresentationContext context) throws CoreException { String mementoName = memento.getString(ELEMENT_NAME); if (mementoName != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugTargetContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugTargetContentProvider.java index 599594503..9ba0d1c77 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugTargetContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugTargetContentProvider.java @@ -26,6 +26,7 @@ public class DebugTargetContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { String id = context.getId(); if (id.equals(IDebugUIConstants.ID_DEBUG_VIEW)) @@ -42,6 +43,7 @@ public class DebugTargetContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return IDebugUIConstants.ID_DEBUG_VIEW.equals(id) || IDebugUIConstants.ID_MEMORY_VIEW.equals(id); } @@ -49,10 +51,12 @@ public class DebugTargetContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getElements(getAllChildren(parent, context, monitor), index, length); } + @Override protected boolean hasChildren(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { String id = context.getId(); if (id.equals(IDebugUIConstants.ID_DEBUG_VIEW)) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementContentProvider.java index d9c2166ef..115888790 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementContentProvider.java @@ -33,8 +33,10 @@ public abstract class ElementContentProvider implements IElementContentProvider /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider#updateChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IElementRequestMonitor) */ + @Override public void update(final IChildrenUpdate[] updates) { Job job = new Job("children update") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { for (int i = 0; i < updates.length; i++) { IChildrenUpdate update = updates[i]; @@ -54,8 +56,10 @@ public abstract class ElementContentProvider implements IElementContentProvider /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate) */ + @Override public void update(final IChildrenCountUpdate[] updates) { Job job = new Job("child count update") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { for (int i = 0; i < updates.length; i++) { IChildrenCountUpdate update = updates[i]; @@ -191,8 +195,10 @@ public abstract class ElementContentProvider implements IElementContentProvider /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdate[]) */ + @Override public void update(final IHasChildrenUpdate[] updates) { Job job = new Job("has children update") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { for (int i = 0; i < updates.length; i++) { IHasChildrenUpdate update = updates[i]; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementLabelProvider.java index d35e9219b..35fdefee2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -70,6 +70,7 @@ public abstract class ElementLabelProvider implements IElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { fUpdater.run(); return Status.OK_STATUS; @@ -78,6 +79,7 @@ public abstract class ElementLabelProvider implements IElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider.ILabelJob#queue(org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate) */ + @Override public boolean queue(ILabelUpdate[] updates) { return fUpdater.queue(updates); } @@ -85,6 +87,7 @@ public abstract class ElementLabelProvider implements IElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#shouldRun() */ + @Override public boolean shouldRun() { return fUpdater.shouldRun(); } @@ -107,6 +110,7 @@ public abstract class ElementLabelProvider implements IElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { fUpdater.run(); return Status.OK_STATUS; @@ -115,6 +119,7 @@ public abstract class ElementLabelProvider implements IElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider.ILabelJob#queue(org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate) */ + @Override public boolean queue(ILabelUpdate[] updates) { return fUpdater.queue(updates); } @@ -122,6 +127,7 @@ public abstract class ElementLabelProvider implements IElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#shouldRun() */ + @Override public boolean shouldRun() { return fUpdater.shouldRun(); } @@ -131,9 +137,8 @@ public abstract class ElementLabelProvider implements IElementLabelProvider { * Queue of label updates */ class LabelUpdater implements Runnable { - - LinkedList fQueue = new LinkedList(); - + LinkedList<ILabelUpdate> fQueue = new LinkedList<ILabelUpdate>(); + public synchronized boolean queue(ILabelUpdate[] updates) { if (fQueue == null) { return false; @@ -148,6 +153,7 @@ public abstract class ElementLabelProvider implements IElementLabelProvider { /* (non-Javadoc) * @see java.lang.Runnable#run() */ + @Override public void run() { ILabelUpdate update = getNextUpdate(); while (update != null) { @@ -182,7 +188,7 @@ public abstract class ElementLabelProvider implements IElementLabelProvider { } ILabelUpdate update = null; try { - update = (ILabelUpdate) fQueue.removeFirst(); + update = fQueue.removeFirst(); } catch (NoSuchElementException e) { fQueue = null; } @@ -345,7 +351,8 @@ public abstract class ElementLabelProvider implements IElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate[]) */ - public synchronized void update(ILabelUpdate[] updates) { + @Override + public synchronized void update(ILabelUpdate[] updates) { if (fLabelJob == null) { fLabelJob = newLabelJob(updates); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementMementoProvider.java index 536fb5b18..592384413 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementMementoProvider.java @@ -30,8 +30,10 @@ public abstract class ElementMementoProvider implements IElementMementoProvider /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[]) */ + @Override public void compareElements(final IElementCompareRequest[] requests) { Job job = new Job("compare element") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { for (int i = 0; i < requests.length; i++) { IElementCompareRequest request = requests[i]; @@ -63,8 +65,10 @@ public abstract class ElementMementoProvider implements IElementMementoProvider /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#encodeElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoRequest[]) */ + @Override public void encodeElements(final IElementMementoRequest[] requests) { Job job = new Job("encode element") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { for (int i = 0; i < requests.length; i++) { IElementMementoRequest request = requests[i]; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java index ab6e841d0..6b5730216 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,13 +7,12 @@ * * Contributors: * IBM Corporation - initial API and implementation - * Wind Rvier Systems - added support for columns (bug 235646) + * Wind River Systems - added support for columns (bug 235646) *******************************************************************************/ package org.eclipse.debug.internal.ui.model.elements; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -56,7 +55,8 @@ public class ExpressionContentProvider extends VariableContentProvider { private final String fMessage; - public void update(ILabelUpdate[] updates) { + @Override + public void update(ILabelUpdate[] updates) { for (int i = 0; i < updates.length; i++) { String[] columnIds = updates[i].getColumnIds(); if (columnIds == null) { @@ -86,60 +86,60 @@ public class ExpressionContentProvider extends VariableContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate[]) */ + @Override public void update(IChildrenCountUpdate[] updates) { // See if we can delegate to a model specific content provider - Map delegateMap = new HashMap(); - List notDelegated = new ArrayList(); + Map<IElementContentProvider, List<IViewerUpdate>> delegateMap = new HashMap<IElementContentProvider, List<IViewerUpdate>>(); + List<IViewerUpdate> notDelegated = new ArrayList<IViewerUpdate>(); findDelegates(delegateMap, notDelegated, updates); // Batch the updates and send them to the delegates - for (Iterator iterator = delegateMap.keySet().iterator(); iterator.hasNext();) { - IElementContentProvider delegate = (IElementContentProvider) iterator.next(); - List updateList = (List)delegateMap.get(delegate); - delegate.update((IChildrenCountUpdate[])updateList.toArray(new IChildrenCountUpdate[updateList.size()])); + for (IElementContentProvider delegate : delegateMap.keySet()) { + List<IViewerUpdate> updateList = delegateMap.get(delegate); + delegate.update(updateList.toArray(new IChildrenCountUpdate[updateList.size()])); } if (notDelegated.size() > 0){ - super.update((IChildrenCountUpdate[])notDelegated.toArray(new IChildrenCountUpdate[notDelegated.size()])); + super.update(notDelegated.toArray(new IChildrenCountUpdate[notDelegated.size()])); } } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdate[]) */ + @Override public void update(IHasChildrenUpdate[] updates) { // See if we can delegate to a model specific content provider - Map delegateMap = new HashMap(); - List notDelegated = new ArrayList(); + Map<IElementContentProvider, List<IViewerUpdate>> delegateMap = new HashMap<IElementContentProvider, List<IViewerUpdate>>(); + List<IViewerUpdate> notDelegated = new ArrayList<IViewerUpdate>(); findDelegates(delegateMap, notDelegated, updates); // Batch the updates and send them to the delegates - for (Iterator iterator = delegateMap.keySet().iterator(); iterator.hasNext();) { - IElementContentProvider delegate = (IElementContentProvider) iterator.next(); - List updateList = (List)delegateMap.get(delegate); - delegate.update((IHasChildrenUpdate[])updateList.toArray(new IHasChildrenUpdate[updateList.size()])); + for (IElementContentProvider delegate : delegateMap.keySet()) { + List<IViewerUpdate> updateList = delegateMap.get(delegate); + delegate.update(updateList.toArray(new IHasChildrenUpdate[updateList.size()])); } if (notDelegated.size() > 0){ - super.update((IHasChildrenUpdate[])notDelegated.toArray(new IHasChildrenUpdate[notDelegated.size()])); + super.update(notDelegated.toArray(new IHasChildrenUpdate[notDelegated.size()])); } } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate[]) */ + @Override public void update(IChildrenUpdate[] updates) { // See if we can delegate to a model specific content provider - Map delegateMap = new HashMap(); - List notDelegated = new ArrayList(); + Map<IElementContentProvider, List<IViewerUpdate>> delegateMap = new HashMap<IElementContentProvider, List<IViewerUpdate>>(); + List<IViewerUpdate> notDelegated = new ArrayList<IViewerUpdate>(); findDelegates(delegateMap, notDelegated, updates); // Batch the updates and send them to the delegates - for (Iterator iterator = delegateMap.keySet().iterator(); iterator.hasNext();) { - IElementContentProvider delegate = (IElementContentProvider) iterator.next(); - List updateList = (List)delegateMap.get(delegate); - delegate.update((IChildrenUpdate[])updateList.toArray(new IChildrenUpdate[updateList.size()])); + for (IElementContentProvider delegate : delegateMap.keySet()) { + List<IViewerUpdate> updateList = delegateMap.get(delegate); + delegate.update(updateList.toArray(new IChildrenUpdate[updateList.size()])); } if (notDelegated.size() > 0){ - super.update((IChildrenUpdate[])notDelegated.toArray(new IChildrenUpdate[notDelegated.size()])); + super.update(notDelegated.toArray(new IChildrenUpdate[notDelegated.size()])); } } @@ -153,14 +153,14 @@ public class ExpressionContentProvider extends VariableContentProvider { * @param updates array of updates that can be handled by delegates * @since 3.4 */ - private void findDelegates(Map delegateMap, List notDelegated, IViewerUpdate[] updates){ + private void findDelegates(Map<IElementContentProvider, List<IViewerUpdate>> delegateMap, List<IViewerUpdate> notDelegated, IViewerUpdate[] updates) { for (int i = 0; i < updates.length; i++) { if (updates[i] instanceof ViewerUpdateMonitor && !((ViewerUpdateMonitor)updates[i]).isDelegated() && updates[i].getElement() instanceof IExpression){ IElementContentProvider delegate = ViewerAdapterService.getContentProvider(((IExpression)updates[i].getElement()).getValue()); if (delegate != null){ - List updateList = (List)delegateMap.get(delegate); + List<IViewerUpdate> updateList = delegateMap.get(delegate); if (updateList == null){ - updateList = new ArrayList(); + updateList = new ArrayList<IViewerUpdate>(); delegateMap.put(delegate, updateList); } ((ViewerUpdateMonitor)updates[i]).setDelegated(true); @@ -173,12 +173,13 @@ public class ExpressionContentProvider extends VariableContentProvider { } + @Override protected Object[] getAllChildren(Object parent, IPresentationContext context) throws CoreException { if (parent instanceof IErrorReportingExpression) { IErrorReportingExpression expression = (IErrorReportingExpression) parent; if (expression.hasErrors()) { String[] messages = expression.getErrorMessages(); - LinkedHashSet set = new LinkedHashSet(messages.length); + LinkedHashSet<ErrorMessageElement> set = new LinkedHashSet<ErrorMessageElement>(messages.length); for (int i = 0; i < messages.length; i++) { set.add(new ErrorMessageElement(messages[i])); } @@ -195,6 +196,7 @@ public class ExpressionContentProvider extends VariableContentProvider { return EMPTY; } + @Override protected boolean hasChildren(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { if (element instanceof IErrorReportingExpression) { IErrorReportingExpression expression = (IErrorReportingExpression) element; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionLabelProvider.java index 9e0a2e748..d0a17e81e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionLabelProvider.java @@ -30,6 +30,7 @@ public class ExpressionLabelProvider extends VariableLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.VariableLabelProvider#getForeground(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected RGB getForeground(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); if (element instanceof IErrorReportingExpression) { @@ -43,7 +44,8 @@ public class ExpressionLabelProvider extends VariableLabelProvider { return super.getForeground(elementPath, presentationContext, columnId); } - protected String getLabel(TreePath elementPath, IPresentationContext context, String columnId) throws CoreException { + @Override +protected String getLabel(TreePath elementPath, IPresentationContext context, String columnId) throws CoreException { if (columnId == null) { return super.getLabel(elementPath, context, columnId); } else { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerContentProvider.java index 629d83ca7..08ad0d331 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerContentProvider.java @@ -50,7 +50,8 @@ public class ExpressionManagerContentProvider extends ElementContentProvider { */ private static class AddNewExpressionElement implements IElementLabelProvider, IElementEditor, ICellModifier { - public void update(ILabelUpdate[] updates) { + @Override + public void update(ILabelUpdate[] updates) { for (int i = 0; i < updates.length; i++) { String[] columnIds = updates[i].getColumnIds(); if (columnIds == null) { @@ -69,7 +70,8 @@ public class ExpressionManagerContentProvider extends ElementContentProvider { } } - private void updateLabel(ILabelUpdate update, int columnIndex) { + @SuppressWarnings("deprecation") + private void updateLabel(ILabelUpdate update, int columnIndex) { update.setLabel(DebugUIMessages.ExpressionManagerContentProvider_1, columnIndex); update.setImageDescriptor(DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_MONITOR_EXPRESSION), columnIndex); @@ -80,23 +82,28 @@ public class ExpressionManagerContentProvider extends ElementContentProvider { update.setFontData(fontData, columnIndex); } - public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) { + @Override + public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) { return new TextCellEditor(parent); } - public ICellModifier getCellModifier(IPresentationContext context, Object element) { + @Override + public ICellModifier getCellModifier(IPresentationContext context, Object element) { return this; } - public boolean canModify(Object element, String property) { + @Override + public boolean canModify(Object element, String property) { return (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(property)); } - public Object getValue(Object element, String property) { + @Override + public Object getValue(Object element, String property) { return IInternalDebugCoreConstants.EMPTY_STRING; } - public void modify(Object element, String property, Object value) { + @Override + public void modify(Object element, String property, Object value) { // If an expression is entered, add a new watch expression to the // manager. if (value instanceof String && @@ -128,6 +135,7 @@ public class ExpressionManagerContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { // Add the "Add new expression" element only if columns are displayed. return ((IExpressionManager) element).getExpressions().length + @@ -137,6 +145,7 @@ public class ExpressionManagerContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { if (context.getColumns() != null) { return getElements(((IExpressionManager) parent).getExpressions(), ADD_NEW_EXPRESSION_ELEMENT, index, length); @@ -173,6 +182,7 @@ public class ExpressionManagerContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return id.equals(IDebugUIConstants.ID_EXPRESSION_VIEW); } @@ -180,6 +190,7 @@ public class ExpressionManagerContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#hasChildren(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ + @Override protected boolean hasChildren(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return true; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerMementoProvider.java index 8c4194adc..3130cd85f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerMementoProvider.java @@ -26,6 +26,7 @@ public class ExpressionManagerMementoProvider extends DebugElementMementoProvide /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementMementoProvider#getElementName(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override protected String getElementName(Object element, IPresentationContext context) throws CoreException { if (element instanceof IExpressionManager) { return EXP_MGR; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionMementoProvider.java index 6bb4fe271..edb12339e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionMementoProvider.java @@ -24,6 +24,7 @@ public class ExpressionMementoProvider extends DebugElementMementoProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementMementoProvider#getElementName(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override protected String getElementName(Object element, IPresentationContext context) throws CoreException { if (element instanceof IExpression) { return ((IExpression) element).getExpressionText(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/LaunchContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/LaunchContentProvider.java index c350078b5..98caaa296 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/LaunchContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/LaunchContentProvider.java @@ -24,6 +24,7 @@ public class LaunchContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return ((ILaunch)element).getChildren().length; } @@ -31,6 +32,7 @@ public class LaunchContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return IDebugUIConstants.ID_DEBUG_VIEW.equals(id); } @@ -38,10 +40,12 @@ public class LaunchContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getElements(((ILaunch)parent).getChildren(), index, length); } + @Override protected boolean hasChildren(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return ((ILaunch)element).hasChildren(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/LaunchManagerContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/LaunchManagerContentProvider.java index 81883a39b..d89e4da31 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/LaunchManagerContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/LaunchManagerContentProvider.java @@ -24,6 +24,7 @@ public class LaunchManagerContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return ((ILaunchManager)element).getLaunches().length; } @@ -31,6 +32,7 @@ public class LaunchManagerContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return IDebugUIConstants.ID_DEBUG_VIEW.equals(id); } @@ -38,6 +40,7 @@ public class LaunchManagerContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getElements(((ILaunchManager)parent).getLaunches(),index, length); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryBlockContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryBlockContentProvider.java index bb4008fd5..7c30ea758 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryBlockContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryBlockContentProvider.java @@ -30,17 +30,20 @@ import org.eclipse.debug.ui.IDebugUIConstants; */ public class MemoryBlockContentProvider extends ElementContentProvider { + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return 0; } + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return EMPTY; } + @Override protected boolean supportsContextId(String id) { if (id.equals(IDebugUIConstants.ID_MEMORY_VIEW)) return true; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryBlockLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryBlockLabelProvider.java index 91233a4d4..bd80f6d09 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryBlockLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryBlockLabelProvider.java @@ -21,6 +21,7 @@ import org.eclipse.jface.viewers.TreePath; public class MemoryBlockLabelProvider extends DebugElementLabelProvider { + @Override protected String getLabel(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { @@ -32,6 +33,7 @@ public class MemoryBlockLabelProvider extends DebugElementLabelProvider { return super.getLabel(elementPath, presentationContext, columnId); } + @Override protected ImageDescriptor getImageDescriptor(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryRetrievalContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryRetrievalContentProvider.java index fc38de376..ab0c12b5e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryRetrievalContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryRetrievalContentProvider.java @@ -19,11 +19,13 @@ import org.eclipse.debug.ui.IDebugUIConstants; public class MemoryRetrievalContentProvider extends ElementContentProvider { + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getAllChildren(element, context, monitor).length; } + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { @@ -53,6 +55,7 @@ public class MemoryRetrievalContentProvider extends ElementContentProvider { return EMPTY; } + @Override protected boolean supportsContextId(String id) { return id.equals(IDebugUIConstants.ID_MEMORY_VIEW); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryViewElementMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryViewElementMementoProvider.java index ca4727c53..a71f468d6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryViewElementMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryViewElementMementoProvider.java @@ -21,6 +21,7 @@ public class MemoryViewElementMementoProvider extends ElementMementoProvider { private static final String OBJECT_ID = "OBJECT_ID"; //$NON-NLS-1$ + @Override protected boolean encodeElement(Object element, IMemento memento, IPresentationContext context) throws CoreException { String id = context.getId(); @@ -35,6 +36,7 @@ public class MemoryViewElementMementoProvider extends ElementMementoProvider { return false; } + @Override protected boolean isEqual(Object element, IMemento memento, IPresentationContext context) throws CoreException { String id = context.getId(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ProcessContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ProcessContentProvider.java index 7b25c8dfd..d8b62d646 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ProcessContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ProcessContentProvider.java @@ -26,6 +26,7 @@ public class ProcessContentProvider extends ElementContentProvider { /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate)
*/
+ @Override
protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) {
return EMPTY;
}
@@ -33,6 +34,7 @@ public class ProcessContentProvider extends ElementContentProvider { /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate)
*/
+ @Override
protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) {
return 0;
}
@@ -40,6 +42,7 @@ public class ProcessContentProvider extends ElementContentProvider { /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#supportsContextId(java.lang.String)
*/
+ @Override
protected boolean supportsContextId(String id) {
return IDebugUIConstants.ID_DEBUG_VIEW.equals(id);
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupContentProvider.java index 8d3016462..ede5a6ccf 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupContentProvider.java @@ -23,18 +23,22 @@ import org.eclipse.debug.ui.IDebugUIConstants; */ public class RegisterGroupContentProvider extends ElementContentProvider { + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return ((IRegisterGroup)element).getRegisters().length; } + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getElements(((IRegisterGroup)parent).getRegisters(), index, length); } + @Override protected boolean hasChildren(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return ((IRegisterGroup)element).hasRegisters(); } + @Override protected boolean supportsContextId(String id) { return IDebugUIConstants.ID_REGISTER_VIEW.equals(id); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java index c6ec98748..79ffd45b6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java @@ -25,6 +25,7 @@ public class RegisterGroupLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getImageDescriptor(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected ImageDescriptor getImageDescriptor(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { if (columnId == null || IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnId)) { return super.getImageDescriptor(elementPath, presentationContext, columnId); @@ -35,6 +36,7 @@ public class RegisterGroupLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getLabel(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected String getLabel(TreePath elementPath, IPresentationContext context, String columnId) throws CoreException { if (columnId == null || IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnId)) { return super.getLabel(elementPath, context, columnId); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupMementoProvider.java index 9d2f9401e..31a5bf5ac 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupMementoProvider.java @@ -24,6 +24,7 @@ public class RegisterGroupMementoProvider extends DebugElementMementoProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementMementoProvider#getElementName(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override protected String getElementName(Object element, IPresentationContext context) throws CoreException { if (element instanceof IRegisterGroup) { return ((IRegisterGroup) element).getName(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/StackFrameContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/StackFrameContentProvider.java index 61ce7cef0..d47b283fa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/StackFrameContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/StackFrameContentProvider.java @@ -24,6 +24,7 @@ public class StackFrameContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getAllChildren(element, context, monitor).length; } @@ -31,6 +32,7 @@ public class StackFrameContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getElements(getAllChildren(parent, context, monitor), index, length); } @@ -61,6 +63,7 @@ public class StackFrameContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return id.equals(IDebugUIConstants.ID_VARIABLE_VIEW) || id.equals(IDebugUIConstants.ID_REGISTER_VIEW); } @@ -68,6 +71,7 @@ public class StackFrameContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#hasChildren(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected boolean hasChildren(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { String id = context.getId(); IStackFrame frame = (IStackFrame) element; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/StackFrameMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/StackFrameMementoProvider.java index 450ce046c..0f3c9efd4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/StackFrameMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/StackFrameMementoProvider.java @@ -25,6 +25,7 @@ public class StackFrameMementoProvider extends DebugElementMementoProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementMementoProvider#getElementName(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override protected String getElementName(Object element, IPresentationContext context) throws CoreException { if (element instanceof IStackFrame) { IStackFrame frame = (IStackFrame) element; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ThreadContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ThreadContentProvider.java index dd99e6650..5aa59f87a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ThreadContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ThreadContentProvider.java @@ -24,6 +24,7 @@ public class ThreadContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return ((IThread)element).getStackFrames().length; } @@ -31,6 +32,7 @@ public class ThreadContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return IDebugUIConstants.ID_DEBUG_VIEW.equals(id); } @@ -38,10 +40,12 @@ public class ThreadContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getElements(((IThread)parent).getStackFrames(), index, length); } + @Override protected boolean hasChildren(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return ((IThread)element).hasStackFrames(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableContentProvider.java index 8c050f792..62667824d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -44,6 +44,7 @@ public class VariableContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getAllChildren(element, context).length; } @@ -51,6 +52,7 @@ public class VariableContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getElements(getAllChildren(parent, context), index, length); } @@ -58,6 +60,7 @@ public class VariableContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#hasChildren(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ + @Override protected boolean hasChildren(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return ((IVariable)element).getValue().hasVariables(); } @@ -65,6 +68,7 @@ public class VariableContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return id.equals(IDebugUIConstants.ID_EXPRESSION_VIEW) || id.equals(IDebugUIConstants.ID_VARIABLE_VIEW) || id.equals(IDebugUIConstants.ID_REGISTER_VIEW); } @@ -117,7 +121,7 @@ public class VariableContentProvider extends ElementContentProvider { * @return logical value for the raw value */ protected IValue getLogicalValue(IValue value, IPresentationContext context) throws CoreException { - return getLogicalValue(value, new ArrayList(), context); + return getLogicalValue(value, new ArrayList<String>(), context); } /** @@ -212,7 +216,7 @@ public class VariableContentProvider extends ElementContentProvider { * Callers should always pass in a new, empty list. * @return logical value if one is calculated, otherwise the raw value is returned */ - protected IValue getLogicalValue(IValue value, List previousStructureIds, IPresentationContext context) throws CoreException { + protected IValue getLogicalValue(IValue value, List<String> previousStructureIds, IPresentationContext context) throws CoreException { if (isShowLogicalStructure(context)) { ILogicalStructureType[] types = DebugPlugin.getLogicalStructureTypes(value); if (types.length > 0) { @@ -239,6 +243,7 @@ public class VariableContentProvider extends ElementContentProvider { fgLogicalCache = new LogicalStructureCache(); // Add a listener to clear the cache when resuming, terminating, or suspending DebugPlugin.getDefault().addDebugEventListener(new IDebugEventSetListener(){ + @Override public void handleDebugEvents(DebugEvent[] events) { for (int i = 0; i < events.length; i++) { if (events[i].getKind() == DebugEvent.TERMINATE){ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableEditor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableEditor.java index b886d20ed..49911d35b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableEditor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableEditor.java @@ -26,6 +26,7 @@ public class VariableEditor implements IElementEditor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellEditor(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String, java.lang.Object, org.eclipse.swt.widgets.Composite) */ + @Override public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) { return new TextCellEditor(parent); } @@ -33,6 +34,7 @@ public class VariableEditor implements IElementEditor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellModifier(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object) */ + @Override public ICellModifier getCellModifier(IPresentationContext context, Object element) { return new DefaultVariableCellModifier(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableLabelProvider.java index 98fba8aa8..3e425b4d4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableLabelProvider.java @@ -33,6 +33,7 @@ public class VariableLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getBackground(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected RGB getBackground(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); if (columnId != null) { @@ -49,6 +50,7 @@ public class VariableLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getForeground(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected RGB getForeground(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { Object element = elementPath.getLastSegment(); if (columnId == null) { @@ -65,6 +67,7 @@ public class VariableLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getImageDescriptor(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected ImageDescriptor getImageDescriptor(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { if (columnId == null || IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnId)) { return super.getImageDescriptor(elementPath, presentationContext, columnId); @@ -75,6 +78,7 @@ public class VariableLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getFontData(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected FontData getFontData(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { return JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0]; } @@ -82,6 +86,7 @@ public class VariableLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getLabel(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected String getLabel(TreePath elementPath, IPresentationContext context, String columnId) throws CoreException { if (columnId == null) { return super.getLabel(elementPath, context, columnId); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableMementoProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableMementoProvider.java index f64ff8b7a..42a1b9c95 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableMementoProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableMementoProvider.java @@ -24,6 +24,7 @@ public class VariableMementoProvider extends DebugElementMementoProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementMementoProvider#getElementName(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override protected String getElementName(Object element, IPresentationContext context) throws CoreException { if (element instanceof IVariable) { return ((IVariable) element).getName(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ViewerInputProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ViewerInputProvider.java index d974a0fc3..92ce722a4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ViewerInputProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ViewerInputProvider.java @@ -33,8 +33,10 @@ public abstract class ViewerInputProvider implements IViewerInputProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider#updateChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IElementRequestMonitor) */ + @Override public void update(final IViewerInputUpdate update) { Job job = new Job("viewer input resolution") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { if (!update.isCanceled()) { retrieveInput(update); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/WatchExpressionEditor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/WatchExpressionEditor.java index 88c329e71..d54ad21ba 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/WatchExpressionEditor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/WatchExpressionEditor.java @@ -26,6 +26,7 @@ public class WatchExpressionEditor implements IElementEditor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellEditor(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String, java.lang.Object, org.eclipse.swt.widgets.Composite) */ + @Override public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) { return new TextCellEditor(parent); } @@ -33,6 +34,7 @@ public class WatchExpressionEditor implements IElementEditor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellModifier(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object) */ + @Override public ICellModifier getCellModifier(IPresentationContext context, Object element) { return new WatchExpressionCellModifier(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/BooleanFieldEditor2.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/BooleanFieldEditor2.java index 91e434280..3e95df02c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/BooleanFieldEditor2.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/BooleanFieldEditor2.java @@ -37,6 +37,7 @@ public class BooleanFieldEditor2 extends BooleanFieldEditor { /** * @see org.eclipse.jface.preference.BooleanFieldEditor#getChangeControl(Composite) */ + @Override public Button getChangeControl(Composite parent) { if (fChangeControl == null) { fChangeControl = super.getChangeControl(parent); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java index 5a4b7253b..fb9a87722 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java @@ -48,6 +48,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements /** * @see org.eclipse.jface.preference.FieldEditor#refreshValidState() */ + @Override protected void refreshValidState() { super.refreshValidState(); } @@ -56,6 +57,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements * Clears the error message from the message line if the error * message is the error message from this field editor. */ + @Override protected void clearErrorMessage() { if (canClearErrorMessage()) { super.clearErrorMessage(); @@ -83,6 +85,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createControl(Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp( @@ -93,6 +96,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements /** * Create all field editors for this page */ + @Override public void createFieldEditors() { fWrapEditor = new BooleanFieldEditor2(IDebugPreferenceConstants.CONSOLE_WRAP, DebugPreferencesMessages.ConsolePreferencePage_Wrap_text_1, SWT.NONE, getFieldEditorParent()); @@ -105,6 +109,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements fWrapEditor.getChangeControl(getFieldEditorParent()).addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateWidthEditor(); } @@ -121,6 +126,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements fUseBufferSize.getChangeControl(getFieldEditorParent()).addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateBufferSizeEditor(); } @@ -149,12 +155,14 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements /** * @see IWorkbenchPreferencePage#init(IWorkbench) */ + @Override public void init(IWorkbench workbench) { } /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { boolean ok= super.performOk(); // update high water mark to be (about) 100 lines (100 * 80 chars) greater than low water mark @@ -168,6 +176,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements /** * @see org.eclipse.jface.preference.FieldEditorPreferencePage#initialize() */ + @Override protected void initialize() { super.initialize(); updateWidthEditor(); @@ -196,6 +205,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements /** * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ + @Override protected void performDefaults() { super.performDefaults(); updateWidthEditor(); @@ -212,6 +222,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements /** * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(FieldEditor.IS_VALID)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencePage.java index 9f6ea8800..b338c0a85 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencePage.java @@ -41,6 +41,7 @@ public class DebugPreferencePage extends FieldEditorPreferencePage implements IW /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createControl(Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.DEBUG_PREFERENCE_PAGE); @@ -49,6 +50,7 @@ public class DebugPreferencePage extends FieldEditorPreferencePage implements IW /** * @see FieldEditorPreferencePage#createFieldEditors */ + @Override protected void createFieldEditors() { addField(new BooleanFieldEditor(IDebugUIConstants.PREF_REUSE_EDITOR, DebugPreferencesMessages.DebugPreferencePage_2, SWT.NONE, getFieldEditorParent())); @@ -78,6 +80,7 @@ public class DebugPreferencePage extends FieldEditorPreferencePage implements IW /** * @see IWorkbenchPreferencePage#init(IWorkbench) */ + @Override public void init(IWorkbench workbench) {} } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/IDebugPreferenceConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/IDebugPreferenceConstants.java index d829914c4..ee839409b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/IDebugPreferenceConstants.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/IDebugPreferenceConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -40,11 +40,13 @@ public interface IDebugPreferenceConstants { /** * @deprecated use IDebugUIConstants.PREF_MEMORY_HISTORY_UNKNOWN_COLOR instead */ + @Deprecated public static final String MEMORY_VIEW_UNBUFFERED_LINE_COLOR = IDebugUIConstants.PLUGIN_ID + ".MemoryViewLineColor"; //$NON-NLS-1$ /** * @deprecated use IDebugUIConstants.PREF_MEMORY_HISTORY_KNOWN_COLOR instead */ + @Deprecated public static final String MEMORY_VIEW_BUFFERED_LINE_COLOR = IDebugUIConstants.PLUGIN_ID + ".MemoryViewBufferedLineColor"; //$NON-NLS-1$ /** @@ -104,6 +106,7 @@ public interface IDebugPreferenceConstants { * * @deprecated no longer supported */ + @Deprecated public static final String PREF_LAST_LAUNCH_CONFIGURATION_SELECTION = IDebugUIConstants.PLUGIN_ID + ".lastLaunchConfigSelection"; //$NON-NLS-1$ /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java index a40272f01..701022843 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -88,6 +88,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getDialogSettingsId() */ + @Override protected String getDialogSettingsId() { return IDebugUIConstants.PLUGIN_ID + ".MIGRATION_SELECTION_DIALOG"; //$NON-NLS-1$ } @@ -95,6 +96,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SELECT_LAUNCH_CONFIGURATION_MIGRATION_DIALOG; } @@ -102,6 +104,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerInput() */ + @Override protected Object getViewerInput() { return fInput; } @@ -109,6 +112,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerLabel() */ + @Override protected String getViewerLabel() { return DebugPreferencesMessages.LaunchingPreferencePage_0; } @@ -116,6 +120,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getContentProvider() */ + @Override protected IContentProvider getContentProvider() { return new WorkbenchContentProvider(); } @@ -123,6 +128,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getLabelProvider() */ + @Override protected IBaseLabelProvider getLabelProvider() { return DebugUITools.newDebugModelPresentation(); } @@ -133,12 +139,15 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement */ class TableContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { return getLaunchConfigurationTypes(); } + @Override public void dispose() {} + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} } @@ -155,7 +164,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /** * a list of the field editors */ - private List fFieldEditors; + private List<FieldEditor> fFieldEditors; /** * Boolean editor for debug core plug-in preference @@ -179,6 +188,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.LAUNCH_CONFIGURATION_PREFERENCE_PAGE); @@ -187,8 +197,9 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { - fFieldEditors = new ArrayList(); + fFieldEditors = new ArrayList<FieldEditor>(); Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_HORIZONTAL); //filtering options Group group = SWTFactory.createGroup(comp, DebugPreferencesMessages.LaunchingPreferencePage_32, 1, 1, GridData.FILL_HORIZONTAL); @@ -217,7 +228,9 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement fMigrateNow.setLayoutData(gd); fMigrateNow.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { handleMigrateNowSelected(); } @@ -237,6 +250,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_HORIZONTAL); BooleanFieldEditor2 editor = new BooleanFieldEditor2(IInternalDebugUIConstants.PREF_FILTER_LAUNCH_TYPES, DebugPreferencesMessages.LaunchConfigurationsPreferencePage_0, SWT.NONE, comp); editor.setPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { boolean newvalue = false; if(event.getNewValue() instanceof Boolean) { @@ -287,7 +301,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement ILaunchManager lmanager = DebugPlugin.getDefault().getLaunchManager(); ILaunchConfiguration[] configurations = lmanager.getMigrationCandidates(); //separate the private from the public - List pub = new ArrayList(); + List<ILaunchConfiguration> pub = new ArrayList<ILaunchConfiguration>(); for(int i = 0; i < configurations.length; i++) { if(DebugUITools.isPrivate(configurations[i])) { //auto-migrate private ones @@ -324,6 +338,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) {} /** @@ -333,7 +348,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement private void initFieldEditors() { FieldEditor editor; for(int i = 0; i < fFieldEditors.size(); i++) { - editor = (FieldEditor)fFieldEditors.get(i); + editor = fFieldEditors.get(i); editor.setPreferenceStore(getPreferenceStore()); editor.load(); } @@ -357,11 +372,12 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ + @Override protected void performDefaults() { fDeleteConfigs.setSelection(Preferences.getDefaultBoolean(DebugPlugin.getUniqueIdentifier(), DebugPlugin.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE, true)); FieldEditor editor = null; for(int i = 0; i < fFieldEditors.size(); i++) { - editor = (FieldEditor)fFieldEditors.get(i); + editor = fFieldEditors.get(i); editor.loadDefault(); if(editor instanceof BooleanFieldEditor2) { fTable.setEnabled(((BooleanFieldEditor2)editor).getBooleanValue()); @@ -373,10 +389,11 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performOk() */ + @Override public boolean performOk() { //save field editors for(int i = 0; i < fFieldEditors.size(); i++) { - ((FieldEditor)fFieldEditors.get(i)).store(); + fFieldEditors.get(i).store(); } Preferences.setBoolean(DebugPlugin.getUniqueIdentifier(), DebugPlugin.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE, fDeleteConfigs.getSelection(), null); //save table diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java index 1f342680b..4dc046a18 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java @@ -11,12 +11,12 @@ package org.eclipse.debug.internal.ui.preferences; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.eclipse.debug.core.DebugPlugin; @@ -80,10 +80,10 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I final class PerspectiveChange { private ILaunchConfigurationType fType = null; private ILaunchDelegate fDelegate = null; - private Set fModes = null; + private Set<String> fModes = null; private String fPid = null; - public PerspectiveChange(ILaunchConfigurationType type, ILaunchDelegate delegate, Set modes, String perspectiveid) { + public PerspectiveChange(ILaunchConfigurationType type, ILaunchDelegate delegate, Set<String> modes, String perspectiveid) { fType = type; fDelegate = delegate; fModes = modes; @@ -93,7 +93,11 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I public ILaunchConfigurationType getType() {return fType;} public ILaunchDelegate getDelegate() {return fDelegate;} public String getPerspectiveId() {return fPid;} - public Set getModes() {return fModes;} + + public Set<String> getModes() { + return fModes; + } + @Override public boolean equals(Object o) { if(o instanceof PerspectiveChange) { PerspectiveChange change = (PerspectiveChange) o; @@ -103,6 +107,11 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I } return super.equals(o); } + + @Override + public int hashCode() { + return fDelegate.hashCode() + fType.hashCode() + fModes.hashCode(); + } } /** @@ -112,6 +121,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I public PerspectivesTreeViewer(Tree tree) { super(tree); } + @Override public Object[] getFilteredChildren(Object o) {return super.getFilteredChildren(o);} } @@ -119,6 +129,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I * Provides content for the configuration tree viewer */ final class PerspectiveContentProvider implements ITreeContentProvider { + @Override public Object[] getChildren(Object parentElement) { if(parentElement instanceof ILaunchConfigurationType) { ILaunchConfigurationType type = (ILaunchConfigurationType) parentElement; @@ -126,12 +137,17 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I } return new Object[0]; } + @Override public Object[] getElements(Object inputElement) { return DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationTypes(); } + @Override public boolean hasChildren(Object element) {return element instanceof ILaunchConfigurationType;} + @Override public Object getParent(Object element) {return null;} + @Override public void dispose() {} + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} } @@ -164,7 +180,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I children[i].dispose(); } if(fgCurrentWorkingContext == null) { - fgCurrentWorkingContext = new HashSet(); + fgCurrentWorkingContext = new HashSet<Object>(); } fgCurrentWorkingContext.clear(); if(!selection.isEmpty()) { @@ -191,15 +207,19 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I * Caches */ private static String[] fgPerspectiveLabels = null; - private static Map fgPerspectiveIdMap = null; - private static HashSet fgChangeSet = null; - private static HashSet fgCurrentWorkingContext = null; + private static Map<String, String> fgPerspectiveIdMap = null; + private static HashSet<PerspectiveChange> fgChangeSet = null; + private static HashSet<Object> fgCurrentWorkingContext = null; /** * A default selection listener to be reused by all combo boxes presenting perspective data */ private SelectionListener fSelectionListener = new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) {} + + @SuppressWarnings("unchecked") + @Override public void widgetSelected(SelectionEvent e) { Object o = e.getSource(); if(o instanceof Combo) { @@ -207,8 +227,8 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I LaunchDelegate delegate = null; ILaunchConfigurationType type = null; PerspectiveChange change = null; - Set modes = null; - for(Iterator iter = fgCurrentWorkingContext.iterator(); iter.hasNext();) { + Set<String> modes = null; + for (Iterator<Object> iter = fgCurrentWorkingContext.iterator(); iter.hasNext();) { o = iter.next(); if(o instanceof ILaunchDelegate) { delegate = (LaunchDelegate) o; @@ -218,14 +238,14 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I delegate = null; type = (ILaunchConfigurationType) o; } - modes = (Set) combo.getData(); + modes = (Set<String>) combo.getData(); change = findChange(type, delegate, modes); if(change == null) { - change = new PerspectiveChange(type, delegate, modes, (String)fgPerspectiveIdMap.get(combo.getText())); + change = new PerspectiveChange(type, delegate, modes, fgPerspectiveIdMap.get(combo.getText())); fgChangeSet.add(change); } else { - change.fPid = (String)fgPerspectiveIdMap.get(combo.getText()); + change.fPid = fgPerspectiveIdMap.get(combo.getText()); } } } @@ -240,6 +260,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I /** * @see org.eclipse.jface.dialogs.DialogPage#dispose() */ + @Override public void dispose() { PlatformUI.getWorkbench().getActivitySupport().getActivityManager().removeActivityManagerListener(this); fgPerspectiveIdMap.clear(); @@ -257,6 +278,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I /** * @see org.eclipse.jface.preference.PreferencePage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.PERSPECTIVE_PREFERENCE_PAGE); @@ -265,6 +287,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I /** * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { SWTFactory.createWrapLabel(parent, DebugPreferencesMessages.PerspectivePreferencePage_0, 2, 300); @@ -317,11 +340,13 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I fTree.setLayoutData(gd); fTreeViewer = new PerspectivesTreeViewer(fTree); fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { fPerspectivesPanel.refreshPanel((IStructuredSelection) event.getSelection()); } }); fTreeViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { IStructuredSelection ss = (IStructuredSelection) event.getSelection(); if(!ss.isEmpty()) { @@ -344,17 +369,15 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I * @param selection the selection in the tree viewer */ protected void createCombos(Composite parent, Object[] selection) { - Set modes = collectCommonModeSets(selection); + Set<Set<String>> modes = collectCommonModeSets(selection); if(modes.isEmpty()) { fPerspectivesPanel.setMessage(DebugPreferencesMessages.LaunchPerspectivePreferencePage_1); return; } fPerspectivesPanel.setMessage(IInternalDebugCoreConstants.EMPTY_STRING); - List fmodes = null; + List<String> fmodes = null; Combo combo = null; - Set smodes = null; - for(Iterator iter = modes.iterator(); iter.hasNext();) { - smodes = (Set) iter.next(); + for (Set<String> smodes : modes) { fmodes = LaunchConfigurationPresentationManager.getDefault().getLaunchModeNames(smodes); if(!fmodes.isEmpty()) { //add the mode set and create a combo @@ -381,17 +404,17 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I * @param modes the set of modes * @return the text to select in the current combo / current working set context, or "None" */ - private String getComboSelection(Set modes) { + private String getComboSelection(Set<String> modes) { String text = DebugPreferencesMessages.PerspectivePreferencePage_4; IStructuredSelection ss = (IStructuredSelection) fTreeViewer.getSelection(); if(ss != null && !ss.isEmpty()) { Object o = null; - Set tmp = new HashSet(); + Set<String> tmp = new HashSet<String>(); String id = null; ILaunchConfigurationType type = null; LaunchDelegate delegate = null; PerspectiveChange change = null; - for(Iterator iter = ss.iterator(); iter.hasNext();) { + for (Iterator<?> iter = ss.iterator(); iter.hasNext();) { o = iter.next(); if(o instanceof LaunchDelegate) { delegate = (LaunchDelegate) o; @@ -413,13 +436,11 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I tmp.add(id); } if(tmp.size() == 1) { - id = (String) tmp.iterator().next(); + id = tmp.iterator().next(); if(!IDebugUIConstants.PERSPECTIVE_NONE.equals(id)) { - String label = null; - for(Iterator iter = fgPerspectiveIdMap.keySet().iterator(); iter.hasNext();) { - label = (String) iter.next(); - if(id.equals(fgPerspectiveIdMap.get(label))) { - return label; + for (Entry<String, String> entry : fgPerspectiveIdMap.entrySet()) { + if (id.equals(entry.getValue())) { + return entry.getKey(); } } } @@ -437,56 +458,51 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I * @param modes the current mode set * @return the existing <code>PerspectiveChange</code> if there is one, <code>null</code> otherwise */ - private PerspectiveChange findChange(ILaunchConfigurationType type, ILaunchDelegate delegate, Set modes) { + private PerspectiveChange findChange(ILaunchConfigurationType type, ILaunchDelegate delegate, Set<String> modes) { PerspectiveChange change = new PerspectiveChange(type, delegate, modes, null); - Object o = null; - for(Iterator iter = fgChangeSet.iterator(); iter.hasNext();) { - o = iter.next(); - if(change.equals(o)) { - return (PerspectiveChange) o; + for (PerspectiveChange ch : fgChangeSet) { + if (change.equals(ch)) { + return ch; } } return null; } /** - * Collects a list of mode sets that are common to the current selection context. It is possible - * that there are no mode sets in comomon. + * Collects a list of mode sets that are common to the current selection + * context. It is possible that there are no mode sets in common. + * * @param selection the current selection context * @return a list of mode sets or an empty list, never <code>null</code> */ - protected Set collectCommonModeSets(Object[] selection) { - HashSet common = new HashSet(); + protected Set<Set<String>> collectCommonModeSets(Object[] selection) { + //prep selection context, remove types from the equation - HashSet delegates = new HashSet(); + HashSet<ILaunchDelegate> delegates = new HashSet<ILaunchDelegate>(); Object o = null; - Object[] kids = null; for(int i = 0; i < selection.length; i++) { o = selection[i]; if(o instanceof ILaunchDelegate) { - delegates.add(o); + delegates.add((ILaunchDelegate) o); } else if(o instanceof ILaunchConfigurationType) { fgCurrentWorkingContext.add(o); - kids = fTreeViewer.getFilteredChildren(o); - delegates.addAll(Arrays.asList(kids)); + Object[] kids = fTreeViewer.getFilteredChildren(o); + for (int j = 0; j < kids.length; j++) { + delegates.add((ILaunchDelegate) kids[i]); + } } } //compare the listing of delegates to find common mode sets - ILaunchDelegate delegate = null; - List modes = null; - HashSet pruned = new HashSet(); - Set fmodes = null; - if(!delegates.isEmpty()) { - for(Iterator iter = delegates.iterator(); iter.hasNext();) { - delegate = (ILaunchDelegate) iter.next(); - modes = delegate.getModes(); - for(Iterator iter2 = modes.iterator(); iter2.hasNext();) { - fmodes = (Set) iter2.next(); - if(isCommonModeset(fmodes, delegates, pruned)) { - common.add(fmodes); - fgCurrentWorkingContext.add(delegate); - } + HashSet<Set<String>> common = new HashSet<Set<String>>(); + List<Set<String>> modes = null; + HashSet<Set<String>> pruned = new HashSet<Set<String>>(); + for (ILaunchDelegate delegate : delegates) { + modes = delegate.getModes(); + for (Set<String> fmodes : modes) { + if (isCommonModeset(fmodes, delegates, pruned)) { + common.add(fmodes); + fgCurrentWorkingContext.add(delegate); } } } @@ -501,12 +517,10 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I * @param pruned the monotonic listing of pruned mode sets * @return true if the specified mode set is common to all members of the specified listing of launch delegates, false otherwise */ - private boolean isCommonModeset(Set modeset, Set delegates, Set pruned) { + private boolean isCommonModeset(Set<String> modeset, Set<ILaunchDelegate> delegates, Set<Set<String>> pruned) { if(!pruned.contains(modeset)) { - ILaunchDelegate delegate = null; boolean common = true; - for(Iterator iter = delegates.iterator(); iter.hasNext();) { - delegate = (ILaunchDelegate) iter.next(); + for (ILaunchDelegate delegate : delegates) { common &= delegate.getModes().contains(modeset); } if(!common) { @@ -537,6 +551,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I /** * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ + @Override protected void performDefaults() { fgChangeSet.clear(); fSwitchLaunch.loadDefault(); @@ -545,23 +560,19 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I PerspectiveManager pm = DebugUIPlugin.getDefault().getPerspectiveManager(); TreeItem[] items = fTree.getItems(); ILaunchConfigurationType type = null; - Set modes = null; - Set modeset = null; - Object[] delegates = null; + Set<Set<String>> modes = null; + ILaunchDelegate[] delegates = null; for(int i = 0; i < items.length; i++) { - //reset type type = (ILaunchConfigurationType) items[i].getData(); modes = type.getSupportedModeCombinations(); - delegates = fTreeViewer.getFilteredChildren(type); - for(Iterator iter = modes.iterator(); iter.hasNext();) { - modeset = (Set) iter.next(); + delegates = (ILaunchDelegate[]) fTreeViewer.getFilteredChildren(type); + for (Set<String> modeset : modes) { fgChangeSet.add(new PerspectiveChange(type, null, modeset, pm.getDefaultLaunchPerspective(type, null, modeset))); } for(int j = 0; j < delegates.length; j++) { - modes = new HashSet(((ILaunchDelegate)delegates[j]).getModes()); - for(Iterator iter = modes.iterator(); iter.hasNext();) { - modeset = (Set) iter.next(); - fgChangeSet.add(new PerspectiveChange(type, (ILaunchDelegate) delegates[j], modeset, pm.getDefaultLaunchPerspective(type, (ILaunchDelegate) delegates[j], modeset))); + modes = new HashSet<Set<String>>(delegates[j].getModes()); + for (Set<String> modeset : modes) { + fgChangeSet.add(new PerspectiveChange(type, delegates[j], modeset, pm.getDefaultLaunchPerspective(type, delegates[j], modeset))); } } } @@ -576,12 +587,13 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I /** * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { setPreferenceStore(DebugUIPlugin.getDefault().getPreferenceStore()); - fgChangeSet = new HashSet(); + fgChangeSet = new HashSet<PerspectiveChange>(); //init the labels mapping and the list of labels - fgPerspectiveIdMap = new HashMap(); - ArrayList labels = new ArrayList(); + fgPerspectiveIdMap = new HashMap<String, String>(); + ArrayList<String> labels = new ArrayList<String>(); labels.add(DebugPreferencesMessages.PerspectivePreferencePage_4); IPerspectiveRegistry registry = PlatformUI.getWorkbench().getPerspectiveRegistry(); IPerspectiveDescriptor[] descriptors = registry.getPerspectives(); @@ -593,12 +605,13 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I fgPerspectiveIdMap.put(label, descriptors[i].getId()); } } - fgPerspectiveLabels = (String[]) labels.toArray(new String[labels.size()]); + fgPerspectiveLabels = labels.toArray(new String[labels.size()]); } /** * @see org.eclipse.ui.activities.IActivityManagerListener#activityManagerChanged(org.eclipse.ui.activities.ActivityManagerEvent) */ + @Override public void activityManagerChanged(ActivityManagerEvent activityManagerEvent) { if(!fTree.isDisposed()) { fTreeViewer.refresh(); @@ -608,14 +621,13 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I /** * @see org.eclipse.jface.preference.PreferencePage#performOk() */ + @Override public boolean performOk() { fSwitchLaunch.store(); fSwitchSuspend.store(); if(!fgChangeSet.isEmpty()) { - PerspectiveChange change = null; PerspectiveManager mgr = DebugUIPlugin.getDefault().getPerspectiveManager(); - for(Iterator iter = fgChangeSet.iterator(); iter.hasNext();) { - change = (PerspectiveChange) iter.next(); + for (PerspectiveChange change : fgChangeSet) { mgr.setLaunchPerspective(change.getType(), change.getModes(), change.getDelegate(), change.getPerspectiveId()); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java index a22f10830..b45909497 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java @@ -69,9 +69,9 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc class DuplicateDelegate { private ILaunchConfigurationType fType = null; private ILaunchDelegate[] fDelegates = null; - private Set fModes = null; + private Set<String> fModes = null; - public DuplicateDelegate(ILaunchConfigurationType type, ILaunchDelegate[] delegates, Set modes) { + public DuplicateDelegate(ILaunchConfigurationType type, ILaunchDelegate[] delegates, Set<String> modes) { fModes = modes; fType = type; fDelegates = delegates; @@ -83,7 +83,8 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc public ILaunchDelegate[] getDelegates() { return fDelegates; } - public Set getModeSet() { + + public Set<String> getModeSet() { return fModes; } } @@ -92,6 +93,7 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc * label provider to extend the default one, provides labels to both the tree and table of this page */ class LabelProvider extends DefaultLabelProvider { + @Override public String getText(Object element) { if(element instanceof ILaunchConfigurationType) { return super.getText(element); @@ -111,10 +113,11 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc * This class is used to provide content to the tree */ class TreeProvider implements ITreeContentProvider { + @Override public Object[] getChildren(Object parentElement) { if(parentElement instanceof ILaunchConfigurationType) { ILaunchConfigurationType type = (ILaunchConfigurationType) parentElement; - Set dupes = (Set) fDuplicates.get(type); + Set<DuplicateDelegate> dupes = fDuplicates.get(type); if(dupes != null) { return dupes.toArray(); } @@ -122,24 +125,29 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc } return null; } + @Override public boolean hasChildren(Object element) { return element instanceof ILaunchConfigurationType; } + @Override public Object[] getElements(Object inputElement) { if(inputElement instanceof Map) { - return ((Map)inputElement).keySet().toArray(); + return ((Map<?, ?>) inputElement).keySet().toArray(); } return null; } + @Override public Object getParent(Object element) {return null;} + @Override public void dispose() {} + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} } private TreeViewer fTreeViewer = null; private CheckboxTableViewer fTableViewer = null; - private Map fDuplicates = null; - private Map fDupeSelections = null; + private Map<ILaunchConfigurationType, Set<DuplicateDelegate>> fDuplicates = null; + private Map<DuplicateDelegate, ILaunchDelegate> fDupeSelections = null; private boolean fDirty = false; private Text fDescription = null; @@ -153,6 +161,7 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc /** * @see org.eclipse.jface.preference.PreferencePage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.LAUNCH_DELEGATES_PREFERENCE_PAGE); @@ -161,6 +170,7 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc /** * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH); SWTFactory.createWrapLabel(comp, DebugPreferencesMessages.LaunchDelegatesPreferencePage_1, 2, 300); @@ -188,6 +198,7 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc fTreeViewer.setInput(fDuplicates); fTreeViewer.expandToLevel(2); fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { Object obj = ((IStructuredSelection) event.getSelection()).getFirstElement(); if(obj instanceof DuplicateDelegate) { @@ -219,6 +230,7 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc fTableViewer.setLabelProvider(new LabelProvider()); fTableViewer.setContentProvider(new ArrayContentProvider()); fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection ss = (IStructuredSelection) event.getSelection(); if(ss != null && !ss.isEmpty()) { @@ -231,6 +243,7 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc } }); fTableViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { fDirty = true; Object element = event.getElement(); @@ -247,7 +260,7 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc if(obj instanceof DuplicateDelegate) { fDupeSelections.remove(obj); if(checked) { - fDupeSelections.put(obj, element); + fDupeSelections.put((DuplicateDelegate) obj, (ILaunchDelegate) element); } } } @@ -262,14 +275,15 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc /** * @see org.eclipse.jface.preference.PreferencePage#performOk() */ + @Override public boolean performOk() { if(fDirty && fDupeSelections != null && fDupeSelections.size() > 0) { fDirty = false; DuplicateDelegate dd = null; ILaunchDelegate delegate = null; - for(Iterator iter = fDupeSelections.keySet().iterator(); iter.hasNext();) { - dd = (DuplicateDelegate) iter.next(); - delegate = (ILaunchDelegate) fDupeSelections.get(dd); + for (Iterator<DuplicateDelegate> iter = fDupeSelections.keySet().iterator(); iter.hasNext();) { + dd = iter.next(); + delegate = fDupeSelections.get(dd); try { dd.getType().setPreferredDelegate(dd.getModeSet(), delegate); } @@ -282,29 +296,30 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc /** * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { //init a listing of duplicate delegates arranged by type try { setPreferenceStore(DebugUIPlugin.getDefault().getPreferenceStore()); LaunchManager lm = (LaunchManager) DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType[] types = lm.getLaunchConfigurationTypes(); - fDuplicates = new HashMap(); - fDupeSelections = new HashMap(); - Set modes = null; + fDuplicates = new HashMap<ILaunchConfigurationType, Set<DuplicateDelegate>>(); + fDupeSelections = new HashMap<DuplicateDelegate, ILaunchDelegate>(); ILaunchDelegate[] delegates = null; - Set modeset = null; - Set tmp = null; + Set<Set<String>> modes = null; + Set<String> modeset = null; + Set<DuplicateDelegate> tmp = null; ILaunchDelegate prefdelegate = null; DuplicateDelegate dd = null; for(int i = 0; i < types.length; i++) { modes = types[i].getSupportedModeCombinations(); - for(Iterator iter = modes.iterator(); iter.hasNext();) { - modeset = (Set) iter.next(); + for (Iterator<Set<String>> iter = modes.iterator(); iter.hasNext();) { + modeset = iter.next(); delegates = types[i].getDelegates(modeset); if(delegates.length > 1) { - tmp = (Set) fDuplicates.get(types[i]); + tmp = fDuplicates.get(types[i]); if(tmp == null) { - tmp = new HashSet(); + tmp = new HashSet<DuplicateDelegate>(); } dd = new DuplicateDelegate(types[i], delegates, modeset); tmp.add(dd); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java index ad0fbbca9..2a2aad765 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java @@ -60,6 +60,7 @@ public class LaunchingPreferencePage extends FieldEditorPreferencePage implement /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.LAUNCHING_PREFERENCE_PAGE); @@ -68,6 +69,7 @@ public class LaunchingPreferencePage extends FieldEditorPreferencePage implement /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_HORIZONTAL); //save dirty editors @@ -153,7 +155,9 @@ public class LaunchingPreferencePage extends FieldEditorPreferencePage implement fUseOldLaunching = SWTFactory.createRadioButton(group, DebugPreferencesMessages.LaunchingPreferencePage_37); fUseContextLaunching = SWTFactory.createRadioButton(group, DebugPreferencesMessages.LaunchingPreferencePage_38); fUseContextLaunching.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { boolean enabled = ((Button)e.widget).getSelection(); fCheckParent.setEnabled(enabled); @@ -182,11 +186,13 @@ public class LaunchingPreferencePage extends FieldEditorPreferencePage implement /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) {} /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ + @Override protected void performDefaults() { boolean value = getPreferenceStore().getDefaultBoolean(IInternalDebugUIConstants.PREF_USE_CONTEXTUAL_LAUNCH); fUseOldLaunching.setSelection(!value); @@ -202,6 +208,7 @@ public class LaunchingPreferencePage extends FieldEditorPreferencePage implement /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performOk() */ + @Override public boolean performOk() { getPreferenceStore().setValue(IInternalDebugUIConstants.PREF_USE_CONTEXTUAL_LAUNCH, fUseContextLaunching.getSelection()); getPreferenceStore().setValue(IInternalDebugUIConstants.PREF_LAUNCH_PARENT_PROJECT, fCheckParent.getSelection()); @@ -212,6 +219,7 @@ public class LaunchingPreferencePage extends FieldEditorPreferencePage implement /** * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors() */ + @Override protected void createFieldEditors() { //do nothing we overload the create contents method } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ProcessPropertyPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ProcessPropertyPage.java index 1ee78764c..ba3450901 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ProcessPropertyPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ProcessPropertyPage.java @@ -51,6 +51,7 @@ public class ProcessPropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite ancestor) { noDefaultAndApplyButton(); Composite parent = SWTFactory.createComposite(ancestor, ancestor.getFont(), 1, 1, GridData.FILL_BOTH); @@ -103,6 +104,7 @@ public class ProcessPropertyPage extends PropertyPage { commandLineText = DebugPlugin.renderArguments(arguments, segments); styledText.addBidiSegmentListener(new BidiSegmentListener() { + @Override public void lineGetSegments(BidiSegmentEvent event) { int offset = event.lineOffset; int end = offset + event.lineText.length(); @@ -279,6 +281,7 @@ public class ProcessPropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.PROCESS_PROPERTY_PAGE); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/RunDebugPropertiesPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/RunDebugPropertiesPage.java index 5c0ebfc88..636736c5f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/RunDebugPropertiesPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/RunDebugPropertiesPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -78,22 +77,22 @@ public class RunDebugPropertiesPage extends PropertyPage { /** * Set of configurations to be deleted */ - private Set fDeletedConfigurations = new HashSet(); + private Set<ILaunchConfigurationWorkingCopy> fDeletedConfigurations = new HashSet<ILaunchConfigurationWorkingCopy>(); /** * Set of original default candidates for the resource */ - private Set fOriginalCandidates; + private Set<ILaunchConfiguration> fOriginalCandidates; /** * Holds configurations that need to be saved when the page closes */ - private Set fChangedConfigurations = new HashSet(); + private Set<ILaunchConfigurationWorkingCopy> fChangedConfigurations = new HashSet<ILaunchConfigurationWorkingCopy>(); /** * List of the applicable launch config types for the backing resource */ - private List fTypeCandidates = null; + private List<ILaunchConfigurationType> fTypeCandidates = null; //widgets private TableViewer fViewer; @@ -105,6 +104,7 @@ public class RunDebugPropertiesPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugHelpContextIds.RUN_DEBUG_RESOURCE_PROPERTY_PAGE); collectConfigCandidates(getResource()); @@ -112,7 +112,7 @@ public class RunDebugPropertiesPage extends PropertyPage { SWTFactory.createWrapLabel(topComposite, DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_0, 2, 300); SWTFactory.createVerticalSpacer(topComposite, 2); - SWTFactory.createWrapLabel(topComposite, MessageFormat.format(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_1, new String[]{getResource().getName()}), 2, 300); + SWTFactory.createWrapLabel(topComposite, MessageFormat.format(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_1, new Object[] { getResource().getName() }), 2, 300); fViewer = createViewer(topComposite); Composite buttonComp = SWTFactory.createComposite(topComposite, 1, 1, GridData.FILL_VERTICAL); @@ -122,7 +122,9 @@ public class RunDebugPropertiesPage extends PropertyPage { fNewButton.setToolTipText(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_3); fNewButton.setEnabled(collectTypeCandidates().length > 0); fNewButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { handleNew(); } @@ -132,7 +134,9 @@ public class RunDebugPropertiesPage extends PropertyPage { fDuplicateButton.setToolTipText(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_5); fDuplicateButton.setEnabled(false); fDuplicateButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { handleCopy(); } @@ -141,7 +145,9 @@ public class RunDebugPropertiesPage extends PropertyPage { fEditButton.setToolTipText(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_7); fEditButton.setEnabled(false); fEditButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { handleEdit(); } @@ -150,7 +156,9 @@ public class RunDebugPropertiesPage extends PropertyPage { fDeleteButton.setToolTipText(DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_9); fDeleteButton.setEnabled(false); fDeleteButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { handleDelete(); } @@ -180,6 +188,7 @@ public class RunDebugPropertiesPage extends PropertyPage { IResource resource = getResource(); viewer.setInput(collectConfigCandidates(resource)); viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection sel = event.getSelection(); if(sel instanceof IStructuredSelection) { @@ -194,6 +203,7 @@ public class RunDebugPropertiesPage extends PropertyPage { } }); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent arg0) { handleEdit(); } @@ -204,6 +214,7 @@ public class RunDebugPropertiesPage extends PropertyPage { /** * @see org.eclipse.jface.dialogs.DialogPage#dispose() */ + @Override public void dispose() { if(fOriginalCandidates != null) { fOriginalCandidates.clear(); @@ -242,20 +253,21 @@ public class RunDebugPropertiesPage extends PropertyPage { protected ILaunchConfigurationType[] collectTypeCandidates() { if(fTypeCandidates == null) { String[] types = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getApplicableConfigurationTypes(getResource()); - fTypeCandidates = new ArrayList(types.length); + fTypeCandidates = new ArrayList<ILaunchConfigurationType>(types.length); for(int i = 0; i < types.length; i++) { fTypeCandidates.add(DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(types[i])); } - Collections.sort(fTypeCandidates, new Comparator() { - public int compare(Object o1, Object o2) { - ILaunchConfigurationType t1 = (ILaunchConfigurationType) o1; - ILaunchConfigurationType t2 = (ILaunchConfigurationType) o2; + Collections.sort(fTypeCandidates, new Comparator<ILaunchConfigurationType>() { + @Override + public int compare(ILaunchConfigurationType o1, ILaunchConfigurationType o2) { + ILaunchConfigurationType t1 = o1; + ILaunchConfigurationType t2 = o2; return t1.getName().compareTo(t2.getName()); } }); } - return (ILaunchConfigurationType[]) fTypeCandidates.toArray(new ILaunchConfigurationType[fTypeCandidates.size()]); + return fTypeCandidates.toArray(new ILaunchConfigurationType[fTypeCandidates.size()]); } /** @@ -265,9 +277,9 @@ public class RunDebugPropertiesPage extends PropertyPage { * @param resource resource * @return list of default candidates */ - protected Set collectConfigCandidates(IResource resource) { + protected Set<ILaunchConfiguration> collectConfigCandidates(IResource resource) { if(fOriginalCandidates == null) { - fOriginalCandidates = new HashSet(); + fOriginalCandidates = new HashSet<ILaunchConfiguration>(); try { ILaunchConfiguration[] configs = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getApplicableLaunchConfigurations(null, resource); for(int i = 0; i < configs.length; i++) { @@ -300,11 +312,10 @@ public class RunDebugPropertiesPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performOk() */ + @Override public boolean performOk() { //delete - Iterator iter = fDeletedConfigurations.iterator(); - while (iter.hasNext()) { - ILaunchConfigurationWorkingCopy currentConfig = (ILaunchConfigurationWorkingCopy) iter.next(); + for (ILaunchConfigurationWorkingCopy currentConfig : fDeletedConfigurations) { try{ if (currentConfig.getOriginal() != null){ currentConfig.getOriginal().delete(); @@ -314,9 +325,7 @@ public class RunDebugPropertiesPage extends PropertyPage { } } //add - iter = fChangedConfigurations.iterator(); - while (iter.hasNext()) { - ILaunchConfigurationWorkingCopy currentConfig = (ILaunchConfigurationWorkingCopy) iter.next(); + for (ILaunchConfigurationWorkingCopy currentConfig : fChangedConfigurations) { try{ currentConfig.doSave(); } catch (CoreException e) { @@ -330,6 +339,7 @@ public class RunDebugPropertiesPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ + @Override protected void performDefaults() { setErrorMessage(null); setValid(true); @@ -346,15 +356,14 @@ public class RunDebugPropertiesPage extends PropertyPage { * Returns the names of the launch configurations passed in as original input to the tree viewer * @return the names of the original launch configurations */ - private Set getConfigurationNames() { - Set names = new HashSet(); - Iterator iter = fOriginalCandidates.iterator(); - while (iter.hasNext()) { - names.add(((ILaunchConfiguration)iter.next()).getName()); + private Set<String> getConfigurationNames() { + Set<String> names = new HashSet<String>(); + for(ILaunchConfiguration config : fOriginalCandidates) { + names.add(config.getName()); } - iter = fChangedConfigurations.iterator(); - while (iter.hasNext()) { - names.add(((ILaunchConfiguration)iter.next()).getName()); + + for(ILaunchConfigurationWorkingCopy config : fChangedConfigurations) { + names.add(config.getName()); } return names; } @@ -393,7 +402,7 @@ public class RunDebugPropertiesPage extends PropertyPage { Table table = fViewer.getTable(); int[] indices = table.getSelectionIndices(); Arrays.sort(indices); - ILaunchConfiguration[] configurations = getSelectedConfigurations(); + ILaunchConfigurationWorkingCopy[] configurations = getSelectedConfigurations(); for (int i = 0; i < configurations.length; i++) { fDeletedConfigurations.add(configurations[i]); fChangedConfigurations.remove(configurations[i]); @@ -417,7 +426,7 @@ public class RunDebugPropertiesPage extends PropertyPage { fViewer.refresh(config, true, true); } else if(ret == IDialogConstants.ABORT_ID) { - setErrorMessage(MessageFormat.format(DebugPreferencesMessages.RunDebugPropertiesPage_0, new String[] {config.getName()})); + setErrorMessage(MessageFormat.format(DebugPreferencesMessages.RunDebugPropertiesPage_0, new Object[] { config.getName() })); } } @@ -445,9 +454,8 @@ public class RunDebugPropertiesPage extends PropertyPage { group = lcm.getLaunchGroup(type, ILaunchManager.PROFILE_MODE); } else { - Set modes = type.getSupportedModeCombinations(); - for(Iterator iter = modes.iterator(); iter.hasNext();) { - group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(type, (Set)iter.next()); + for (Set<String> modes : type.getSupportedModeCombinations()) { + group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(type, modes); if(group != null) { break; } @@ -473,6 +481,7 @@ public class RunDebugPropertiesPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getDialogSettingsId() */ + @Override protected String getDialogSettingsId() { return DebugUIPlugin.getUniqueIdentifier() + ".SELECT_CONFIGURATION_TYPE_DIALOG"; //$NON-NLS-1$ } @@ -480,6 +489,7 @@ public class RunDebugPropertiesPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerInput() */ + @Override protected Object getViewerInput() { return typeCandidates; } @@ -487,6 +497,7 @@ public class RunDebugPropertiesPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SELECT_CONFIGURATION_TYPE_DIALOG; } @@ -494,6 +505,7 @@ public class RunDebugPropertiesPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerLabel() */ + @Override protected String getViewerLabel() { return DebugPreferencesMessages.DefaultLaunchConfigurationsPropertiesPage_12; } @@ -516,7 +528,7 @@ public class RunDebugPropertiesPage extends PropertyPage { fViewer.setSelection(new StructuredSelection(wc)); } else if(ret == IDialogConstants.ABORT_ID) { - setErrorMessage(MessageFormat.format(DebugPreferencesMessages.RunDebugPropertiesPage_0, new String[] {wc.getName()})); + setErrorMessage(MessageFormat.format(DebugPreferencesMessages.RunDebugPropertiesPage_0, new Object[] { wc.getName() })); } } catch (CoreException e) { setErrorMessage(e.getMessage()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java index ab5d3f77e..b12cfba2b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -112,11 +112,13 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor /** * @see PreferencePage#createControl(Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.SIMPLE_VARIABLE_PREFERENCE_PAGE); } + @Override protected Control createContents(Composite parent) { noDefaultAndApplyButton(); Font font= parent.getFont(); @@ -165,6 +167,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor variableTable.setColumnProperties(variableTableColumnProperties); variableTable.addFilter(new VariableFilter()); variableTable.setComparator(new ViewerComparator() { + @Override public int compare(Viewer iViewer, Object e1, Object e2) { if (e1 == null) { return -1; @@ -177,12 +180,14 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor }); variableTable.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleTableSelectionChanged(event); } }); variableTable.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { if (!variableTable.getSelection().isEmpty()) { handleEditButtonPressed(); @@ -190,6 +195,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } }); variableTable.getTable().addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent event) { if (event.character == SWT.DEL && event.stateMask == 0) { handleRemoveButtonPressed(); @@ -232,6 +238,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor envAddButton = SWTFactory.createPushButton(buttonComposite, DebugPreferencesMessages.SimpleVariablePreferencePage_7, null); envAddButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { handleAddButtonPressed(); } @@ -239,6 +246,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor envEditButton = SWTFactory.createPushButton(buttonComposite, DebugPreferencesMessages.SimpleVariablePreferencePage_8, null); envEditButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { handleEditButtonPressed(); } @@ -247,6 +255,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor envRemoveButton = SWTFactory.createPushButton(buttonComposite, DebugPreferencesMessages.SimpleVariablePreferencePage_9, null); envRemoveButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { handleRemoveButtonPressed(); } @@ -294,19 +303,22 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor MessageDialog.openError(getShell(),DebugPreferencesMessages.StringVariablePreferencePage_21, DebugPreferencesMessages.StringVariablePreferencePage_20); return false; } - List editedVariables= variableContentProvider.getWorkingSetVariables(); - Iterator iter= editedVariables.iterator(); + List<VariableWrapper> editedVariables = variableContentProvider.getWorkingSetVariables(); + Iterator<VariableWrapper> iter = editedVariables.iterator(); while (iter.hasNext()) { - VariableWrapper currentVariable = (VariableWrapper) iter.next(); + VariableWrapper currentVariable = iter.next(); if (!currentVariable.isRemoved()) { String currentName = currentVariable.getName(); if (currentName.equals(name)) { if (currentVariable.isReadOnly()){ - MessageDialog.openError(getShell(),DebugPreferencesMessages.StringVariablePreferencePage_23, MessageFormat.format(DebugPreferencesMessages.StringVariablePreferencePage_22, new String[] {name})); + MessageDialog.openError(getShell(), DebugPreferencesMessages.StringVariablePreferencePage_23, MessageFormat.format(DebugPreferencesMessages.StringVariablePreferencePage_22, new Object[] { name })); return false; } else { - MessageDialog dialog = new MessageDialog(getShell(), DebugPreferencesMessages.SimpleVariablePreferencePage_15, null, MessageFormat.format(DebugPreferencesMessages.SimpleVariablePreferencePage_16, new String[] {name}), MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0); + MessageDialog dialog = new MessageDialog(getShell(), DebugPreferencesMessages.SimpleVariablePreferencePage_15, null, MessageFormat.format(DebugPreferencesMessages.SimpleVariablePreferencePage_16, new Object[] { name }), MessageDialog.QUESTION, new String[] { + IDialogConstants.YES_LABEL, + IDialogConstants.NO_LABEL, + IDialogConstants.CANCEL_LABEL }, 0); int overWrite= dialog.open(); if (overWrite == 0) { currentVariable.setValue(value); @@ -337,7 +349,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor String value= variable.getValue(); String description= variable.getDescription(); String name= variable.getName(); - MultipleInputDialog dialog= new MultipleInputDialog(getShell(), MessageFormat.format(DebugPreferencesMessages.SimpleVariablePreferencePage_14, new String[] {name})); + MultipleInputDialog dialog = new MultipleInputDialog(getShell(), MessageFormat.format(DebugPreferencesMessages.SimpleVariablePreferencePage_14, new Object[] { name })); dialog.addBrowseField(VALUE_LABEL, value, true); dialog.addTextField(DESCRIPTION_LABEL, description, true); @@ -359,22 +371,22 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor */ private void handleRemoveButtonPressed() { IStructuredSelection selection= (IStructuredSelection) variableTable.getSelection(); - List variablesToRemove= selection.toList(); + List<VariableWrapper> variablesToRemove = selection.toList(); StringBuffer contributedVariablesToRemove= new StringBuffer(); - Iterator iter= variablesToRemove.iterator(); + Iterator<VariableWrapper> iter = variablesToRemove.iterator(); while (iter.hasNext()) { - VariableWrapper variable = (VariableWrapper) iter.next(); + VariableWrapper variable = iter.next(); if (variable.isContributed()) { contributedVariablesToRemove.append('\t').append(variable.getName()).append('\n'); } } if (contributedVariablesToRemove.length() > 0) { - boolean remove= MessageDialog.openQuestion(getShell(), DebugPreferencesMessages.SimpleLaunchVariablePreferencePage_21, MessageFormat.format(DebugPreferencesMessages.SimpleLaunchVariablePreferencePage_22, new String[] {contributedVariablesToRemove.toString()})); // + boolean remove = MessageDialog.openQuestion(getShell(), DebugPreferencesMessages.SimpleLaunchVariablePreferencePage_21, MessageFormat.format(DebugPreferencesMessages.SimpleLaunchVariablePreferencePage_22, new Object[] { contributedVariablesToRemove.toString() })); // if (!remove) { return; } } - VariableWrapper[] variables= (VariableWrapper[]) variablesToRemove.toArray(new VariableWrapper[0]); + VariableWrapper[] variables= variablesToRemove.toArray(new VariableWrapper[0]); for (int i = 0; i < variables.length; i++) { variables[i].setRemoved(true); } @@ -398,12 +410,14 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } } + @Override public void init(IWorkbench workbench) { } /** * Clear the variables. */ + @Override protected void performDefaults() { variableContentProvider.init(); variableTable.refresh(); @@ -413,6 +427,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor /** * Sets the saved state for reversion. */ + @Override public boolean performOk() { variableContentProvider.saveChanges(); saveColumnWidths(); @@ -468,8 +483,9 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor /** * The content provider stores variable wrappers for use during editing. */ - private List fWorkingSet = new ArrayList(); + private List<VariableWrapper> fWorkingSet = new ArrayList<VariableWrapper>(); + @Override public Object[] getElements(Object inputElement) { return fWorkingSet.toArray(); } @@ -483,9 +499,11 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor fWorkingSet.add(variable); } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput == null || !(newInput instanceof IStringVariableManager)){ return; @@ -498,11 +516,11 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor */ public void saveChanges() { IStringVariableManager manager = getVariableManager(); - Iterator iterator = fWorkingSet.iterator(); - List remove = new ArrayList(); - List add = new ArrayList(); + Iterator<VariableWrapper> iterator = fWorkingSet.iterator(); + List<IValueVariable> remove = new ArrayList<IValueVariable>(); + List<IValueVariable> add = new ArrayList<IValueVariable>(); while (iterator.hasNext()) { - VariableWrapper variable = (VariableWrapper) iterator.next(); + VariableWrapper variable = iterator.next(); if (!variable.isReadOnly()) { IValueVariable underlyingVariable = variable.getUnderlyingVariable(); if (variable.isRemoved()) { @@ -522,12 +540,12 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } // remove if (!remove.isEmpty()) { - manager.removeVariables((IValueVariable[]) remove.toArray(new IValueVariable[remove.size()])); + manager.removeVariables(remove.toArray(new IValueVariable[remove.size()])); } // add if (!add.isEmpty()) { try { - manager.addVariables((IValueVariable[]) add.toArray(new IValueVariable[add.size()])); + manager.addVariables(add.toArray(new IValueVariable[add.size()])); } catch (CoreException e) { DebugUIPlugin.errorDialog(getShell(), DebugPreferencesMessages.StringVariablePreferencePage_24, DebugPreferencesMessages.StringVariablePreferencePage_25, e.getStatus()); // } @@ -551,7 +569,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor * * @return the working set of variables (not yet saved) */ - public List getWorkingSetVariables() { + public List<VariableWrapper> getWorkingSetVariables() { return fWorkingSet; } @@ -646,9 +664,11 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } private class SimpleVariableLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider { + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } + @Override public String getColumnText(Object element, int columnIndex) { if (element instanceof VariableWrapper) { VariableWrapper variable= (VariableWrapper) element; @@ -683,11 +703,14 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } } return contribution; + default: + break; } } return null; } + @Override public Color getForeground(Object element) { if (element instanceof VariableWrapper) { if (((VariableWrapper) element).isReadOnly()) { @@ -697,6 +720,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } return null; } + @Override public Color getBackground(Object element) { if (element instanceof VariableWrapper) { if (((VariableWrapper) element).isReadOnly()) { @@ -713,6 +737,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { return !((VariableWrapper)element).isRemoved(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java index fb434124e..2e2803cd4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -61,7 +61,8 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor private PerspectiveLabelProvider fLabelProvider= null; private SelectionListener fSelectionListener= new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { Object source = e.getSource(); if (source == fResetViewsButton) { handleResetPressed(); @@ -82,7 +83,8 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createControl(org.eclipse.swt.widgets.Composite) */ - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.VIEW_MANAGEMENT_PREFERENCE_PAGE); } @@ -90,6 +92,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Composite composite= new Composite(parent, SWT.NONE); composite.setLayout(new GridLayout()); @@ -160,7 +163,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor fPerspectiveViewer.setComparator(new PerspectiveComparator()); fPerspectiveViewer.setInput(this); - Set perspectives; + Set<String> perspectives; String preference = DebugUIPlugin.getDefault().getPreferenceStore().getString( IDebugUIConstants.PREF_MANAGE_VIEW_PERSPECTIVES); if (IDebugUIConstants.PREF_MANAGE_VIEW_PERSPECTIVES_DEFAULT.equals(preference)) { @@ -171,12 +174,11 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor checkPerspectives(perspectives); } - private void checkPerspectives(Set perspectives) { + private void checkPerspectives(Set<String> perspectives) { fPerspectiveViewer.setAllChecked(false); IPerspectiveRegistry registry= PlatformUI.getWorkbench().getPerspectiveRegistry(); - Iterator perspectiveIds= perspectives.iterator(); - while (perspectiveIds.hasNext()) { - IPerspectiveDescriptor descriptor = registry.findPerspectiveWithId((String) perspectiveIds.next()); + for (String id : perspectives) { + IPerspectiveDescriptor descriptor = registry.findPerspectiveWithId(id); if (descriptor != null) { fPerspectiveViewer.setChecked(descriptor, true); } @@ -186,9 +188,10 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { Object[] descriptors = fPerspectiveViewer.getCheckedElements(); - Set perspectives = new HashSet(); + Set<String> perspectives = new HashSet<String>(); for (int i = 0; i < descriptors.length; i++) { perspectives.add( ((IPerspectiveDescriptor)descriptors[i]).getId() ); } @@ -197,7 +200,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor IDebugUIConstants.PREF_MANAGE_VIEW_PERSPECTIVES_DEFAULT); } else { StringBuffer buffer= new StringBuffer(); - for (Iterator itr = perspectives.iterator(); itr.hasNext();) { + for (Iterator<String> itr = perspectives.iterator(); itr.hasNext();) { buffer.append(itr.next()).append(','); } getPreferenceStore().setValue(IDebugUIConstants.PREF_MANAGE_VIEW_PERSPECTIVES, buffer.toString()); @@ -215,6 +218,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ + @Override protected void performDefaults() { checkPerspectives( ViewContextService.getDefaultEnabledPerspectives() ); fTrackViewsButton.setSelection(getPreferenceStore().getDefaultBoolean(IInternalDebugUIConstants.PREF_TRACK_VIEWS)); @@ -226,6 +230,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { } @@ -246,6 +251,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { return PlatformUI.getWorkbench().getPerspectiveRegistry().getPerspectives(); } @@ -253,20 +259,23 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { } } private static class PerspectiveComparator extends ViewerComparator { - public int compare(Viewer viewer, Object e1, Object e2) { + @Override + public int compare(Viewer viewer, Object e1, Object e2) { if (e1 instanceof IPerspectiveDescriptor && e2 instanceof IPerspectiveDescriptor) { return ((IPerspectiveDescriptor) e1).getLabel().compareToIgnoreCase(((IPerspectiveDescriptor) e2).getLabel()); } @@ -277,6 +286,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#dispose() */ + @Override public void dispose() { super.dispose(); if (fLabelProvider != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java index e3f1ff34a..fa92e692e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java @@ -31,6 +31,7 @@ public class AddContainerAction extends SourceContainerAction { * * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { AddSourceContainerDialog dialog = new AddSourceContainerDialog(getShell(), getViewer(), fDirector); dialog.open(); @@ -43,6 +44,7 @@ public class AddContainerAction extends SourceContainerAction { /* (non-Javadoc) * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { if(selection == null || selection.isEmpty()) { return true; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java index 9066819ed..56b4d9588 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2011 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -71,6 +71,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { getShell().setText(SourceLookupUIMessages.addSourceLocation_title); @@ -93,6 +94,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { table.setLayoutData(gd); fViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -102,6 +104,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { fViewer.setContentProvider(new ArrayContentProvider()); fViewer.setComparator(new ViewerComparator()); fViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection = event.getSelection(); if (!selection.isEmpty()) { @@ -126,6 +129,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); Table table = fViewer.getTable(); @@ -137,6 +141,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { ISourceContainerType type = (ISourceContainerType) ((IStructuredSelection) fViewer.getSelection()).getFirstElement(); if (type != null) { @@ -161,7 +166,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { * @return the list of source container types that have browsers */ private ISourceContainerType[] filterTypes(ISourceContainerType[] types){ - ArrayList validTypes = new ArrayList(); + ArrayList<ISourceContainerType> validTypes = new ArrayList<ISourceContainerType>(); for (int i=0; i< types.length; i++) { ISourceContainerType type = types[i]; if (fDirector.supportsSourceContainerType(type)) { @@ -171,7 +176,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { } } } - return (ISourceContainerType[]) validTypes.toArray(new ISourceContainerType[validTypes.size()]); + return validTypes.toArray(new ISourceContainerType[validTypes.size()]); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/BasicContainerContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/BasicContainerContentProvider.java index e7fd8079e..d968d4496 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/BasicContainerContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/BasicContainerContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2011 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,20 +34,23 @@ public class BasicContainerContentProvider implements ITreeContentProvider { * The visual part that is using this content provider is about * to be disposed. Deallocate all allocated SWT resources. */ + @Override public void dispose() { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object element) { if (element instanceof IWorkspaceRoot) { // check if closed projects should be shown IProject[] allProjects = ((IWorkspaceRoot) element).getProjects(); - if (fShowClosedProjects) + if (fShowClosedProjects) { return allProjects; + } - ArrayList accessibleProjects = new ArrayList(); + ArrayList<IProject> accessibleProjects = new ArrayList<IProject>(); for (int i = 0; i < allProjects.length; i++) { if (allProjects[i].isOpen()) { accessibleProjects.add(allProjects[i]); @@ -58,6 +61,7 @@ public class BasicContainerContentProvider implements ITreeContentProvider { return new Object[0]; } + @Override public Object[] getElements(Object element) { return getChildren(element); } @@ -65,15 +69,18 @@ public class BasicContainerContentProvider implements ITreeContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ + @Override public Object getParent(Object element) { - if (element instanceof IResource) + if (element instanceof IResource) { return ((IResource) element).getParent(); + } return null; } /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ + @Override public boolean hasChildren(Object element) { return getChildren(element).length > 0; } @@ -81,6 +88,7 @@ public class BasicContainerContentProvider implements ITreeContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/DownAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/DownAction.java index 673b78bd9..ae48e46cc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/DownAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/DownAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -9,10 +9,13 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.debug.internal.ui.sourcelookup; - import java.util.List; +import org.eclipse.debug.core.sourcelookup.ISourceContainer; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.actions.SelectionListenerAction; + /** * The action for sorting the order of source containers in the dialog. @@ -26,21 +29,21 @@ public class DownAction extends SourceContainerAction { /** * @see IAction#run() */ + @Override public void run() { - List targets = getOrderedSelection(); + List<ISourceContainer> targets = getOrderedSelection(); if (targets.isEmpty()) { return; } - List list = getEntriesAsList(); + List<ISourceContainer> list = getEntriesAsList(); int bottom = list.size() - 1; int index = 0; - for (int i = targets.size() - 1; i >= 0; i--) { - Object target = targets.get(i); - index = list.indexOf(target); + for (ISourceContainer container : targets) { + index = list.indexOf(container); if (index < bottom) { bottom = index + 1; - Object temp = list.get(bottom); - list.set(bottom, target); + ISourceContainer temp = list.get(bottom); + list.set(bottom, container); list.set(index, temp); } bottom = index; @@ -51,6 +54,7 @@ public class DownAction extends SourceContainerAction { /** * @see SelectionListenerAction#updateSelection(IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { return !selection.isEmpty() && !isIndexSelected(selection, getEntriesAsList().size() - 1) && getViewer().getTree().getSelection()[0].getParentItem()==null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditContainerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditContainerAction.java index 9eadd343b..8fe5f5bf1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditContainerAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditContainerAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -37,6 +37,7 @@ public class EditContainerAction extends SourceContainerAction { * * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { ISourceContainer[] replacements = fBrowser.editSourceContainers(getShell(), fDirector, fContainers); int j = 0; @@ -59,6 +60,7 @@ public class EditContainerAction extends SourceContainerAction { /* (non-Javadoc) * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { if(selection == null || selection.isEmpty()) { return false; @@ -66,13 +68,13 @@ public class EditContainerAction extends SourceContainerAction { if (getViewer().getTree().getSelection()[0].getParentItem()==null) { // can only edit top level items of same type fContainers = new ISourceContainer[selection.size()]; - Iterator iterator = selection.iterator(); - ISourceContainer container = (ISourceContainer) iterator.next(); + Iterator<ISourceContainer> iterator = selection.iterator(); + ISourceContainer container = iterator.next(); ISourceContainerType type = container.getType(); fContainers[0] = container; int i = 1; while (iterator.hasNext()) { - container = (ISourceContainer) iterator.next(); + container = iterator.next(); fContainers[i] = container; i++; if (!container.getType().equals(type)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditSourceLookupPathAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditSourceLookupPathAction.java index 641b01435..36edc992a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditSourceLookupPathAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditSourceLookupPathAction.java @@ -49,6 +49,7 @@ public class EditSourceLookupPathAction extends SelectionListenerAction { /* (non-Javadoc) * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { director = null; if (selection.size() == 1) { @@ -69,6 +70,7 @@ public class EditSourceLookupPathAction extends SelectionListenerAction { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { Shell shell = DebugUIPlugin.getShell(); SourceLookupDialog dialog = new SourceLookupDialog(shell, director); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/LookupSourceAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/LookupSourceAction.java index 8d13d4e49..eba0af7ed 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/LookupSourceAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/LookupSourceAction.java @@ -42,6 +42,7 @@ public class LookupSourceAction extends SelectionListenerAction { /* (non-Javadoc) * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { director = null; frame = null; @@ -61,6 +62,7 @@ public class LookupSourceAction extends SelectionListenerAction { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { ISelection selection = fView.getViewer().getSelection(); if (selection instanceof IStructuredSelection) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/Prompter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/Prompter.java index 6be4e4543..295b139b9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/Prompter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/Prompter.java @@ -39,6 +39,7 @@ public class Prompter implements IStatusHandler { * @return result of resolving the given status * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus(final IStatus status, final Object source) throws CoreException { DebugPlugin dp = DebugPlugin.getDefault(); // on shutdown the debug plug-in can be null @@ -65,6 +66,7 @@ public class Prompter implements IStatusHandler { final CoreException[] exception = new CoreException[1]; final Object lock = this; Runnable r = new Runnable() { + @Override public void run() { try { result[0] = handler.handleStatus(status, source); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RemoveAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RemoveAction.java index 7d0efb2d7..71070971e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RemoveAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RemoveAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,10 @@ package org.eclipse.debug.internal.ui.sourcelookup; import java.util.List; +import org.eclipse.debug.core.sourcelookup.ISourceContainer; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.actions.SelectionListenerAction; /** * The action used to remove source containers in the source location dialog/tab. @@ -27,9 +30,10 @@ public class RemoveAction extends SourceContainerAction { * * @see IAction#run() */ + @Override public void run() { - List targets = getOrderedSelection(); - List list = getEntriesAsList(); + List<ISourceContainer> targets = getOrderedSelection(); + List<ISourceContainer> list = getEntriesAsList(); list.removeAll(targets); setEntries(list); } @@ -37,6 +41,7 @@ public class RemoveAction extends SourceContainerAction { /** * @see SelectionListenerAction#updateSelection(IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { //check that something is selected and it is a root tree node. return !selection.isEmpty() && getViewer().getTree().getSelection()[0].getParentItem()==null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/ResolveDuplicatesHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/ResolveDuplicatesHandler.java index 51174e7cc..e794703a2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/ResolveDuplicatesHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/ResolveDuplicatesHandler.java @@ -11,7 +11,6 @@ package org.eclipse.debug.internal.ui.sourcelookup; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.core.runtime.CoreException; @@ -23,7 +22,7 @@ import org.eclipse.jface.window.Window; import org.eclipse.ui.dialogs.ElementListSelectionDialog; /** - * Status handler to prompt for dupicate source element resolution. + * Status handler to prompt for duplicate source element resolution. * * @since 3.0 */ @@ -31,13 +30,14 @@ public class ResolveDuplicatesHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus(IStatus status, Object source) throws CoreException { Object[] args = (Object[])source; - List sources = (List) args[1]; + List<?> sources = (List<?>) args[1]; return resolveSourceElement(sources); } - public Object resolveSourceElement(List sources) { + public Object resolveSourceElement(List<?> sources) { Object file = null; sources = removeSourceNotFoundEditors(sources); if(sources.size() == 1) { @@ -64,14 +64,11 @@ public class ResolveDuplicatesHandler implements IStatusHandler { * @param sources the list to be filtered * @return the filtered list, may be empty */ - private List removeSourceNotFoundEditors(List sources){ - Iterator iterator = sources.iterator(); - List filteredList = new ArrayList(); - Object next; - while(iterator.hasNext()) { - next = iterator.next(); - if (!(next instanceof CommonSourceNotFoundEditor)) { - filteredList.add(next); + private List<Object> removeSourceNotFoundEditors(List<?> sources) { + List<Object> filteredList = new ArrayList<Object>(); + for (Object obj : sources) { + if (!(obj instanceof CommonSourceNotFoundEditor)) { + filteredList.add(obj); } } if (filteredList.isEmpty() && sources.get(0) != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RestoreDefaultAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RestoreDefaultAction.java index 5020eb698..51b7e9e02 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RestoreDefaultAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RestoreDefaultAction.java @@ -30,6 +30,7 @@ public class RestoreDefaultAction extends SourceContainerAction { /** * @see IAction#run() */ + @Override public void run() { ISourceContainer[] containers = new ISourceContainer[1]; containers[0] = new DefaultSourceContainer(); @@ -45,6 +46,7 @@ public class RestoreDefaultAction extends SourceContainerAction { /** * @see SelectionListenerAction#updateSelection(IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { //disable if selection is empty, default already present, or non-root node selected ISourceContainer[] containers = getViewer().getEntries(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerAction.java index e9acaf1b6..29d610443 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ import java.util.Iterator; import java.util.List; import org.eclipse.debug.core.sourcelookup.ISourceContainer; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -74,10 +75,9 @@ public abstract class SourceContainerAction extends SelectionListenerAction { * * @return targets for an action */ - protected List getOrderedSelection() { - List targets = new ArrayList(); - List selection = - ((IStructuredSelection) getViewer().getSelection()).toList(); + protected List<ISourceContainer> getOrderedSelection() { + List<ISourceContainer> targets = new ArrayList<ISourceContainer>(); + List<Object> selection = ((IStructuredSelection) getViewer().getSelection()).toList(); ISourceContainer[] entries = getViewer().getEntries(); for (int i = 0; i < entries.length; i++) { ISourceContainer target = entries[i]; @@ -91,9 +91,9 @@ public abstract class SourceContainerAction extends SelectionListenerAction { /** * Returns a list (copy) of the entries in the viewer */ - protected List getEntriesAsList() { + protected List<ISourceContainer> getEntriesAsList() { ISourceContainer[] entries = getViewer().getEntries(); - List list = new ArrayList(entries.length); + List<ISourceContainer> list = new ArrayList<ISourceContainer>(entries.length); for (int i = 0; i < entries.length; i++) { list.add(entries[i]); } @@ -103,9 +103,8 @@ public abstract class SourceContainerAction extends SelectionListenerAction { /** * Updates the entries to the entries in the given list */ - protected void setEntries(List list) { - getViewer().setEntries( - (ISourceContainer[]) list.toArray(new ISourceContainer[list.size()])); + protected void setEntries(List<ISourceContainer> list) { + getViewer().setEntries(list.toArray(new ISourceContainer[list.size()])); // update all selection listeners getViewer().setSelection(getViewer().getSelection()); } @@ -114,14 +113,12 @@ public abstract class SourceContainerAction extends SelectionListenerAction { * Returns whether the item at the given index in the list * (visually) is selected. */ - protected boolean isIndexSelected( - IStructuredSelection selection, - int index) { + protected boolean isIndexSelected(IStructuredSelection selection, int index) { if (selection.isEmpty()) { return false; } - Iterator entries = selection.iterator(); - List list = getEntriesAsList(); + Iterator<Object> entries = selection.iterator(); + List<ISourceContainer> list = getEntriesAsList(); while (entries.hasNext()) { Object next = entries.next(); if (list.indexOf(next) == index) { @@ -137,6 +134,7 @@ public abstract class SourceContainerAction extends SelectionListenerAction { public void setButton(Button button) { fButton = button; button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { run(); } @@ -146,6 +144,7 @@ public abstract class SourceContainerAction extends SelectionListenerAction { /** * @see IAction#setEnabled(boolean) */ + @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); if (fButton != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java index cc690aa8d..b49bd641f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java @@ -22,6 +22,7 @@ public class SourceContainerAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ + @Override public Object getAdapter(Object adaptableObject, Class adapterType) { if (adapterType.equals(IWorkbenchAdapter.class)) { return new SourceContainerWorkbenchAdapter(); @@ -31,6 +32,7 @@ public class SourceContainerAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override public Class[] getAdapterList() { return new Class[] {IWorkbenchAdapter.class}; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java index 83b09ccb5..35d43203c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java @@ -30,6 +30,7 @@ public class SourceContainerLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { // first allow workbench adapter to provide image Image image = getWorkbenchLabelProvider().getImage(element); @@ -54,6 +55,7 @@ public class SourceContainerLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { // first, allo workbench adapter to provide label String label = getWorkbenchLabelProvider().getText(element); @@ -79,6 +81,7 @@ public class SourceContainerLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { super.dispose(); if (fLabelProvider != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerViewer.java index 001c09cb4..fe1310564 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2007 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,6 +19,8 @@ import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; +import org.eclipse.jface.viewers.IContentProvider; +import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.StructuredSelection; @@ -46,13 +48,14 @@ public class SourceContainerViewer extends TreeViewer { /** * The source container entries displayed in this viewer */ - protected List fEntries = new ArrayList(); + protected List<ISourceContainer> fEntries = new ArrayList<ISourceContainer>(); class ContentProvider implements ITreeContentProvider { /** * @see IStructuredContentProvider#getElements(Object) */ + @Override public Object[] getElements(Object inputElement) { return getEntries(); } @@ -60,18 +63,21 @@ public class SourceContainerViewer extends TreeViewer { /** * @see IContentProvider#dispose() */ + @Override public void dispose() { } /** * @see IContentProvider#inputChanged(Viewer, Object, Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } /** * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object parentElement) { try { return ((ISourceContainer)parentElement).getSourceContainers(); @@ -83,6 +89,7 @@ public class SourceContainerViewer extends TreeViewer { /** * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ + @Override public Object getParent(Object element) { return null; } @@ -90,6 +97,7 @@ public class SourceContainerViewer extends TreeViewer { /** * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ + @Override public boolean hasChildren(Object element) { return ((ISourceContainer)element).isComposite(); } @@ -118,14 +126,16 @@ public class SourceContainerViewer extends TreeViewer { public void setEntries(ISourceContainer[] entries) { fEntries.clear(); for (int i = 0; i < entries.length; i++) { - if(entries[i] != null) + if(entries[i] != null) { fEntries.add(entries[i]); + } } if (getInput() == null) { setInput(fEntries); //select first item in list - if(!fEntries.isEmpty() && fEntries.get(0)!=null) - setSelection(new StructuredSelection(fEntries.get(0))); + if(!fEntries.isEmpty() && fEntries.get(0)!=null) { + setSelection(new StructuredSelection(fEntries.get(0))); + } } else { refresh(); } @@ -139,7 +149,7 @@ public class SourceContainerViewer extends TreeViewer { * @return the entries in this viewer */ public ISourceContainer[] getEntries() { - return (ISourceContainer[])fEntries.toArray(new ISourceContainer[fEntries.size()]); + return fEntries.toArray(new ISourceContainer[fEntries.size()]); } /** @@ -164,8 +174,9 @@ public class SourceContainerViewer extends TreeViewer { } refresh(); - if(entries.length > 0) + if(entries.length > 0) { setSelection(new StructuredSelection(entries)); + } fPanel.setDirty(true); fPanel.updateLaunchConfigurationDialog(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java index 5d81128d8..239ab7c9c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java @@ -31,18 +31,21 @@ public class SourceContainerWorkbenchAdapter implements IWorkbenchAdapter { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object o) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ + @Override public ImageDescriptor getImageDescriptor(Object object) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ + @Override public String getLabel(Object o) { if (o instanceof DirectorySourceContainer) { DirectorySourceContainer container = (DirectorySourceContainer) o; @@ -68,6 +71,7 @@ public class SourceContainerWorkbenchAdapter implements IWorkbenchAdapter { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ + @Override public Object getParent(Object o) { return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementAdapterFactory.java index 6c76f83bd..fba3c1fd0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementAdapterFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementAdapterFactory.java @@ -22,6 +22,7 @@ public class SourceElementAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ + @Override public Object getAdapter(Object adaptableObject, Class adapterType) { if (adapterType.equals(IWorkbenchAdapter.class)) { return new SourceElementWorkbenchAdapter(); @@ -31,6 +32,7 @@ public class SourceElementAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override public Class[] getAdapterList() { return new Class[] {IWorkbenchAdapter.class}; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementLabelProvider.java index ea9c1054f..e2de14678 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementLabelProvider.java @@ -37,6 +37,7 @@ public class SourceElementLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { super.dispose(); if (fLabelProvider != null) { @@ -46,12 +47,14 @@ public class SourceElementLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { return getWorkbenchLabelProvider().getImage(element); } /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { if (element instanceof IResource) { return SourceElementWorkbenchAdapter.getQualifiedName(((IResource)element).getFullPath()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java index 3e890a44e..f6a32cf24 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java @@ -30,12 +30,14 @@ public class SourceElementWorkbenchAdapter implements IWorkbenchAdapter { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object o) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ + @Override public ImageDescriptor getImageDescriptor(Object o) { if (o instanceof LocalFileStorage || o instanceof ZipEntryStorage) { return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FILE); @@ -45,6 +47,7 @@ public class SourceElementWorkbenchAdapter implements IWorkbenchAdapter { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ + @Override public String getLabel(Object o) { if (o instanceof LocalFileStorage) { LocalFileStorage storage = (LocalFileStorage) o; @@ -64,6 +67,7 @@ public class SourceElementWorkbenchAdapter implements IWorkbenchAdapter { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ + @Override public Object getParent(Object o) { return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java index 54f19b48b..f01d3c863 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -75,7 +75,7 @@ public class SourceLookupFacility implements IPageListener, IPartListener2, IPro * Contains a map of the editor to use for each workbench * page, when the 'reuse editor' preference is on. */ - private Map fEditorsByPage; + private Map<IWorkbenchPage, IEditorPart> fEditorsByPage; /** * Used to generate annotations for stack frames @@ -111,7 +111,7 @@ public class SourceLookupFacility implements IPageListener, IPartListener2, IPro * Constructs a source lookup facility. */ private SourceLookupFacility() { - fEditorsByPage = new HashMap(); + fEditorsByPage = new HashMap<IWorkbenchPage, IEditorPart>(); DebugUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this); } @@ -330,8 +330,9 @@ public class SourceLookupFacility implements IPageListener, IPartListener2, IPro } try { IDocument document= provider.getDocument(input); - if (document != null) + if (document != null) { return document.getLineInformation(lineNumber); + } } catch (BadLocationException e) { } finally { provider.disconnect(input); @@ -346,6 +347,7 @@ public class SourceLookupFacility implements IPageListener, IPartListener2, IPro private IEditorPart openEditor(final IWorkbenchPage page, final IEditorInput input, final String id) { final IEditorPart[] editor = new IEditorPart[] {null}; Runnable r = new Runnable() { + @Override public void run() { if (!page.getWorkbenchWindow().getWorkbench().isClosing()) { try { @@ -366,13 +368,15 @@ public class SourceLookupFacility implements IPageListener, IPartListener2, IPro /* (non-Javadoc) * @see org.eclipse.ui.IPageListener#pageActivated(org.eclipse.ui.IWorkbenchPage) */ - public void pageActivated(IWorkbenchPage page) { + @Override + public void pageActivated(IWorkbenchPage page) { } /* (non-Javadoc) * @see org.eclipse.ui.IPageListener#pageClosed(org.eclipse.ui.IWorkbenchPage) */ - public void pageClosed(IWorkbenchPage page) { + @Override + public void pageClosed(IWorkbenchPage page) { fEditorsByPage.remove(page); page.removePartListener(this); } @@ -380,26 +384,30 @@ public class SourceLookupFacility implements IPageListener, IPartListener2, IPro /* (non-Javadoc) * @see org.eclipse.ui.IPageListener#pageOpened(org.eclipse.ui.IWorkbenchPage) */ - public void pageOpened(IWorkbenchPage page) { + @Override + public void pageOpened(IWorkbenchPage page) { page.addPartListener(this); } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference) */ - public void partActivated(IWorkbenchPartReference partRef) { + @Override + public void partActivated(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference) */ - public void partBroughtToTop(IWorkbenchPartReference partRef) { + @Override + public void partBroughtToTop(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) */ - public void partClosed(IWorkbenchPartReference partRef) { + @Override + public void partClosed(IWorkbenchPartReference partRef) { // clear the cached editor for the page if it has been closed IWorkbenchPage page = partRef.getPage(); IEditorPart editor = getEditor(page); @@ -412,37 +420,43 @@ public class SourceLookupFacility implements IPageListener, IPartListener2, IPro /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) */ - public void partDeactivated(IWorkbenchPartReference partRef) { + @Override + public void partDeactivated(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference) */ - public void partOpened(IWorkbenchPartReference partRef) { + @Override + public void partOpened(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference) */ - public void partHidden(IWorkbenchPartReference partRef) { + @Override + public void partHidden(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference) */ - public void partVisible(IWorkbenchPartReference partRef) { + @Override + public void partVisible(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) */ - public void partInputChanged(IWorkbenchPartReference partRef) { + @Override + public void partInputChanged(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { String property = event.getProperty(); if (property.equals(IDebugUIConstants.PREF_REUSE_EDITOR)) { fReuseEditor = DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugUIConstants.PREF_REUSE_EDITOR); @@ -458,7 +472,7 @@ public class SourceLookupFacility implements IPageListener, IPartListener2, IPro * <code>null</code> if a new editor should be opened */ protected IEditorPart getEditor(IWorkbenchPage page) { - return (IEditorPart) fEditorsByPage.get(page); + return fEditorsByPage.get(page); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupManager.java index 5a5a594de..6ac161db3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -31,7 +31,7 @@ public class SourceLookupManager implements IWindowListener { /** * Services per window */ - private Map fServices = new HashMap(); + private Map<IWorkbenchWindow, SourceLookupService> fServices = new HashMap<IWorkbenchWindow, SourceLookupService>(); private SourceLookupManager() { IWorkbench workbench = PlatformUI.getWorkbench(); @@ -58,20 +58,23 @@ public class SourceLookupManager implements IWindowListener { /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowActivated(IWorkbenchWindow window) { } /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowDeactivated(IWorkbenchWindow window) { } /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowClosed(IWorkbenchWindow window) { - SourceLookupService service = (SourceLookupService) fServices.get(window); + SourceLookupService service = fServices.get(window); if (service != null) { fServices.remove(window); service.dispose(); @@ -81,8 +84,9 @@ public class SourceLookupManager implements IWindowListener { /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowOpened(IWorkbenchWindow window) { - SourceLookupService service = (SourceLookupService) fServices.get(window); + SourceLookupService service = fServices.get(window); if (service == null) { service = new SourceLookupService(window); fServices.put(window, service); @@ -94,7 +98,7 @@ public class SourceLookupManager implements IWindowListener { */ public void displaySource(Object context, IWorkbenchPage page, boolean forceSourceLookup) { IWorkbenchWindow window = page.getWorkbenchWindow(); - SourceLookupService service = (SourceLookupService) fServices.get(window); + SourceLookupService service = fServices.get(window); if (service != null) { service.displaySource(context, page, forceSourceLookup); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupPanel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupPanel.java index 9e5184b1a..72a375f65 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupPanel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupPanel.java @@ -12,7 +12,6 @@ package org.eclipse.debug.internal.ui.sourcelookup; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.core.runtime.CoreException; @@ -51,7 +50,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements //the duplicates checkbox protected Button fDuplicatesButton; //the source actions - up, down, add, remove, restore - protected List fActions = new ArrayList(6); + protected List<SourceContainerAction> fActions = new ArrayList<SourceContainerAction>(6); //the director that will be used by the tab to manage/store the containers protected ISourceLookupDirector fLocator; @@ -64,6 +63,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements * * @param parent the parent widget of this control */ + @Override public void createControl(Composite parent) { Font font = parent.getFont(); Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH); @@ -79,6 +79,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements fDuplicatesButton = SWTFactory.createCheckButton(comp, SourceLookupUIMessages.sourceTab_searchDuplicateLabel, null, false, 2); fDuplicatesButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { setDirty(true); updateLaunchConfigurationDialog(); @@ -136,9 +137,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements * Re-targets actions to the given viewer */ protected void retargetActions(SourceContainerViewer viewer) { - Iterator actions = fActions.iterator(); - while (actions.hasNext()) { - SourceContainerAction action = (SourceContainerAction) actions.next(); + for (SourceContainerAction action : fActions) { action.setViewer(viewer); } } @@ -147,6 +146,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements * Initializes this control based on the settings in the given * launch configuration. */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { if (fLocator != null) { fLocator.dispose(); @@ -233,6 +233,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements * @param workingCopy the working copy of the configuration that these values should be stored in, may be null. * If null, will be written into a working copy of the configuration referenced by the director. */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { if (isDirty()) { if (fLocator == null) { @@ -300,6 +301,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#setDirty(boolean) */ + @Override public void setDirty(boolean dirty) { super.setDirty(dirty); @@ -308,6 +310,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return SourceLookupUIMessages.sourceTab_tabTitle; } @@ -315,11 +318,13 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {} /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog() */ + @Override protected void updateLaunchConfigurationDialog() { if (getLaunchConfigurationDialog() != null) { super.updateLaunchConfigurationDialog(); @@ -333,7 +338,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements * @param affectedWorkingSet - the working set being removed */ private void validateWorkingSetSourceContainers(IWorkingSet affectedWorkingSet) { - List sourceContainers = (List) fPathViewer.getInput(); + List<?> sourceContainers = (List<?>) fPathViewer.getInput(); if (sourceContainers != null) { for (int i = 0; i < sourceContainers.size(); i++) { if (sourceContainers.get(i) instanceof WorkingSetSourceContainer) { @@ -350,20 +355,23 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements * Listen to working set changes * @param event */ + @Override public void propertyChange(PropertyChangeEvent event) { //if the PropertyChangeEvent has changeId CHANGE_WORKING_SET_REMOVE, //validate the list to make sure all working sets are valid //if the PropertyChangeEvent has changeId CHANGE_WORKING_SET_NAME_CHANGE, //do nothing because the event only has newValue, since oldValue is not provided //there is no way to identify which working set does the newValue corresponds to - if (event.getProperty().equals(IWorkingSetManager.CHANGE_WORKING_SET_REMOVE)) - validateWorkingSetSourceContainers((IWorkingSet) event.getOldValue()); + if (event.getProperty().equals(IWorkingSetManager.CHANGE_WORKING_SET_REMOVE)) { + validateWorkingSetSourceContainers((IWorkingSet) event.getOldValue()); + } } /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void activated(ILaunchConfigurationWorkingCopy workingCopy) { initializeFrom(workingCopy); } @@ -382,6 +390,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose() */ + @Override public void dispose() { super.dispose(); //listen to changes user made to the working sets, if a working set is being removed diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupResult.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupResult.java index 940dc9253..06d901a60 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupResult.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupResult.java @@ -55,14 +55,16 @@ public class SourceLookupResult implements ISourceLookupResult { /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.ISourceLookupResult#getArtifact() */ - public Object getArtifact() { + @Override + public Object getArtifact() { return fArtifact; } /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.ISourceLookupResult#getSourceElement() */ - public Object getSourceElement() { + @Override + public Object getSourceElement() { return fSourceElement; } @@ -80,7 +82,8 @@ public class SourceLookupResult implements ISourceLookupResult { /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.ISourceLookupResult#getEditorId() */ - public String getEditorId() { + @Override + public String getEditorId() { return fEditorId; } @@ -98,7 +101,8 @@ public class SourceLookupResult implements ISourceLookupResult { /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.ISourceLookupResult#getEditorInput() */ - public IEditorInput getEditorInput() { + @Override + public IEditorInput getEditorInput() { return fEditorInput; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupService.java index b4c92f3d5..d21dc2118 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupService.java @@ -46,6 +46,7 @@ public class SourceLookupService implements IDebugContextListener, ISourceDispla fWindow = null; } + @Override public synchronized void debugContextChanged(DebugContextEvent event) { if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { displaySource(event.getContext(), event.getDebugContextProvider().getPart(), false); @@ -81,6 +82,7 @@ public class SourceLookupService implements IDebugContextListener, ISourceDispla /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.contexts.ISourceDisplayAdapter#displaySource(java.lang.Object, org.eclipse.ui.IWorkbenchPage, boolean) */ + @Override public void displaySource(Object context, IWorkbenchPage page, boolean forceSourceLookup) { if (context instanceof IAdaptable) { IAdaptable adaptable = (IAdaptable) context; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupUIUtils.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupUIUtils.java index 4039d38e7..a52b03d92 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupUIUtils.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupUIUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -50,7 +50,7 @@ public class SourceLookupUIUtils { */ public static final String CONTAINER_ID_ATTRIBUTE = "containerTypeID"; //$NON-NLS-1$ - private static Hashtable fSourceContainerPresentationHashtable; + private static Hashtable<String, IConfigurationElement> fSourceContainerPresentationHashtable; /** * Constructor. Reads in Source Container Presentation extension implementations. @@ -59,7 +59,7 @@ public class SourceLookupUIUtils { IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), CONTAINER_PRESENTATION_EXTENSION); //read in SourceContainer presentation extensions IConfigurationElement[] sourceContainerPresentationExtensions =extensionPoint.getConfigurationElements(); - fSourceContainerPresentationHashtable = new Hashtable(); + fSourceContainerPresentationHashtable = new Hashtable<String, IConfigurationElement>(); for (int i = 0; i < sourceContainerPresentationExtensions.length; i++) { fSourceContainerPresentationHashtable.put( sourceContainerPresentationExtensions[i].getAttribute(CONTAINER_ID_ATTRIBUTE), @@ -75,8 +75,9 @@ public class SourceLookupUIUtils { * @return the image for the type specified */ public static Image getSourceContainerImage(String id){ - if(fSourceContainerPresentationHashtable == null) + if(fSourceContainerPresentationHashtable == null) { new SourceLookupUIUtils(); + } return DebugPluginImages.getImage(id); } @@ -87,13 +88,15 @@ public class SourceLookupUIUtils { */ public static ISourceContainerBrowser getSourceContainerBrowser(String typeID) { - if(fSourceContainerPresentationHashtable == null) + if(fSourceContainerPresentationHashtable == null) { new SourceLookupUIUtils(); - IConfigurationElement element = (IConfigurationElement)fSourceContainerPresentationHashtable.get(typeID); + } + IConfigurationElement element = fSourceContainerPresentationHashtable.get(typeID); ISourceContainerBrowser browser = null; try{ - if(element!= null && element.getAttribute(BROWSER_CLASS_ATTRIBUTE) != null) + if(element!= null && element.getAttribute(BROWSER_CLASS_ATTRIBUTE) != null) { browser = (ISourceContainerBrowser) element.createExecutableExtension(BROWSER_CLASS_ATTRIBUTE); + } }catch(CoreException e){} return browser; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/UpAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/UpAction.java index 94110d3c6..ae1a4bd1b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/UpAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/UpAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,10 +10,12 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.sourcelookup; -import java.util.Iterator; import java.util.List; +import org.eclipse.debug.core.sourcelookup.ISourceContainer; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.actions.SelectionListenerAction; /** * The action used to move source containers up in the list @@ -28,22 +30,21 @@ public class UpAction extends SourceContainerAction { * * @see IAction#run() */ + @Override public void run() { - List targets = getOrderedSelection(); + List<ISourceContainer> targets = getOrderedSelection(); if (targets.isEmpty()) { return; } int top = 0; int index = 0; - List list = getEntriesAsList(); - Iterator entries = targets.iterator(); - while (entries.hasNext()) { - Object target = entries.next(); - index = list.indexOf(target); + List<ISourceContainer> list = getEntriesAsList(); + for (ISourceContainer container : targets) { + index = list.indexOf(container); if (index > top) { top = index - 1; - Object temp = list.get(top); - list.set(top, target); + ISourceContainer temp = list.get(top); + list.set(top, container); list.set(index, temp); } top = index; @@ -54,6 +55,7 @@ public class UpAction extends SourceContainerAction { /** * @see SelectionListenerAction#updateSelection(IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { //check that something is selected, it's not first in the list, and it is a root tree node. return !selection.isEmpty() && !isIndexSelected(selection, 0) && getViewer().getTree().getSelection()[0].getParentItem()==null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/WorkingSetSourceContainerType.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/WorkingSetSourceContainerType.java index 2356bd14e..4a255f561 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/WorkingSetSourceContainerType.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/WorkingSetSourceContainerType.java @@ -38,6 +38,7 @@ public class WorkingSetSourceContainerType extends AbstractSourceContainerTypeDe /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer) */ + @Override public String getMemento(ISourceContainer container) throws CoreException { WorkingSetSourceContainer workingSet = (WorkingSetSourceContainer) container; Document doc = newDocument(); @@ -50,6 +51,7 @@ public class WorkingSetSourceContainerType extends AbstractSourceContainerTypeDe /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String) */ + @Override public ISourceContainer createSourceContainer(String memento)throws CoreException { IWorkingSet workingSet = null; Exception ex = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveFilter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveFilter.java index 427221356..65610cdc5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveFilter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,6 +19,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; @@ -32,16 +33,17 @@ public class ArchiveFilter extends ViewerFilter { /** * Collection of archives and containers to display */ - private Set fArchives; + private Set<IResource> fArchives; /** * Collection of already existing archives */ - private List fExisting; + private List<ISourceContainer> fExisting; /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { return fArchives.contains(element) && !fExisting.contains(element); } @@ -52,7 +54,7 @@ public class ArchiveFilter extends ViewerFilter { * * @param objects resources to exclude */ - public ArchiveFilter(List objects) { + public ArchiveFilter(List<ISourceContainer> objects) { fExisting = objects; init(); } @@ -62,8 +64,9 @@ public class ArchiveFilter extends ViewerFilter { */ private void init() { BusyIndicator.showWhile(DebugUIPlugin.getStandardDisplay(), new Runnable() { + @Override public void run() { - fArchives = new HashSet(); + fArchives = new HashSet<IResource>(); traverse(ResourcesPlugin.getWorkspace().getRoot(), fArchives); } }); @@ -76,7 +79,7 @@ public class ArchiveFilter extends ViewerFilter { * @param set the set to add any found archives to * @return <code>true</code> if any archives have been added false otherwise */ - private boolean traverse(IContainer container, Set set) { + private boolean traverse(IContainer container, Set<IResource> set) { boolean added = false; try { IResource[] resources = container.members(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java index 4ae4fc2a9..b8466343f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java @@ -42,6 +42,7 @@ import org.eclipse.ui.views.navigator.ResourceComparator; public class ArchiveSourceContainerBrowser extends AbstractSourceContainerBrowser { private ISelectionStatusValidator validator= new ISelectionStatusValidator() { + @Override public IStatus validate(Object[] selection) { if (selection.length == 0) { return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugCoreConstants.EMPTY_STRING, null); @@ -62,9 +63,9 @@ public class ArchiveSourceContainerBrowser extends AbstractSourceContainerBrowse * @param director source lookup director jars are being added to * @return the list of any found {@link ArchiveSourceContainer}s */ - protected List getSelectedJars(ISourceLookupDirector director) { + protected List<ISourceContainer> getSelectedJars(ISourceLookupDirector director) { ISourceContainer[] containers = director.getSourceContainers(); - List jars = new ArrayList(); + List<ISourceContainer> jars = new ArrayList<ISourceContainer>(); for (int i = 0; i < containers.length; i++) { ISourceContainer container = containers[i]; if (container.getType().getId().equals(ArchiveSourceContainer.TYPE_ID)) { @@ -77,6 +78,7 @@ public class ArchiveSourceContainerBrowser extends AbstractSourceContainerBrowse /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#createSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.internal.core.sourcelookup.ISourceLookupDirector) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { ViewerFilter filter= new ArchiveFilter(getSelectedJars(director)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerBrowser.java index b3cbbbad8..bd196c1ef 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerBrowser.java @@ -28,6 +28,7 @@ public class DirectorySourceContainerBrowser extends AbstractSourceContainerBrow /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#createSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { ISourceContainer[] containers = new ISourceContainer[1]; DirectorySourceContainerDialog dialog = new DirectorySourceContainerDialog(shell); @@ -44,6 +45,7 @@ public class DirectorySourceContainerBrowser extends AbstractSourceContainerBrow /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#canEditSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public boolean canEditSourceContainers(ISourceLookupDirector director, ISourceContainer[] containers) { return containers.length == 1 && DirectorySourceContainer.TYPE_ID.equals(containers[0].getType().getId()); } @@ -51,6 +53,7 @@ public class DirectorySourceContainerBrowser extends AbstractSourceContainerBrow /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#editSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public ISourceContainer[] editSourceContainers(Shell shell, ISourceLookupDirector director, ISourceContainer[] containers) { if (containers.length == 1 && DirectorySourceContainer.TYPE_ID.equals(containers[0].getType().getId()) ) { DirectorySourceContainer c = (DirectorySourceContainer)containers[0]; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java index 942cb37e1..84f32edc9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java @@ -105,6 +105,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Image image = (fNewContainer) ? DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_ADD_SRC_DIR_WIZ) : DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_EDIT_SRC_DIR_WIZ); @@ -142,6 +143,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { fDirText.setLayoutData(data); fDirText.setFont(font); fDirText.addModifyListener(new ModifyListener() { + @Override public void modifyText( ModifyEvent e ) { validate(); } @@ -156,7 +158,8 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { button.setLayoutData(data); button.setFont(JFaceResources.getDialogFont()); button.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { browse(); } }); @@ -170,6 +173,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell newShell) { String title = null; if (fNewContainer) { @@ -184,6 +188,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TitleAreaDialog#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Control c = super.createContents(parent); fDirText.setText(fDirectory); @@ -196,6 +201,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { fDirectory = fDirText.getText().trim(); fSearchSubfolders = fSubfoldersButton.getSelection(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java index a5e2f036c..980d0abc4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java @@ -33,6 +33,7 @@ public class ExternalArchiveSourceContainerBrowser extends AbstractSourceContain /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#createSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI); String rootDir = DebugUIPlugin.getDefault().getDialogSettings().get(ROOT_DIR); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerBrowser.java index d040e54e6..32d4e246c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerBrowser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -33,18 +33,19 @@ public class FolderSourceContainerBrowser extends AbstractSourceContainerBrowser /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#createSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { FolderSourceContainerDialog dialog = new FolderSourceContainerDialog(shell, new WorkbenchLabelProvider(), new WorkbenchContentProvider()); if (dialog.open() == Window.OK) { Object[] selection= ((ElementTreeSelectionDialog)dialog).getResult(); - ArrayList containers = new ArrayList(); + ArrayList<ISourceContainer> containers = new ArrayList<ISourceContainer>(); for (int i= 0; i < selection.length; i++) { if(selection[i] instanceof IFolder) { containers.add(new FolderSourceContainer((IFolder)selection[i], dialog.isSearchSubfolders())); } } - return (ISourceContainer[])containers.toArray(new ISourceContainer[containers.size()]); + return containers.toArray(new ISourceContainer[containers.size()]); } return new ISourceContainer[0]; } @@ -52,6 +53,7 @@ public class FolderSourceContainerBrowser extends AbstractSourceContainerBrowser /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#canEditSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public boolean canEditSourceContainers(ISourceLookupDirector director, ISourceContainer[] containers) { return containers.length == 1 && containers[0].getType().getId().equals(FolderSourceContainer.TYPE_ID); } @@ -59,6 +61,7 @@ public class FolderSourceContainerBrowser extends AbstractSourceContainerBrowser /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#editSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public ISourceContainer[] editSourceContainers(Shell shell, ISourceLookupDirector director, ISourceContainer[] containers) { FolderSourceContainerDialog dialog = new FolderSourceContainerDialog(shell, new WorkbenchLabelProvider(), new WorkbenchContentProvider()); FolderSourceContainer container = (FolderSourceContainer) containers[0]; @@ -67,13 +70,13 @@ public class FolderSourceContainerBrowser extends AbstractSourceContainerBrowser if (dialog.open() == Window.OK) { container.dispose(); Object[] selection= ((ElementTreeSelectionDialog)dialog).getResult(); - ArrayList list = new ArrayList(); + ArrayList<ISourceContainer> list = new ArrayList<ISourceContainer>(); for (int i= 0; i < selection.length; i++) { if(selection[i] instanceof IFolder) { list.add(new FolderSourceContainer((IFolder)selection[i], dialog.isSearchSubfolders())); } } - return (ISourceContainer[])list.toArray(new ISourceContainer[list.size()]); + return list.toArray(new ISourceContainer[list.size()]); } return new ISourceContainer[0]; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java index a3e3864ea..c0daeb805 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java @@ -66,6 +66,7 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog { * * @since 3.2 */ + @Override protected Control createDialogArea(Composite parent) { Composite parentc = (Composite)super.createDialogArea(parent); fSubfoldersButton = new Button(parentc, SWT.CHECK); @@ -86,6 +87,7 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog { setInput(ResourcesPlugin.getWorkspace().getRoot()); setComparator(new ResourceComparator(ResourceComparator.NAME)); ISelectionStatusValidator validator= new ISelectionStatusValidator() { + @Override public IStatus validate(Object[] selection) { for (int i= 0; i < selection.length; i++) { if (!(selection[i] instanceof IFolder)) { @@ -102,6 +104,7 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugHelpContextIds.ADD_FOLDER_CONTAINER_DIALOG); setSearchSubfolders(DebugUIPlugin.getDefault().getDialogSettings().getBoolean(LAST_SUBDIR_SETTING)); addFilter(new ViewerFilter() { + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if(!(element instanceof IFolder)) { if(element instanceof IProject) { @@ -137,6 +140,7 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog { /* (non-Javadoc) * @see org.eclipse.ui.dialogs.SelectionStatusDialog#okPressed() */ + @Override protected void okPressed() { fSearchSubfolders = fSubfoldersButton.getSelection(); DebugUIPlugin.getDefault().getDialogSettings().put(LAST_SUBDIR_SETTING, fSearchSubfolders); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerBrowser.java index a5c0e8c43..7902f7581 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerBrowser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ package org.eclipse.debug.internal.ui.sourcelookup.browsers; import java.util.ArrayList; + import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.debug.core.sourcelookup.ISourceContainer; @@ -37,6 +38,7 @@ public class ProjectSourceContainerBrowser extends AbstractSourceContainerBrowse /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#createSourceContainers(org.eclipse.swt.widgets.Shell,org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { Object input = ResourcesPlugin.getWorkspace().getRoot(); IStructuredContentProvider contentProvider=new BasicContainerContentProvider(); @@ -45,13 +47,14 @@ public class ProjectSourceContainerBrowser extends AbstractSourceContainerBrowse SourceLookupUIMessages.projectSelection_chooseLabel); if(dialog.open() == Window.OK){ Object[] elements= ((ListSelectionDialog)dialog).getResult(); - ArrayList res= new ArrayList(); + ArrayList<ISourceContainer> res = new ArrayList<ISourceContainer>(); for (int i= 0; i < elements.length; i++) { - if(!(elements[i] instanceof IProject)) - continue; + if(!(elements[i] instanceof IProject)) { + continue; + } res.add(new ProjectSourceContainer((IProject)elements[i], ((ProjectSourceContainerDialog)dialog).isAddRequiredProjects())); } - return (ISourceContainer[])res.toArray(new ISourceContainer[res.size()]); + return res.toArray(new ISourceContainer[res.size()]); } return new ISourceContainer[0]; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerDialog.java index 3467f1bf8..667410697 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerDialog.java @@ -46,6 +46,7 @@ public class ProjectSourceContainerDialog extends ListSelectionDialog { /** * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Font font = parent.getFont(); @@ -54,6 +55,7 @@ public class ProjectSourceContainerDialog extends ListSelectionDialog { final Button addRequired = new Button(composite, SWT.CHECK); addRequired.setText(SourceLookupUIMessages.projectSelection_requiredLabel); addRequired.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fAddRequiredProjects = addRequired.getSelection(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/WorkingSetSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/WorkingSetSourceContainerBrowser.java index ea7a9144a..253032eb8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/WorkingSetSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/WorkingSetSourceContainerBrowser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,27 +28,28 @@ import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog; * @since 3.0 */ public class WorkingSetSourceContainerBrowser extends AbstractSourceContainerBrowser { - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#createSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.ILaunchConfiguration) + + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser# + * createSourceContainers(org.eclipse.swt.widgets.Shell, + * org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { - ArrayList containers = new ArrayList(); - IWorkingSetSelectionDialog dialog = PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetSelectionDialog(shell,true); - - if(dialog.open() == Window.OK) - { + ArrayList<ISourceContainer> containers = new ArrayList<ISourceContainer>(); + IWorkingSetSelectionDialog dialog = PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetSelectionDialog(shell, true); + + if (dialog.open() == Window.OK) { IWorkingSet[] selections = dialog.getSelection(); - if(selections != null) - { - for(int i=0; i<selections.length; i++) - { - containers.add(new WorkingSetSourceContainer(selections[i])); - } - } + if (selections != null) { + for (int i = 0; i < selections.length; i++) { + containers.add(new WorkingSetSourceContainer(selections[i])); + } + } } - - return (ISourceContainer[])containers.toArray(new ISourceContainer[containers.size()]); + + return containers.toArray(new ISourceContainer[containers.size()]); } - + } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/WorkspaceSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/WorkspaceSourceContainerBrowser.java index 63758920c..795e5c2e3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/WorkspaceSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/WorkspaceSourceContainerBrowser.java @@ -26,6 +26,7 @@ public class WorkspaceSourceContainerBrowser extends AbstractSourceContainerBrow /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#createSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { ISourceContainer[] containers = new ISourceContainer[1]; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java index 418c69f23..558376095 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java @@ -22,6 +22,7 @@ public class FilePrompt extends PromptingResolver { * Prompts the user to choose a file * @see PromptExpanderBase#prompt() */ + @Override public void prompt() { FileDialog dialog = new FileDialog(getShell()); dialog.setText(dialogMessage); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java index 861fcebe8..76dc24657 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java @@ -22,6 +22,7 @@ public class FolderPrompt extends PromptingResolver { * Prompts the user to choose a folder. * @see PromptExpanderBase#prompt() */ + @Override public void prompt() { DirectoryDialog dialog = new DirectoryDialog(getShell()); dialog.setText(dialogMessage); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PasswordPrompt.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PasswordPrompt.java index e535d9185..1eb238f69 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PasswordPrompt.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PasswordPrompt.java @@ -33,6 +33,7 @@ public class PasswordPrompt extends PromptingResolver { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.stringsubstitution.PromptingResolver#prompt() */ + @Override public void prompt() { Dialog dialog = new Dialog((Shell)null){ private Text text; @@ -40,6 +41,7 @@ public class PasswordPrompt extends PromptingResolver { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { // create composite Composite composite = (Composite) super.createDialogArea(parent); @@ -68,6 +70,7 @@ public class PasswordPrompt extends PromptingResolver { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) */ + @Override protected void buttonPressed(int buttonId) { if (buttonId == IDialogConstants.OK_ID) { returnValue = text.getText(); @@ -80,6 +83,7 @@ public class PasswordPrompt extends PromptingResolver { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(StringSubstitutionMessages.StringPromptExpander_0); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java index fc00f409e..2aa1aaaac 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 Matt Conway and others. + * Copyright (c) 2000, 2013 Matt Conway and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,8 +11,6 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.stringsubstitution; -import com.ibm.icu.text.MessageFormat; - import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -22,6 +20,8 @@ import org.eclipse.debug.core.DebugException; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.swt.widgets.Shell; +import com.ibm.icu.text.MessageFormat; + /** * Base implementation for variable resolvers that prompt the user * for their value. @@ -80,7 +80,7 @@ abstract class PromptingResolver implements IDynamicVariableResolver { } if (promptHint != null) { - dialogMessage = MessageFormat.format(StringSubstitutionMessages.PromptExpanderBase_0, new String[] {promptHint}); + dialogMessage = MessageFormat.format(StringSubstitutionMessages.PromptExpanderBase_0, new Object[] { promptHint }); } else { dialogMessage = StringSubstitutionMessages.PromptExpanderBase_1; } @@ -89,11 +89,13 @@ abstract class PromptingResolver implements IDynamicVariableResolver { /* (non-Javadoc) * @see org.eclipse.debug.internal.core.stringsubstitution.IContextVariableResolver#resolveValue(org.eclipse.debug.internal.core.stringsubstitution.IContextVariable, java.lang.String) */ + @Override public String resolveValue(IDynamicVariable variable, String argument) throws CoreException { String value = null; setupDialog(argument); DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() { + @Override public void run() { prompt(); } @@ -103,7 +105,7 @@ abstract class PromptingResolver implements IDynamicVariableResolver { lastValue = dialogResultString; } else { // dialogResultString == null means prompt was cancelled - throw new DebugException(new Status(IStatus.CANCEL, DebugUIPlugin.getUniqueIdentifier(), IStatus.CANCEL, MessageFormat.format(StringSubstitutionMessages.PromptingResolver_0, new String[] { variable.getName() }), null)); + throw new DebugException(new Status(IStatus.CANCEL, DebugUIPlugin.getUniqueIdentifier(), IStatus.CANCEL, MessageFormat.format(StringSubstitutionMessages.PromptingResolver_0, new Object[] { variable.getName() }), null)); } return value; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java index edc465e1a..d58cf76ea 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java @@ -26,6 +26,7 @@ public class ResourceSelector implements IArgumentSelector { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.stringsubstitution.IArgumentSelector#selectArgument(org.eclipse.debug.internal.core.stringsubstitution.IStringVariable) */ + @Override public String selectArgument(IStringVariable variable, Shell shell) { ResourceListSelectionDialog dialog = new ResourceListSelectionDialog(shell, ResourcesPlugin.getWorkspace().getRoot(), IResource.FILE | IResource.FOLDER | IResource.PROJECT); dialog.setTitle(StringSubstitutionMessages.ResourceSelector_0); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedResourceManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedResourceManager.java index 842af04e7..dce7853fa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedResourceManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedResourceManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -72,6 +72,7 @@ public class SelectedResourceManager { else { final IStructuredSelection[] selection = new IStructuredSelection[1]; DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() { + @Override public void run() { selection[0] = getCurrentSelection0(); } @@ -126,6 +127,7 @@ public class SelectedResourceManager { else { final IResource[] resource = new IResource[1]; DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() { + @Override public void run() { resource[0] = getSelectedResource0(); } @@ -160,7 +162,7 @@ public class SelectedResourceManager { if(selection instanceof IStructuredSelection) { IStructuredSelection ss = (IStructuredSelection) selection; if(!ss.isEmpty()) { - Iterator iterator = ss.iterator(); + Iterator<?> iterator = ss.iterator(); while (iterator.hasNext() && resource == null) { Object next = iterator.next(); resource = (IResource) Platform.getAdapterManager().getAdapter(next, IResource.class); @@ -188,6 +190,7 @@ public class SelectedResourceManager { else { final String[] text = new String[1]; DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() { + @Override public void run() { text[0] = getSelectedText0(); } @@ -239,6 +242,7 @@ public class SelectedResourceManager { else { final IWorkbenchWindow[] window = new IWorkbenchWindow[1]; DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() { + @Override public void run() { window[0] = DebugUIPlugin.getActiveWorkbenchWindow(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedResourceResolver.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedResourceResolver.java index 0fcedc27a..a0b379925 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedResourceResolver.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedResourceResolver.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,12 +28,13 @@ public class SelectedResourceResolver extends ResourceResolver implements IDynam /* (non-Javadoc) * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String) */ + @Override public String resolveValue(IDynamicVariable variable, String argument) throws CoreException { IResource resource = SelectedResourceManager.getDefault().getSelectedResource(); if (resource != null) { return translateToValue(resource, variable); } - abort(MessageFormat.format(StringSubstitutionMessages.SelectedResourceResolver_0, new String[]{getReferenceExpression(variable, argument)}), null); + abort(MessageFormat.format(StringSubstitutionMessages.SelectedResourceResolver_0, new Object[] { getReferenceExpression(variable, argument) }), null); return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedTextResolver.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedTextResolver.java index e2726b883..31acde4b6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedTextResolver.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SelectedTextResolver.java @@ -24,6 +24,7 @@ public class SelectedTextResolver implements IDynamicVariableResolver { /* (non-Javadoc) * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String) */ + @Override public String resolveValue(IDynamicVariable variable, String argument) { String selection = selectedResourceManager.getSelectedText(); String selectedText = argument; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringPrompt.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringPrompt.java index da44ec551..12066063b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringPrompt.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringPrompt.java @@ -23,6 +23,7 @@ public class StringPrompt extends PromptingResolver { * Prompts the user to input a string. * @see PromptExpanderBase#prompt() */ + @Override public void prompt() { InputDialog dialog = new InputDialog(null, StringSubstitutionMessages.StringPromptExpander_0, dialogMessage, defaultValue == null ? lastValue : defaultValue, null); int dialogResult = dialog.open(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableLabelProvider.java index ca12e4196..3c8f6d12a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableLabelProvider.java @@ -19,6 +19,7 @@ public class StringVariableLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { if (element instanceof IStringVariable) { IStringVariable variable = (IStringVariable)element; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariablePresentationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariablePresentationManager.java index c3c87ae66..d649557fa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariablePresentationManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariablePresentationManager.java @@ -49,7 +49,7 @@ public class StringVariablePresentationManager { * Table of configuration elements for variable presentations, * keyed by variable name. */ - private Map fConfigurations; + private Map<String, IConfigurationElement> fConfigurations; /** * Returns the singleton string variable presentation manager. @@ -71,7 +71,7 @@ public class StringVariablePresentationManager { * @return argument selector or <code>null</code> */ public IArgumentSelector getArgumentSelector(IStringVariable variable) { - IConfigurationElement element = (IConfigurationElement) fConfigurations.get(variable.getName()); + IConfigurationElement element = fConfigurations.get(variable.getName()); if (element != null) { try { return (IArgumentSelector)element.createExecutableExtension(ATTR_ARGUMENT_SELECTOR); @@ -93,14 +93,14 @@ public class StringVariablePresentationManager { * Load extensions */ private void initialize() { - fConfigurations = new HashMap(); + fConfigurations = new HashMap<String, IConfigurationElement>(); IExtensionPoint point= Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), EXTENSION_POINT_STRING_VARIABLE_PRESENTATIONS); IConfigurationElement elements[]= point.getConfigurationElements(); for (int i = 0; i < elements.length; i++) { IConfigurationElement element = elements[i]; String name= element.getAttribute(ATTR_NAME); if (name == null) { - DebugUIPlugin.logErrorMessage(MessageFormat.format("String variable presentation extension missing required 'variableName' attribute: {0}", new String[] {element.getDeclaringExtension().getLabel()})); //$NON-NLS-1$ + DebugUIPlugin.logErrorMessage(MessageFormat.format("String variable presentation extension missing required 'variableName' attribute: {0}", new Object[] { element.getDeclaringExtension().getLabel() })); //$NON-NLS-1$ continue; } fConfigurations.put(name, element); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SystemPropertyArgumentSelector.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SystemPropertyArgumentSelector.java index 4f5d2157b..8b805b7f5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SystemPropertyArgumentSelector.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/SystemPropertyArgumentSelector.java @@ -27,6 +27,7 @@ public class SystemPropertyArgumentSelector implements IArgumentSelector { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.stringsubstitution.IArgumentSelector#selectArgument(org.eclipse.core.variables.IStringVariable, org.eclipse.swt.widgets.Shell) */ + @Override public String selectArgument(IStringVariable variable, Shell shell) { ElementListSelectionDialog dialog = new ElementListSelectionDialog(shell, new LabelProvider()); dialog.setElements(System.getProperties().keySet().toArray()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java index 55ad863d4..d24d85179 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.ListIterator; import java.util.Map; import org.eclipse.core.runtime.CoreException; @@ -44,8 +45,21 @@ import org.eclipse.jface.viewers.ViewerSorter; public abstract class AsynchronousModel { private ModelNode fRoot; // root node - private Map fElementToNodes = new HashMap(); // map of element to corresponding tree nodes (list) - private Map fModelProxies = new HashMap(); // map of installed model proxies, by element + private Map<Object, ModelNode[]> fElementToNodes = new HashMap<Object, ModelNode[]>(); // map + // of + // element + // to + // corresponding + // tree + // nodes + // (list) + private Map<Object, IModelProxy> fModelProxies = new HashMap<Object, IModelProxy>(); // map + // of + // installed + // model + // proxies, + // by + // element private AsynchronousViewer fViewer; // viewer this model works for private boolean fDisposed = false; // whether disposed @@ -54,6 +68,7 @@ public abstract class AsynchronousModel { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.AsynchronousContentAdapter#getChildren(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected Object[] getChildren(Object parent, IPresentationContext context) throws CoreException { return EMPTY; } @@ -61,6 +76,7 @@ public abstract class AsynchronousModel { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.AsynchronousContentAdapter#hasChildren(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected boolean hasChildren(Object element, IPresentationContext context) throws CoreException { return false; } @@ -68,6 +84,7 @@ public abstract class AsynchronousModel { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.AsynchronousContentAdapter#supportsPartId(java.lang.String) */ + @Override protected boolean supportsPartId(String id) { return true; } @@ -78,12 +95,12 @@ public abstract class AsynchronousModel { /** * List of requests currently being performed. */ - private List fPendingUpdates = new ArrayList(); + private List<IStatusMonitor> fPendingUpdates = new ArrayList<IStatusMonitor>(); /** - * List of pending viewer udpates + * List of pending viewer updates */ - private List fViewerUpdates = new ArrayList(); + private List<IStatusMonitor> fViewerUpdates = new ArrayList<IStatusMonitor>(); /** * Constructs a new empty tree model @@ -154,9 +171,9 @@ public abstract class AsynchronousModel { * Cancels all pending update requests. */ protected synchronized void cancelPendingUpdates() { - Iterator updates = fPendingUpdates.iterator(); + Iterator<IStatusMonitor> updates = fPendingUpdates.iterator(); while (updates.hasNext()) { - IStatusMonitor update = (IStatusMonitor) updates.next(); + IStatusMonitor update = updates.next(); updates.remove(); update.setCanceled(true); } @@ -177,6 +194,7 @@ public abstract class AsynchronousModel { if (proxy != null) { fModelProxies.put(element, proxy); Job job = new Job("Model Proxy installed notification job") {//$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { if (!monitor.isCanceled()) { proxy.init(getPresentationContext()); @@ -199,7 +217,7 @@ public abstract class AsynchronousModel { * @param element the element context */ protected synchronized void disposeModelProxy(Object element) { - IModelProxy proxy = (IModelProxy) fModelProxies.remove(element); + IModelProxy proxy = fModelProxies.remove(element); if (proxy != null) { getViewer().modelProxyRemoved(proxy); proxy.dispose(); @@ -211,13 +229,10 @@ public abstract class AsynchronousModel { */ private void disposeAllModelProxies() { synchronized(fModelProxies) { - Iterator updatePolicies = fModelProxies.values().iterator(); - while (updatePolicies.hasNext()) { - IModelProxy proxy = (IModelProxy)updatePolicies.next(); + for (IModelProxy proxy : fModelProxies.values()) { getViewer().modelProxyRemoved(proxy); proxy.dispose(); } - fModelProxies.clear(); } } @@ -281,7 +296,7 @@ public abstract class AsynchronousModel { */ protected synchronized void unmapNode(ModelNode node) { Object element = node.getElement(); - ModelNode[] nodes = (ModelNode[]) fElementToNodes.get(element); + ModelNode[] nodes = fElementToNodes.get(element); if (nodes == null) { return; } @@ -311,7 +326,7 @@ public abstract class AsynchronousModel { * @return associated nodes or <code>null</code> */ public synchronized ModelNode[] getNodes(Object element) { - return (ModelNode[]) fElementToNodes.get(element); + return fElementToNodes.get(element); } /** @@ -332,7 +347,7 @@ public abstract class AsynchronousModel { protected void requestScheduled(IStatusMonitor update) { AsynchronousRequestMonitor absUpdate = (AsynchronousRequestMonitor) update; synchronized (fPendingUpdates) { - Iterator updates = fPendingUpdates.listIterator(); + ListIterator<IStatusMonitor> updates = fPendingUpdates.listIterator(); while (updates.hasNext()) { AsynchronousRequestMonitor pendingUpdate = (AsynchronousRequestMonitor) updates.next(); if (absUpdate.contains(pendingUpdate)) { @@ -378,16 +393,18 @@ public abstract class AsynchronousModel { protected Object[] filter(Object parent, Object[] elements) { ViewerFilter[] filters = getViewer().getFilters(); if (filters != null) { - ArrayList filtered = new ArrayList(elements.length); + ArrayList<Object> filtered = new ArrayList<Object>(elements.length); for (int i = 0; i < elements.length; i++) { boolean add = true; for (int j = 0; j < filters.length; j++) { add = filters[j].select(getViewer(), parent, elements[i]); - if (!add) + if (!add) { break; + } } - if (add) + if (add) { filtered.add(elements[i]); + } } return filtered.toArray(); } @@ -526,8 +543,7 @@ public abstract class AsynchronousModel { * @param parentNode parent node * @param kids list of model elements */ - protected void setChildren(final ModelNode parentNode, List kids) { - + protected void setChildren(final ModelNode parentNode, List<Object> kids) { final Object[] children = filter(parentNode.getElement(), kids.toArray()); final AsynchronousViewer viewer = getViewer(); ViewerSorter sorter = viewer.getSorter(); @@ -593,7 +609,8 @@ public abstract class AsynchronousModel { //update viewer outside the lock final ModelNode[] finalUnmap = unmap; preservingSelection(new Runnable() { - public void run() { + @Override + public void run() { if (finalUnmap != null) { for (int i = 0; i < finalUnmap.length; i++) { viewer.unmapNode(finalUnmap[i]); @@ -605,6 +622,7 @@ public abstract class AsynchronousModel { } + @Override public String toString() { StringBuffer buf = new StringBuffer(); if (fRoot != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousRequestMonitor.java index c5fc0235c..92071d2ac 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousRequestMonitor.java @@ -43,7 +43,8 @@ public abstract class AsynchronousRequestMonitor extends AbstractRequestMonitor private boolean fDone = false; protected WorkbenchJob fViewerUpdateJob = new WorkbenchJob("Asynchronous viewer update") { //$NON-NLS-1$ - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { // necessary to check if widget is disposed. The item may // have been removed from the tree when another children update // occurred. @@ -131,7 +132,8 @@ public abstract class AsynchronousRequestMonitor extends AbstractRequestMonitor /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean) */ - public void setCanceled(boolean value) { + @Override + public void setCanceled(boolean value) { super.setCanceled(value); if (value) { getModel().requestCanceled(this); @@ -141,7 +143,8 @@ public abstract class AsynchronousRequestMonitor extends AbstractRequestMonitor /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#done() */ - public final void done() { + @Override + public final void done() { synchronized (this) { fDone = true; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousSchedulingRuleFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousSchedulingRuleFactory.java index a6cfaf8fe..aa2ffa508 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousSchedulingRuleFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousSchedulingRuleFactory.java @@ -29,10 +29,12 @@ public class AsynchronousSchedulingRuleFactory { public SerialRule() { } + @Override public boolean contains(ISchedulingRule rule) { return rule == this; } + @Override public boolean isConflicting(ISchedulingRule rule) { return rule instanceof SerialRule; } @@ -49,6 +51,7 @@ public class AsynchronousSchedulingRuleFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse.core.runtime.jobs.ISchedulingRule) */ + @Override public boolean contains(ISchedulingRule rule) { return rule == this; } @@ -56,6 +59,7 @@ public class AsynchronousSchedulingRuleFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule) */ + @Override public boolean isConflicting(ISchedulingRule rule) { if (rule instanceof SerialPerObjectRule) { SerialPerObjectRule vup = (SerialPerObjectRule) rule; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java index ae6ff9c3a..386e2396b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,6 @@ package org.eclipse.debug.internal.ui.viewers; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; @@ -33,6 +32,7 @@ public class AsynchronousTableModel extends AsynchronousModel { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousModel#add(org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.ModelNode, java.lang.Object) */ + @Override protected void add(ModelNode parent, Object element) {} /** @@ -52,14 +52,14 @@ public class AsynchronousTableModel extends AsynchronousModel { * @param elements elements to add */ protected void added(Object[] elements) { - List kids = null; + List<Object> kids = null; boolean changed = false; synchronized (this) { ModelNode[] childrenNodes = getRootNode().getChildrenNodes(); if (childrenNodes == null) { - kids = new ArrayList(elements.length); + kids = new ArrayList<Object>(elements.length); } else { - kids = new ArrayList(elements.length + childrenNodes.length); + kids = new ArrayList<Object>(elements.length + childrenNodes.length); for (int i = 0; i < childrenNodes.length; i++) { kids.add(childrenNodes[i].getElement()); } @@ -95,14 +95,14 @@ public class AsynchronousTableModel extends AsynchronousModel { * @param index index to insert at */ protected void inserted(Object[] elements, int index) { - List kids = null; + List<Object> kids = null; boolean changed = false; synchronized (this) { ModelNode[] childrenNodes = getRootNode().getChildrenNodes(); if (childrenNodes == null) { - kids = new ArrayList(elements.length); + kids = new ArrayList<Object>(elements.length); } else { - kids = new ArrayList(elements.length + childrenNodes.length); + kids = new ArrayList<Object>(elements.length + childrenNodes.length); for (int i = 0; i < childrenNodes.length; i++) { kids.add(childrenNodes[i].getElement()); } @@ -137,12 +137,12 @@ public class AsynchronousTableModel extends AsynchronousModel { * @param elements elements to remove */ protected void removed(Object[] elements) { - List kids = null; + List<Object> kids = null; boolean changed = false; synchronized (this) { ModelNode[] childrenNodes = getRootNode().getChildrenNodes(); if (childrenNodes != null) { - kids = new ArrayList(childrenNodes.length); + kids = new ArrayList<Object>(childrenNodes.length); for (int i = 0; i < childrenNodes.length; i++) { kids.add(childrenNodes[i].getElement()); } @@ -180,7 +180,7 @@ public class AsynchronousTableModel extends AsynchronousModel { remove(new Object[]{element}); return; } - List list = new ArrayList(); + List<ModelNode> list = new ArrayList<ModelNode>(); synchronized (this) { ModelNode[] nodes = getNodes(element); for (int i = 0; i < nodes.length; i++) { @@ -190,9 +190,7 @@ public class AsynchronousTableModel extends AsynchronousModel { } } if (!list.isEmpty()) { - Iterator iterator = list.iterator(); - while (iterator.hasNext()) { - ModelNode node = (ModelNode) iterator.next(); + for (ModelNode node : list) { getViewer().nodeChanged(node); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java index a0885ce1d..97e5cdb13 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -81,24 +81,28 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste fTableEditorImpl = createTableEditorImpl(); } - protected void hookControl(Control control) { + @Override + protected void hookControl(Control control) { super.hookControl(control); control.addMouseListener(new MouseAdapter() { - public void mouseDown(MouseEvent e) { + @Override + public void mouseDown(MouseEvent e) { fTableEditorImpl.handleMouseDown(e); } }); } - public synchronized void dispose() { + @Override + public synchronized void dispose() { fTableEditor.dispose(); fTable.dispose(); super.dispose(); } - protected ISelection doAttemptSelectionToWidget(ISelection selection, boolean reveal) { + @Override + protected ISelection doAttemptSelectionToWidget(ISelection selection, boolean reveal) { if (acceptsSelection(selection)) { - List list = ((IStructuredSelection) selection).toList(); + List<?> list = ((IStructuredSelection) selection).toList(); if (list == null) { fTable.deselectAll(); return StructuredSelection.EMPTY; @@ -128,11 +132,13 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste return StructuredSelection.EMPTY; } - protected boolean acceptsSelection(ISelection selection) { + @Override + protected boolean acceptsSelection(ISelection selection) { return selection instanceof IStructuredSelection; } - protected ISelection getEmptySelection() { + @Override + protected ISelection getEmptySelection() { return StructuredSelection.EMPTY; } @@ -143,16 +149,18 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste return null; } - protected List getSelectionFromWidget() { + @Override + protected List getSelectionFromWidget() { TableItem[] selection = fTable.getSelection(); - List datas = new ArrayList(selection.length); + List<Object> datas = new ArrayList<Object>(selection.length); for (int i = 0; i < selection.length; i++) { datas.add(selection[i].getData()); } return datas; } - public Control getControl() { + @Override + public Control getControl() { return fTable; } @@ -163,14 +171,16 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousViewer#internalRefresh(org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.ModelNode) */ - protected void internalRefresh(ModelNode node) { + @Override + protected void internalRefresh(ModelNode node) { super.internalRefresh(node); if (node.getElement().equals(getInput())) { updateChildren(node); } } - protected void restoreLabels(Item item) { + @Override + protected void restoreLabels(Item item) { TableItem tableItem = (TableItem) item; String[] values = (String[]) tableItem.getData(OLD_LABEL); Image[] images = (Image[]) tableItem.getData(OLD_IMAGE); @@ -180,6 +190,7 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste } } + @Override public void setLabels(Widget widget, String[] labels, ImageDescriptor[] imageDescriptors) { TableItem item = (TableItem) widget; item.setText(labels); @@ -188,14 +199,16 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste item.setData(OLD_IMAGE, images); if (imageDescriptors != null) { for (int i = 0; i < images.length; i++) { - if (i < imageDescriptors.length) - images[i] = getImage(imageDescriptors[i]); + if (i < imageDescriptors.length) { + images[i] = getImage(imageDescriptors[i]); + } } } item.setImage(images); } - public void setColors(Widget widget, RGB[] foregrounds, RGB[] backgrounds) { + @Override + public void setColors(Widget widget, RGB[] foregrounds, RGB[] backgrounds) { TableItem item = (TableItem) widget; if (foregrounds == null) { foregrounds = new RGB[fTable.getColumnCount()]; @@ -214,7 +227,8 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste } } - public void setFonts(Widget widget, FontData[] fontDatas) { + @Override + public void setFonts(Widget widget, FontData[] fontDatas) { TableItem item = (TableItem) widget; if (fontDatas != null) { for (int i = 0; i < fontDatas.length; i++) { @@ -234,7 +248,8 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste public void showColumnHeader(final boolean showHeaders) { WorkbenchJob job = new WorkbenchJob("Set Header Visibility") { //$NON-NLS-1$ - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { if (!fTable.isDisposed()) { fTable.setHeaderVisible(showHeaders); @@ -252,11 +267,13 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste * * @see org.eclipse.jface.viewers.StructuredViewer#reveal(java.lang.Object) */ - public void reveal(Object element) { + @Override + public void reveal(Object element) { Assert.isNotNull(element); Widget w = findItem(element); - if (w instanceof TableItem) - getTable().showItem((TableItem) w); + if (w instanceof TableItem) { + getTable().showItem((TableItem) w); + } } /** @@ -281,37 +298,45 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste protected TableEditorImpl createTableEditorImpl() { return new TableEditorImpl(this) { - Rectangle getBounds(Item item, int columnNumber) { + @Override + Rectangle getBounds(Item item, int columnNumber) { return ((TableItem) item).getBounds(columnNumber); } - int getColumnCount() { + @Override + int getColumnCount() { return getTable().getColumnCount(); } - Item[] getSelection() { + @Override + Item[] getSelection() { return getTable().getSelection(); } - void setEditor(Control w, Item item, int columnNumber) { + @Override + void setEditor(Control w, Item item, int columnNumber) { fTableEditor.setEditor(w, (TableItem) item, columnNumber); } - void setSelection(StructuredSelection selection, boolean b) { + @Override + void setSelection(StructuredSelection selection, boolean b) { AsynchronousTableViewer.this.setSelection(selection, b); } - void showSelection() { + @Override + void showSelection() { getTable().showSelection(); } - void setLayoutData(CellEditor.LayoutData layoutData) { + @Override + void setLayoutData(CellEditor.LayoutData layoutData) { fTableEditor.grabHorizontal = layoutData.grabHorizontal; fTableEditor.horizontalAlignment = layoutData.horizontalAlignment; fTableEditor.minimumWidth = layoutData.minimumWidth; } - void handleDoubleClickEvent() { + @Override + void handleDoubleClickEvent() { Viewer viewer = getViewer(); fireDoubleClick(new DoubleClickEvent(viewer, viewer.getSelection())); fireOpen(new OpenEvent(viewer, viewer.getSelection())); @@ -319,12 +344,13 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste }; } - protected ISelection newSelectionFromWidget() { + @Override + protected ISelection newSelectionFromWidget() { Control control = getControl(); if (control == null || control.isDisposed()) { return StructuredSelection.EMPTY; } - List list = getSelectionFromWidget(); + List<?> list = getSelectionFromWidget(); return new StructuredSelection(list); } @@ -361,8 +387,9 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste protected int indexForElement(Object element) { ViewerSorter sorter = getSorter(); - if (sorter == null) - return fTable.getItemCount(); + if (sorter == null) { + return fTable.getItemCount(); + } int count = fTable.getItemCount(); int min = 0, max = count - 1; while (min <= max) { @@ -381,56 +408,68 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste } return mid; } - if (compare < 0) - min = mid + 1; - else - max = mid - 1; + if (compare < 0) { + min = mid + 1; + } else { + max = mid - 1; + } } return min; } public void add(Object element) { - if (element != null) - add(new Object[] { element }); + if (element != null) { + add(new Object[] { element }); + } } public void add(Object[] elements) { if (elements == null || elements.length == 0) - return; // done + { + return; // done + } ((AsynchronousTableModel)getModel()).add(elements); } public void remove(Object element) { - if (element != null) - remove(new Object[] { element }); + if (element != null) { + remove(new Object[] { element }); + } } public void remove(final Object[] elements) { if (elements == null || elements.length == 0) - return; // done + { + return; // done + } ((AsynchronousTableModel)getModel()).remove(elements); } public void insert(Object element, int position) { - if (element != null) - insert(new Object[] { element }, position); + if (element != null) { + insert(new Object[] { element }, position); + } } public void insert(Object[] elements, int position) { - if (elements == null || elements.length == 0) - return; + if (elements == null || elements.length == 0) { + return; + } ((AsynchronousTableModel)getModel()).insert(elements, position); } public void replace(Object element, Object replacement) { if (element == null || replacement == null) - throw new IllegalArgumentException("unexpected null parameter"); //$NON-NLS-1$ + { + throw new IllegalArgumentException("unexpected null parameter"); //$NON-NLS-1$ + } ((AsynchronousTableModel)getModel()).replace(element, replacement); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousViewer#createModel() */ + @Override protected AsynchronousModel createModel() { return new AsynchronousTableModel(this); } @@ -438,7 +477,8 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousViewer#setItemCount(org.eclipse.swt.widgets.Widget, int) */ - protected void setItemCount(Widget parent, int itemCount) { + @Override + protected void setItemCount(Widget parent, int itemCount) { fTable.setItemCount(itemCount); } @@ -450,6 +490,7 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousViewer#createUpdatePolicy() */ + @Override public AbstractUpdatePolicy createUpdatePolicy() { return new TableUpdatePolicy(); } @@ -457,6 +498,7 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousViewer#getParentWidget(org.eclipse.swt.widgets.Widget) */ + @Override protected Widget getParentWidget(Widget widget) { if (widget instanceof TableItem) { return ((TableItem)widget).getParent(); @@ -467,6 +509,7 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousViewer#getChildWidget(org.eclipse.swt.widgets.Widget, int) */ + @Override protected Widget getChildWidget(Widget parent, int index) { if (index < fTable.getItemCount()) { return fTable.getItem(index); @@ -477,6 +520,7 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousViewer#clear(org.eclipse.swt.widgets.Widget) */ + @Override protected void clear(Widget item) { if (item instanceof TableItem) { int i = fTable.indexOf((TableItem)item); @@ -489,6 +533,7 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.AsynchronousViewer#clearChild(org.eclipse.swt.widgets.Widget, int) */ + @Override protected void clearChild(Widget parent, int childIndex) { if (parent instanceof Table) { fTable.clear(childIndex); @@ -498,6 +543,7 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.AsynchronousViewer#clearChildren(org.eclipse.swt.widgets.Widget) */ + @Override protected void clearChildren(Widget item) { if (item instanceof Table) { fTable.clearAll(); @@ -507,6 +553,7 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.AsynchronousViewer#indexOf(org.eclipse.swt.widgets.Widget, org.eclipse.swt.widgets.Widget) */ + @Override protected int indexOf(Widget parent, Widget child) { if (parent instanceof Table) { return ((Table)parent).indexOf((TableItem)child); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java index d81bc33a3..1f4b9d06d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -82,21 +82,21 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis * use the method <code>getImage(...)</code> to cache images for * image descriptors. The images are disposed when this viewer is disposed. */ - private Map fImageCache = new HashMap(); + private Map<ImageDescriptor, Image> fImageCache = new HashMap<ImageDescriptor, Image>(); /** * Cache of the fonts used for elements in this tree viewer. Label updates * use the method <code>getFont(...)</code> to cache fonts for * FontData objects. The fonts are disposed with the viewer. */ - private Map fFontCache = new HashMap(); + private Map<FontData, Font> fFontCache = new HashMap<FontData, Font>(); /** * Cache of the colors used for elements in this tree viewer. Label updates * use the method <code>getColor(...)</code> to cache colors for * RGB values. The colors are disposed with the viewer. */ - private Map fColorCache = new HashMap(); + private Map<RGB, Color> fColorCache = new HashMap<RGB, Color>(); /** * The context in which this viewer is being used - i.e. what part it is contained @@ -138,6 +138,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis * Hash lookup is required, don't let subclasses change behavior. * @param enable if hash lookup should be used in the viewer */ + @Override public final void setUseHashlookup(boolean enable) { Assert.isTrue(enable); super.setUseHashlookup(enable); @@ -146,6 +147,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#hookControl(org.eclipse.swt.widgets.Control) */ + @Override protected void hookControl(Control control) { super.hookControl(control); control.addListener(SWT.SetData, this); @@ -156,23 +158,15 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis * so it can perform cleanup. */ public synchronized void dispose() { - Iterator images = fImageCache.values().iterator(); - while (images.hasNext()) { - Image image = (Image) images.next(); + for (Image image : fImageCache.values()) { image.dispose(); } fImageCache.clear(); - - Iterator fonts = fFontCache.values().iterator(); - while (fonts.hasNext()) { - Font font = (Font) fonts.next(); + for (Font font : fFontCache.values()) { font.dispose(); } fFontCache.clear(); - - Iterator colors = fColorCache.values().iterator(); - while (colors.hasNext()) { - Color color = (Color) colors.next(); + for (Color color : fColorCache.values()) { color.dispose(); } fColorCache.clear(); @@ -228,6 +222,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#unmapAllElements() */ + @Override protected synchronized void unmapAllElements() { super.unmapAllElements(); AsynchronousModel model = getModel(); @@ -239,6 +234,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.Viewer#inputChanged(java.lang.Object, java.lang.Object) */ + @Override protected synchronized void inputChanged(Object input, Object oldInput) { fPendingSelection = null; if (fCurrentSelection != null) { @@ -306,7 +302,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis if (descriptor == null) { return null; } - Image image = (Image) fImageCache.get(descriptor); + Image image = fImageCache.get(descriptor); if (image == null) { image = new Image(getControl().getDisplay(), descriptor.getImageData()); fImageCache.put(descriptor, image); @@ -342,7 +338,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis if (fontData == null) { return null; } - Font font = (Font) fFontCache.get(fontData); + Font font = fFontCache.get(fontData); if (font == null) { font = new Font(getControl().getDisplay(), fontData); fFontCache.put(fontData, font); @@ -376,7 +372,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis if (rgb == null) { return null; } - Color color = (Color) fColorCache.get(rgb); + Color color = fColorCache.get(rgb); if (color == null) { color = new Color(getControl().getDisplay(), rgb); fColorCache.put(rgb, color); @@ -396,6 +392,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#doFindItem(java.lang.Object) */ + @Override protected Widget doFindItem(Object element) { // this viewer maps model nodes to widgets, so the element is a ModelNode AsynchronousModel model = getModel(); @@ -416,7 +413,8 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis * * @see org.eclipse.jface.viewers.StructuredViewer#doFindInputItem(java.lang.Object) */ - protected Widget doFindInputItem(Object element) { + @Override + protected Widget doFindInputItem(Object element) { if (element instanceof ModelNode) { ModelNode node = (ModelNode) element; if (node.getElement().equals(getInput())) { @@ -429,12 +427,14 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#doUpdateItem(org.eclipse.swt.widgets.Widget, java.lang.Object, boolean) */ + @Override protected void doUpdateItem(Widget item, Object element, boolean fullMap) { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#internalRefresh(java.lang.Object) */ + @Override protected void internalRefresh(Object element) { // get the nodes in the model AsynchronousModel model = getModel(); @@ -467,6 +467,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.Viewer#setSelection(org.eclipse.jface.viewers.ISelection, boolean) */ + @Override public synchronized void setSelection(ISelection selection, boolean reveal) { setSelection(selection, reveal, false); } @@ -497,6 +498,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis attemptSelection(reveal); } else { WorkbenchJob job = new WorkbenchJob("attemptSelection") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { attemptSelection(reveal); return Status.OK_STATUS; @@ -531,6 +533,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#getSelection() */ + @Override public ISelection getSelection() { Control control = getControl(); if (control == null || control.isDisposed() || fCurrentSelection == null) { @@ -542,6 +545,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#handleSelect(org.eclipse.swt.events.SelectionEvent) */ + @Override protected void handleSelect(SelectionEvent event) { // handle case where an earlier selection listener disposed the control. Control control = getControl(); @@ -553,6 +557,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#handlePostSelect(org.eclipse.swt.events.SelectionEvent) */ + @Override protected void handlePostSelect(SelectionEvent e) { SelectionChangedEvent event = new SelectionChangedEvent(this, newSelectionFromWidget()); firePostSelectionChanged(event); @@ -591,6 +596,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(org.eclipse.jface.viewers.ISelection, boolean) */ + @Override final protected void setSelectionToWidget(ISelection selection, final boolean reveal) { // NOT USED throw new IllegalArgumentException("This method should not be called"); //$NON-NLS-1$ @@ -599,6 +605,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List, boolean) */ + @Override final protected void setSelectionToWidget(List l, boolean reveal) { // NOT USED throw new IllegalArgumentException("This method should not be called"); //$NON-NLS-1$ @@ -676,12 +683,15 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis * A content provider that does nothing. */ private class NullContentProvider implements IStructuredContentProvider { + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public Object[] getElements(Object inputElement) { return null; } @@ -701,6 +711,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#preservingSelection(java.lang.Runnable) */ + @Override protected synchronized void preservingSelection(Runnable updateCode) { if (fPendingSelection == null || fPendingSelection.isEmpty()) { ISelection oldSelection = null; @@ -720,6 +731,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis } } else { WorkbenchJob job = new WorkbenchJob("attemptSelection") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { synchronized (AsynchronousViewer.this) { if (!getControl().isDisposed()) { @@ -779,7 +791,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis } if (selection instanceof IStructuredSelection) { IStructuredSelection ss = (IStructuredSelection) selection; - Iterator iterator = ss.iterator(); + Iterator<?> iterator = ss.iterator(); while (iterator.hasNext()) { Object element = iterator.next(); if (getModel().getNodes(element) == null) { @@ -819,6 +831,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /* (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#updateSelection(org.eclipse.jface.viewers.ISelection) */ + @Override protected synchronized void updateSelection(ISelection selection) { fCurrentSelection = selection; super.updateSelection(selection); @@ -1041,6 +1054,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis * * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ + @Override public void handleEvent(final Event event) { update((Item)event.item, event.index); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java index 6050992fb..6dd261a1f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -32,7 +32,7 @@ class ChildrenRequestMonitor extends AsynchronousRequestMonitor implements IChil /** * Collection of children retrieved */ - private List fChildren = new ArrayList(); + private List<Object> fChildren = new ArrayList<Object>(); /** * Constucts a monitor to retrieve and update the children of the given @@ -48,7 +48,8 @@ class ChildrenRequestMonitor extends AsynchronousRequestMonitor implements IChil /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.IChildrenRequestMonitor#addChild(java.lang.Object) */ - public void addChild(Object child) { + @Override + public void addChild(Object child) { synchronized (fChildren) { fChildren.add(child); } @@ -59,7 +60,8 @@ class ChildrenRequestMonitor extends AsynchronousRequestMonitor implements IChil /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.IChildrenRequestMonitor#addChildren(java.lang.Object[]) */ - public void addChildren(Object[] children) { + @Override + public void addChildren(Object[] children) { synchronized (fChildren) { for (int i = 0; i < children.length; i++) { fChildren.add(children[i]); @@ -72,20 +74,22 @@ class ChildrenRequestMonitor extends AsynchronousRequestMonitor implements IChil /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#contains(org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor) */ - protected boolean contains(AsynchronousRequestMonitor update) { + @Override + protected boolean contains(AsynchronousRequestMonitor update) { return (update instanceof ChildrenRequestMonitor) && contains(update.getNode()); } /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#performUpdate() */ - protected void performUpdate() { + @Override + protected void performUpdate() { synchronized (fChildren) { if (fFirstUpdate) { getModel().setChildren(getNode(), fChildren); fFirstUpdate = false; } else { - for (Iterator iter = fChildren.iterator(); iter.hasNext();) { + for (Iterator<Object> iter = fChildren.iterator(); iter.hasNext();) { Object child = iter.next(); getModel().add(getNode(), child); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/FindElementDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/FindElementDialog.java index 4ef42ab5b..dd0d444fc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/FindElementDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/FindElementDialog.java @@ -42,6 +42,7 @@ public class FindElementDialog extends ElementListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.ui.dialogs.ElementListSelectionDialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Control comp = super.createDialogArea(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IDebugHelpContextIds.FIND_ELEMENT_DIALOG); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelRequestMonitor.java index 152a33248..9785246aa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelRequestMonitor.java @@ -65,6 +65,7 @@ class LabelRequestMonitor extends AsynchronousRequestMonitor implements ILabelRe * * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#performUpdate() */ + @Override protected void performUpdate() { AsynchronousViewer viewer = getModel().getViewer(); Widget widget = viewer.findItem(getNode()); @@ -80,6 +81,7 @@ class LabelRequestMonitor extends AsynchronousRequestMonitor implements ILabelRe * * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#contains(org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor) */ + @Override protected boolean contains(AsynchronousRequestMonitor update) { return update instanceof LabelRequestMonitor && update.getNode() == getNode(); } @@ -89,6 +91,7 @@ class LabelRequestMonitor extends AsynchronousRequestMonitor implements ILabelRe * * @see org.eclipse.debug.ui.viewers.ILabelRequestMonitor#setLabel(java.lang.String) */ + @Override public void setLabels(String[] text) { fLabels = text; } @@ -98,6 +101,7 @@ class LabelRequestMonitor extends AsynchronousRequestMonitor implements ILabelRe * * @see org.eclipse.debug.ui.viewers.ILabelRequestMonitor#setFontData(org.eclipse.swt.graphics.FontData) */ + @Override public void setFontDatas(FontData[] fontData) { fFontDatas = fontData; } @@ -107,6 +111,7 @@ class LabelRequestMonitor extends AsynchronousRequestMonitor implements ILabelRe * * @see org.eclipse.debug.ui.viewers.ILabelRequestMonitor#setImageDescriptor(org.eclipse.jface.resource.ImageDescriptor) */ + @Override public void setImageDescriptors(ImageDescriptor[] image) { fImageDescriptors = image; } @@ -116,6 +121,7 @@ class LabelRequestMonitor extends AsynchronousRequestMonitor implements ILabelRe * * @see org.eclipse.debug.ui.viewers.ILabelRequestMonitor#setForeground(org.eclipse.swt.graphics.RGB) */ + @Override public void setForegrounds(RGB[] foreground) { fForegrounds = foreground; } @@ -125,6 +131,7 @@ class LabelRequestMonitor extends AsynchronousRequestMonitor implements ILabelRe * * @see org.eclipse.debug.ui.viewers.ILabelRequestMonitor#setBackground(org.eclipse.swt.graphics.RGB) */ + @Override public void setBackgrounds(RGB[] background) { fBackgrounds = background; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelResult.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelResult.java index 2e04a1af8..2896d964e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelResult.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelResult.java @@ -24,10 +24,12 @@ class LabelResult extends LabelRequestMonitor implements ILabelResult { super(node, model); } + @Override protected synchronized void scheduleViewerUpdate(long ms) { notifyAll(); } + @Override public synchronized boolean isDone() { return super.isDone(); } @@ -35,6 +37,7 @@ class LabelResult extends LabelRequestMonitor implements ILabelResult { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.ILabelResult#getElement() */ + @Override public Object getElement() { return getNode().getElement(); } @@ -42,6 +45,7 @@ class LabelResult extends LabelRequestMonitor implements ILabelResult { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.ILabelResult#getImages() */ + @Override public Image[] getImages() { return getModel().getViewer().getImages(getImageDescriptors()); } @@ -49,6 +53,7 @@ class LabelResult extends LabelRequestMonitor implements ILabelResult { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.ILabelResult#getLabels() */ + @Override public String[] getLabels() { return super.getLabels(); } @@ -56,6 +61,7 @@ class LabelResult extends LabelRequestMonitor implements ILabelResult { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.ILabelResult#getTreePath() */ + @Override public TreePath getTreePath() { return getNode().getTreePath(); } @@ -63,6 +69,7 @@ class LabelResult extends LabelRequestMonitor implements ILabelResult { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.ILabelResult#getDepth() */ + @Override public int getDepth() { int level = 0; ModelNode node = getNode().getParentNode(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java index ee2eddeff..bfd3492e9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -93,7 +93,7 @@ public class ModelNode { * @return */ public synchronized TreePath getTreePath() { - List path = new ArrayList(); + List<Object> path = new ArrayList<Object>(); ModelNode node = this; while (node != null) { path.add(0, node.getElement()); @@ -194,7 +194,8 @@ public class ModelNode { fIsContainer = container; } - public String toString() { + @Override + public String toString() { StringBuffer buf = new StringBuffer(); if (isDisposed()) { buf.append("[DISPOSED] "); //$NON-NLS-1$ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/PartPresentationContext.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/PartPresentationContext.java index 4adec277b..7474a58bb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/PartPresentationContext.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/PartPresentationContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,6 +19,7 @@ import org.eclipse.ui.IWorkbenchPart; * @since 3.3 * @deprecated getPart() is now supported by IPresentationContext itself. */ +@Deprecated public class PartPresentationContext extends PresentationContext { /** @@ -30,6 +31,7 @@ public class PartPresentationContext extends PresentationContext { super(part); } + @Override public IWorkbenchPart getPart() { return super.getPart(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableAddRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableAddRequestMonitor.java index 360186c45..5cff2a94a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableAddRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableAddRequestMonitor.java @@ -31,6 +31,7 @@ public class TableAddRequestMonitor extends AsynchronousRequestMonitor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousRequestMonitor#performUpdate() */ + @Override protected void performUpdate() { ((AsynchronousTableModel)getModel()).added(fElements); } @@ -38,6 +39,7 @@ public class TableAddRequestMonitor extends AsynchronousRequestMonitor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousRequestMonitor#contains(org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousRequestMonitor) */ + @Override protected boolean contains(AsynchronousRequestMonitor update) { return false; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableEditorImpl.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableEditorImpl.java index e4fda98fc..c592b5f90 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableEditorImpl.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableEditorImpl.java @@ -85,6 +85,7 @@ public abstract class TableEditorImpl { fCellEditor.setFocus(); if (fFocusListener == null) { fFocusListener = new FocusAdapter() { + @Override public void focusLost(FocusEvent e) { applyEditorValue(); } @@ -92,6 +93,7 @@ public abstract class TableEditorImpl { } control.addFocusListener(fFocusListener); fMouseListener = new MouseAdapter() { + @Override public void mouseDown(MouseEvent e) { // time wrap? // check for expiration of doubleClickTime @@ -276,14 +278,17 @@ public abstract class TableEditorImpl { private void initCellEditorListener() { fCellEditorListener = new ICellEditorListener() { + @Override public void editorValueChanged(boolean oldValidState, boolean newValidState) { // Ignore. } + @Override public void cancelEditor() { TableEditorImpl.this.cancelEditing(); } + @Override public void applyEditorValue() { TableEditorImpl.this.applyEditorValue(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableInsertRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableInsertRequestMonitor.java index 57f15cdd4..e7837550f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableInsertRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableInsertRequestMonitor.java @@ -31,6 +31,7 @@ public class TableInsertRequestMonitor extends TableAddRequestMonitor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousRequestMonitor#performUpdate() */ + @Override protected void performUpdate() { ((AsynchronousTableModel)getModel()).inserted(fElements, fIndex); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableRemoveRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableRemoveRequestMonitor.java index 421ade779..05ed29031 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableRemoveRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableRemoveRequestMonitor.java @@ -29,6 +29,7 @@ public class TableRemoveRequestMonitor extends TableAddRequestMonitor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousRequestMonitor#performUpdate() */ + @Override protected void performUpdate() { ((AsynchronousTableModel)getModel()).removed(fElements); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableReplaceRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableReplaceRequestMonitor.java index ca66b8696..074822a03 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableReplaceRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableReplaceRequestMonitor.java @@ -33,6 +33,7 @@ public class TableReplaceRequestMonitor extends AsynchronousRequestMonitor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousRequestMonitor#performUpdate() */ + @Override protected void performUpdate() { ((AsynchronousTableModel)getModel()).replaced(fOriginal, fReplacement); } @@ -40,6 +41,7 @@ public class TableReplaceRequestMonitor extends AsynchronousRequestMonitor { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousRequestMonitor#contains(org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousRequestMonitor) */ + @Override protected boolean contains(AsynchronousRequestMonitor update) { return false; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableUpdatePolicy.java index b3f176362..44d4eb32f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableUpdatePolicy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableUpdatePolicy.java @@ -22,7 +22,8 @@ import org.eclipse.jface.viewers.StructuredSelection; */ public class TableUpdatePolicy extends org.eclipse.debug.internal.ui.viewers.AbstractUpdatePolicy implements IModelChangedListener { - public void modelChanged(IModelDelta delta, IModelProxy proxy) { + @Override + public void modelChanged(IModelDelta delta, IModelProxy proxy) { updateNodes(new IModelDelta[] {delta}); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/AbstractBreadcrumb.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/AbstractBreadcrumb.java index 6d518b21f..58dc2e865 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/AbstractBreadcrumb.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/AbstractBreadcrumb.java @@ -167,6 +167,7 @@ public abstract class AbstractBreadcrumb { fComposite.setLayout(gridLayout); fDisplayFocusListener= new Listener() { + @Override public void handleEvent(Event event) { if (fComposite.isDisposed()) return; @@ -188,6 +189,7 @@ public abstract class AbstractBreadcrumb { fBreadcrumbViewer= createViewer(fComposite); fBreadcrumbViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { Object element= ((IStructuredSelection) event.getSelection()).getFirstElement(); if (element == null) @@ -201,6 +203,7 @@ public abstract class AbstractBreadcrumb { }); fBreadcrumbViewer.addOpenListener(new IOpenListener() { + @Override public void open(OpenEvent event) { doOpen(event.getSelection()); } @@ -264,6 +267,7 @@ public abstract class AbstractBreadcrumb { deinstallDisplayListeners(); fDisplayKeyListener= new Listener() { + @Override public void handleEvent(Event event) { if (event.keyCode != SWT.ESC) return; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItem.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItem.java index d70e7aa92..2a7d9d672 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItem.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItem.java @@ -83,6 +83,7 @@ class BreadcrumbItem extends Item { /* * @see org.eclipse.swt.widgets.Widget#dispose() */ + @Override public void dispose() { fContainer.dispose(); super.dispose(); @@ -207,6 +208,7 @@ class BreadcrumbItem extends Item { /* * @see org.eclipse.swt.widgets.Item#setText(java.lang.String) */ + @Override public void setText(String string) { super.setText(string); fDetailsBlock.setText(string); @@ -219,6 +221,7 @@ class BreadcrumbItem extends Item { /* * @see org.eclipse.swt.widgets.Item#setImage(org.eclipse.swt.graphics.Image) */ + @Override public void setImage(Image image) { super.setImage(image); fDetailsBlock.setImage(image); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDetails.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDetails.java index 8aa09ca1e..6482c4ac2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDetails.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDetails.java @@ -76,6 +76,7 @@ class BreadcrumbItemDetails { layout.marginWidth= 2; fImageComposite.setLayout(layout); fImageComposite.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { if (fHasFocus && !isTextVisible()) { e.gc.drawFocus(e.x, e.y, e.width, e.height); @@ -98,6 +99,7 @@ class BreadcrumbItemDetails { fTextComposite.setLayout(layout); addElementListener(fTextComposite); fTextComposite.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { if (fHasFocus && isTextVisible()) { e.gc.drawFocus(e.x, e.y, e.width, e.height); @@ -114,11 +116,13 @@ class BreadcrumbItemDetails { addElementListener(fElementText); fTextComposite.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result= fElementText.getText(); } }); fImageComposite.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result= fElementText.getText(); } @@ -295,6 +299,7 @@ class BreadcrumbItemDetails { */ private void installFocusComposite(Composite composite) { composite.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (e.detail == SWT.TRAVERSE_TAB_NEXT || e.detail == SWT.TRAVERSE_TAB_PREVIOUS) { int index= fParent.getViewer().getIndexOfItem(fParent); @@ -313,6 +318,7 @@ class BreadcrumbItemDetails { } }); composite.addKeyListener(new KeyListener() { + @Override public void keyPressed(KeyEvent e) { BreadcrumbViewer viewer= fParent.getViewer(); @@ -369,11 +375,13 @@ class BreadcrumbItemDetails { shell.setFocus(); } + @Override public void keyReleased(KeyEvent e) { } }); composite.addFocusListener(new FocusListener() { + @Override public void focusGained(FocusEvent e) { if (!fHasFocus) { fHasFocus= true; @@ -381,6 +389,7 @@ class BreadcrumbItemDetails { } } + @Override public void focusLost(FocusEvent e) { if (fHasFocus) { fHasFocus= false; @@ -397,9 +406,11 @@ class BreadcrumbItemDetails { */ private void addElementListener(Control control) { control.addMouseListener(new MouseListener() { + @Override public void mouseDoubleClick(MouseEvent e) { } + @Override public void mouseDown(MouseEvent e) { BreadcrumbViewer viewer= fParent.getViewer(); Shell shell= fParent.getDropDownShell(); @@ -409,10 +420,12 @@ class BreadcrumbItemDetails { } } + @Override public void mouseUp(MouseEvent e) { } }); control.addMenuDetectListener(new MenuDetectListener() { + @Override public void menuDetected(MenuDetectEvent e) { BreadcrumbViewer viewer= fParent.getViewer(); viewer.selectItem(fParent); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDropDown.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDropDown.java index 25779b586..84f9f1de0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDropDown.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDropDown.java @@ -80,6 +80,7 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { /* * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int) */ + @Override protected void drawCompositeImage(int width, int height) { Display display= fParentComposite.getDisplay(); @@ -133,6 +134,7 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { /* * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize() */ + @Override protected Point getSize() { return new Point(10, 16); } @@ -180,13 +182,15 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { fToolBar= new ToolBar(composite, SWT.FLAT); fToolBar.setLayoutData(new GridData(SWT.END, SWT.CENTER, false, false)); fToolBar.getAccessible().addAccessibleListener(new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result= BreadcrumbMessages.BreadcrumbItemDropDown_showDropDownMenu_action_toolTip; } }); ToolBarManager manager= new ToolBarManager(fToolBar); final Action showDropDownMenuAction= new Action(null, SWT.NONE) { + @Override public void run() { Shell shell= fParent.getDropDownShell(); if (shell != null) @@ -210,6 +214,7 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { if (IS_MAC_WORKAROUND) { manager.getControl().addMouseListener(new MouseAdapter() { // see also BreadcrumbItemDetails#addElementListener(Control) + @Override public void mouseDown(MouseEvent e) { showDropDownMenuAction.run(); } @@ -280,7 +285,8 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { /* * @see org.eclipse.swt.events.ControlAdapter#controlResized(org.eclipse.swt.events.ControlEvent) */ - public void controlResized(ControlEvent e) { + @Override + public void controlResized(ControlEvent e) { if (fIsResizingProgrammatically) return; @@ -322,6 +328,7 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { */ private void installCloser(final Shell shell) { final Listener focusListener= new Listener() { + @Override public void handleEvent(Event event) { Widget focusElement= event.widget; boolean isFocusBreadcrumbTreeFocusWidget= focusElement == shell || focusElement instanceof Control && ((Control)focusElement).getShell() == shell; @@ -364,12 +371,14 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { display.addFilter(SWT.FocusOut, focusListener); final ControlListener controlListener= new ControlListener() { + @Override public void controlMoved(ControlEvent e) { if (!shell.isDisposed()) { shell.close(); } } + @Override public void controlResized(ControlEvent e) { if (!shell.isDisposed()) { shell.close(); @@ -379,6 +388,7 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { fToolBar.getShell().addControlListener(controlListener); shell.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (DebugUIPlugin.DEBUG_BREADCRUMB) { DebugUIPlugin.trace("==> shell disposed"); //$NON-NLS-1$ @@ -393,9 +403,11 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { } }); shell.addShellListener(new ShellListener() { + @Override public void shellActivated(ShellEvent e) { } + @Override public void shellClosed(ShellEvent e) { if (DebugUIPlugin.DEBUG_BREADCRUMB) { DebugUIPlugin.trace("==> shellClosed"); //$NON-NLS-1$ @@ -406,12 +418,15 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { fMenuIsShown= false; } + @Override public void shellDeactivated(ShellEvent e) { } + @Override public void shellDeiconified(ShellEvent e) { } + @Override public void shellIconified(ShellEvent e) { } }); @@ -607,17 +622,20 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { return (fParent.getViewer().getStyle() & SWT.BOTTOM) == 0; } - public void close() { + @Override + public void close() { if (fShell != null && !fShell.isDisposed()) { fShell.close(); } } - public void notifySelection(ISelection selection) { + @Override + public void notifySelection(ISelection selection) { fParent.getViewer().fireMenuSelection(selection); } - public void updateSize() { + @Override + public void updateSize() { if (fShell != null && !fShell.isDisposed()) { resizeShell(fShell); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java index d659b0bef..37d0fac29 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -70,7 +70,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { private final int fStyle; private final Composite fContainer; - private final ArrayList fBreadcrumbItems; + private final ArrayList<BreadcrumbItem> fBreadcrumbItems; private final ListenerList fMenuListeners; private Image fGradientBackground; @@ -93,13 +93,14 @@ public abstract class BreadcrumbViewer extends StructuredViewer { */ public BreadcrumbViewer(Composite parent, int style) { fStyle = style; - fBreadcrumbItems= new ArrayList(); + fBreadcrumbItems = new ArrayList<BreadcrumbItem>(); fMenuListeners= new ListenerList(); fContainer= new Composite(parent, SWT.NONE); GridData layoutData= new GridData(SWT.FILL, SWT.TOP, true, false); fContainer.setLayoutData(layoutData); fContainer.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { e.doit= true; } @@ -107,15 +108,17 @@ public abstract class BreadcrumbViewer extends StructuredViewer { fContainer.setBackgroundMode(SWT.INHERIT_DEFAULT); fContainer.addListener(SWT.Resize, new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { int height= fContainer.getClientArea().height; if (fGradientBackground == null || fGradientBackground.getBounds().height != height) { Image image= height == 0 ? null : createGradientImage(height, event.display); fContainer.setBackgroundImage(image); - if (fGradientBackground != null) - fGradientBackground.dispose(); + if (fGradientBackground != null) { + fGradientBackground.dispose(); + } fGradientBackground= image; } } @@ -136,6 +139,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { fContainer.setLayout(gridLayout); fContainer.addListener(SWT.Resize, new Listener() { + @Override public void handleEvent(Event event) { updateSize(); fContainer.layout(true, true); @@ -160,6 +164,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { /* * @see org.eclipse.jface.viewers.Viewer#getControl() */ + @Override public Control getControl() { return fContainer; } @@ -167,6 +172,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { /* * @see org.eclipse.jface.viewers.StructuredViewer#reveal(java.lang.Object) */ + @Override public void reveal(Object element) { //all elements are always visible } @@ -180,10 +186,11 @@ public abstract class BreadcrumbViewer extends StructuredViewer { if (fSelectedItem != null) { fSelectedItem.setFocus(true); } else { - if (fBreadcrumbItems.size() == 0) + if (fBreadcrumbItems.size() == 0) { return; + } - BreadcrumbItem item= (BreadcrumbItem) fBreadcrumbItems.get(fBreadcrumbItems.size() - 1); + BreadcrumbItem item= fBreadcrumbItems.get(fBreadcrumbItems.size() - 1); item.setFocus(true); } } @@ -193,9 +200,10 @@ public abstract class BreadcrumbViewer extends StructuredViewer { */ public boolean isDropDownOpen() { for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) { - BreadcrumbItem item= (BreadcrumbItem) fBreadcrumbItems.get(i); - if (item.isMenuShown()) + BreadcrumbItem item= fBreadcrumbItems.get(i); + if (item.isMenuShown()) { return true; + } } return false; @@ -209,9 +217,10 @@ public abstract class BreadcrumbViewer extends StructuredViewer { */ public Shell getDropDownShell() { for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) { - BreadcrumbItem item= (BreadcrumbItem) fBreadcrumbItems.get(i); - if (item.isMenuShown()) + BreadcrumbItem item= fBreadcrumbItems.get(i); + if (item.isMenuShown()) { return item.getDropDownShell(); + } } return null; @@ -240,6 +249,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { /* * @see org.eclipse.jface.viewers.StructuredViewer#assertContentProviderType(org.eclipse.jface.viewers.IContentProvider) */ + @Override protected void assertContentProviderType(IContentProvider provider) { super.assertContentProviderType(provider); Assert.isTrue(provider instanceof ITreePathContentProvider); @@ -248,14 +258,17 @@ public abstract class BreadcrumbViewer extends StructuredViewer { /* * @see org.eclipse.jface.viewers.Viewer#inputChanged(java.lang.Object, java.lang.Object) */ + @Override protected void inputChanged(final Object input, Object oldInput) { - if (fContainer.isDisposed()) + if (fContainer.isDisposed()) { return; + } disableRedraw(); try { preservingSelection(new Runnable() { - public void run() { + @Override + public void run() { buildItemChain(input); } }); @@ -267,12 +280,15 @@ public abstract class BreadcrumbViewer extends StructuredViewer { /* * @see org.eclipse.jface.viewers.StructuredViewer#doFindInputItem(java.lang.Object) */ + @Override protected Widget doFindInputItem(Object element) { - if (element == null) + if (element == null) { return null; + } - if (element == getInput() || element.equals(getInput())) + if (element == getInput() || element.equals(getInput())) { return doFindItem(element); + } return null; } @@ -280,14 +296,17 @@ public abstract class BreadcrumbViewer extends StructuredViewer { /* * @see org.eclipse.jface.viewers.StructuredViewer#doFindItem(java.lang.Object) */ + @Override protected Widget doFindItem(Object element) { - if (element == null) + if (element == null) { return null; + } for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) { - BreadcrumbItem item= (BreadcrumbItem) fBreadcrumbItems.get(i); - if (item.getData() == element || element.equals(item.getData())) + BreadcrumbItem item= fBreadcrumbItems.get(i); + if (item.getData() == element || element.equals(item.getData())) { return item; + } } return null; @@ -296,6 +315,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { /* * @see org.eclipse.jface.viewers.StructuredViewer#doUpdateItem(org.eclipse.swt.widgets.Widget, java.lang.Object, boolean) */ + @Override protected void doUpdateItem(Widget widget, Object element, boolean fullMap) { myDoUpdateItem(widget, element, fullMap); } @@ -326,7 +346,8 @@ public abstract class BreadcrumbViewer extends StructuredViewer { * ITreeSelection. * @return the current selection */ - public ISelection getSelection() { + @Override + public ISelection getSelection() { Control control = getControl(); if (control == null || control.isDisposed()) { return TreeSelection.EMPTY; @@ -341,9 +362,9 @@ public abstract class BreadcrumbViewer extends StructuredViewer { } protected TreePath getTreePathFromItem(BreadcrumbItem item) { - List elements = new ArrayList(fBreadcrumbItems.size()); + List<Object> elements = new ArrayList<Object>(fBreadcrumbItems.size()); for (int i = 0; i < fBreadcrumbItems.size(); i++) { - elements.add( ((BreadcrumbItem)fBreadcrumbItems.get(i)).getData() ); + elements.add( fBreadcrumbItems.get(i).getData() ); if (fBreadcrumbItems.get(i).equals(item)) { return new TreePath(elements.toArray()); } @@ -354,14 +375,17 @@ public abstract class BreadcrumbViewer extends StructuredViewer { /* * @see org.eclipse.jface.viewers.StructuredViewer#getSelectionFromWidget() */ + @Override protected List getSelectionFromWidget() { - if (fSelectedItem == null) + if (fSelectedItem == null) { return Collections.EMPTY_LIST; + } - if (fSelectedItem.getData() == null) + if (fSelectedItem.getData() == null) { return Collections.EMPTY_LIST; + } - ArrayList result= new ArrayList(); + ArrayList<Object> result = new ArrayList<Object>(); result.add(fSelectedItem.getData()); return result; } @@ -369,6 +393,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { /* * @see org.eclipse.jface.viewers.StructuredViewer#internalRefresh(java.lang.Object) */ + @Override protected void internalRefresh(Object element) { disableRedraw(); @@ -378,7 +403,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { BreadcrumbItem item= (BreadcrumbItem) doFindItem(element); if (item == null || element != null && element.equals(getInput())) { for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) { - BreadcrumbItem item1= (BreadcrumbItem) fBreadcrumbItems.get(i); + BreadcrumbItem item1= fBreadcrumbItems.get(i); layoutChanged = refreshItem(item1) || layoutChanged; } } else { @@ -397,14 +422,16 @@ public abstract class BreadcrumbViewer extends StructuredViewer { /* * @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List, boolean) */ + @Override protected void setSelectionToWidget(List l, boolean reveal) { BreadcrumbItem focusItem= null; // Unselect the currently selected items, and remember the focused item. for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) { - BreadcrumbItem item= (BreadcrumbItem) fBreadcrumbItems.get(i); - if (item.hasFocus()) + BreadcrumbItem item= fBreadcrumbItems.get(i); + if (item.hasFocus()) { focusItem= item; + } item.setSelected(false); } @@ -415,7 +442,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { // Set the new selection to items. fSelectedItem = null; - for (Iterator iterator= l.iterator(); iterator.hasNext();) { + for (Iterator<Object> iterator = l.iterator(); iterator.hasNext();) { Object element= iterator.next(); BreadcrumbItem item= (BreadcrumbItem) doFindItem(element); if (item != null) { @@ -440,8 +467,9 @@ public abstract class BreadcrumbViewer extends StructuredViewer { * @param item the item to select or <code>null</code> */ void selectItem(BreadcrumbItem item) { - if (fSelectedItem != null) + if (fSelectedItem != null) { fSelectedItem.setSelected(false); + } fSelectedItem= item; setSelectionToWidget(getSelection(), false); @@ -466,7 +494,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { * @return the item ad the given <code>index</code> */ BreadcrumbItem getItem(int index) { - return (BreadcrumbItem) fBreadcrumbItems.get(index); + return fBreadcrumbItems.get(index); } /** @@ -477,9 +505,10 @@ public abstract class BreadcrumbViewer extends StructuredViewer { */ int getIndexOfItem(BreadcrumbItem item) { for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) { - BreadcrumbItem pItem= (BreadcrumbItem) fBreadcrumbItems.get(i); - if (pItem == item) + BreadcrumbItem pItem= fBreadcrumbItems.get(i); + if (pItem == item) { return i; + } } return -1; @@ -527,27 +556,28 @@ public abstract class BreadcrumbViewer extends StructuredViewer { * one will be selected */ void doTraverse(boolean next) { - if (fSelectedItem == null) + if (fSelectedItem == null) { return; + } int index= fBreadcrumbItems.indexOf(fSelectedItem); if (next) { if (index == fBreadcrumbItems.size() - 1) { - BreadcrumbItem current= (BreadcrumbItem) fBreadcrumbItems.get(index); + BreadcrumbItem current= fBreadcrumbItems.get(index); current.openDropDownMenu(); current.getDropDownShell().setFocus(); } else { - BreadcrumbItem nextItem= (BreadcrumbItem) fBreadcrumbItems.get(index + 1); + BreadcrumbItem nextItem= fBreadcrumbItems.get(index + 1); selectItem(nextItem); } } else { if (index == 0) { - BreadcrumbItem root= (BreadcrumbItem) fBreadcrumbItems.get(index); + BreadcrumbItem root= fBreadcrumbItems.get(index); root.openDropDownMenu(); root.getDropDownShell().setFocus(); } else { - selectItem((BreadcrumbItem) fBreadcrumbItems.get(index - 1)); + selectItem(fBreadcrumbItems.get(index - 1)); } } } @@ -558,7 +588,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { */ private void buildItemChain(Object input) { if (fBreadcrumbItems.size() > 0) { - BreadcrumbItem last= (BreadcrumbItem) fBreadcrumbItems.get(fBreadcrumbItems.size() - 1); + BreadcrumbItem last= fBreadcrumbItems.get(fBreadcrumbItems.size() - 1); last.setIsLastItem(false); } @@ -592,21 +622,22 @@ public abstract class BreadcrumbViewer extends StructuredViewer { BreadcrumbItem last = null; if (index <= fBreadcrumbItems.size()) { - last = ((BreadcrumbItem)fBreadcrumbItems.get(index - 1)); + last = (fBreadcrumbItems.get(index - 1)); last.setIsLastItem(true); } while (index < fBreadcrumbItems.size()) { updateLayout = true; - BreadcrumbItem item= (BreadcrumbItem) fBreadcrumbItems.remove(fBreadcrumbItems.size() - 1); + BreadcrumbItem item= fBreadcrumbItems.remove(fBreadcrumbItems.size() - 1); if (item.hasFocus() && last != null) { last.setFocus(true); } if (item == fSelectedItem) { selectItem(null); } - if (item.getData() != null) + if (item.getData() != null) { unmapElement(item.getData()); + } item.dispose(); } @@ -653,7 +684,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { private boolean updateOrCreateItem(int index, TreePath path, Object element) { BreadcrumbItem item; if (fBreadcrumbItems.size() > index) { - item = (BreadcrumbItem)fBreadcrumbItems.get(index); + item = fBreadcrumbItems.get(index); if (item.getData() != null) { unmapElement(item.getData()); } @@ -692,7 +723,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { if (currentWidth > width) { int index= 0; while (currentWidth > width && index < fBreadcrumbItems.size() - 1) { - BreadcrumbItem viewer= (BreadcrumbItem) fBreadcrumbItems.get(index); + BreadcrumbItem viewer= fBreadcrumbItems.get(index); if (viewer.isShowText()) { viewer.setShowText(false); currentWidth= getCurrentWidth(); @@ -707,7 +738,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { int index= fBreadcrumbItems.size() - 1; while (currentWidth < width && index >= 0) { - BreadcrumbItem viewer= (BreadcrumbItem) fBreadcrumbItems.get(index); + BreadcrumbItem viewer= fBreadcrumbItems.get(index); if (!viewer.isShowText()) { viewer.setShowText(true); currentWidth= getCurrentWidth(); @@ -734,7 +765,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { private int getCurrentWidth() { int result= 0; for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) { - BreadcrumbItem viewer= (BreadcrumbItem) fBreadcrumbItems.get(i); + BreadcrumbItem viewer= fBreadcrumbItems.get(i); result+= viewer.getWidth(); } @@ -745,8 +776,9 @@ public abstract class BreadcrumbViewer extends StructuredViewer { * Enables redrawing of the breadcrumb. */ private void enableRedraw() { - if (IS_GTK) //flickers on GTK + if (IS_GTK) { return; + } fContainer.setRedraw(true); } @@ -759,8 +791,9 @@ public abstract class BreadcrumbViewer extends StructuredViewer { * </p> */ private void disableRedraw() { - if (IS_GTK) //flickers on GTK + if (IS_GTK) { return; + } fContainer.setRedraw(false); } @@ -871,6 +904,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { * * @since 3.7 */ + @Override protected void handleDispose(DisposeEvent event) { if (fGradientBackground != null) { fGradientBackground.dispose(); @@ -878,14 +912,11 @@ public abstract class BreadcrumbViewer extends StructuredViewer { } if (fBreadcrumbItems != null) { - Iterator iterator= fBreadcrumbItems.iterator(); - while (iterator.hasNext()) { - BreadcrumbItem item= (BreadcrumbItem)iterator.next(); + for (BreadcrumbItem item : fBreadcrumbItems) { item.dispose(); } } super.handleDispose(event); } - } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/TreeViewerDropDown.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/TreeViewerDropDown.java index ddd13cd96..365c5a400 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/TreeViewerDropDown.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/TreeViewerDropDown.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -84,7 +84,8 @@ public abstract class TreeViewerDropDown { fDropDownViewer= createTreeViewer(composite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL, path); fDropDownViewer.addOpenListener(new IOpenListener() { - public void open(OpenEvent event) { + @Override + public void open(OpenEvent event) { if (DebugUIPlugin.DEBUG_TREE_VIEWER_DROPDOWN) { DebugUIPlugin.trace("BreadcrumbItemDropDown.showMenu()$treeViewer>open"); //$NON-NLS-1$ } @@ -95,24 +96,30 @@ public abstract class TreeViewerDropDown { final Tree tree = fDropDownViewer.getTree(); tree.addMouseListener(new MouseListener() { - public void mouseUp(MouseEvent e) { + @Override + public void mouseUp(MouseEvent e) { if (DebugUIPlugin.DEBUG_TREE_VIEWER_DROPDOWN) { DebugUIPlugin.trace("BreadcrumbItemDropDown.showMenu()$treeViewer>mouseUp"); //$NON-NLS-1$ } - if (e.button != 1) - return; + if (e.button != 1) { + return; + } - if ((OpenStrategy.getOpenMethod() & OpenStrategy.SINGLE_CLICK) != 0) - return; + if ((OpenStrategy.getOpenMethod() & OpenStrategy.SINGLE_CLICK) != 0) { + return; + } TreeItem item= tree.getItem(new Point(e.x, e.y)); - if (item == null) - return; + if (item == null) { + return; + } - List pathElements = new LinkedList(); + List<Object> pathElements = new LinkedList<Object>(); while(item != null) { Object data = item.getData(); - if (data == null) return; + if (data == null) { + return; + } pathElements.add(0, data); item = item.getParentItem(); } @@ -120,10 +127,12 @@ public abstract class TreeViewerDropDown { openElement(new TreeSelection(new TreePath(pathElements.toArray()))); } - public void mouseDown(MouseEvent e) { + @Override + public void mouseDown(MouseEvent e) { } - public void mouseDoubleClick(MouseEvent e) { + @Override + public void mouseDoubleClick(MouseEvent e) { } }); @@ -131,7 +140,8 @@ public abstract class TreeViewerDropDown { TreeItem fLastItem= null; long fLastScrollTime = 0; - public void mouseMove(MouseEvent e) { + @Override + public void mouseMove(MouseEvent e) { if (tree.equals(e.getSource())) { Object o= tree.getItem(new Point(e.x, e.y)); if (fLastItem == null ^ o == null) { @@ -149,8 +159,9 @@ public abstract class TreeViewerDropDown { // Scroll up if (currentItem.getParentItem() == null) { int index= tree.indexOf((TreeItem) o); - if (index < 1) - return; + if (index < 1) { + return; + } fLastItem= tree.getItem(index - 1); tree.setSelection(new TreeItem[] { fLastItem }); @@ -167,8 +178,9 @@ public abstract class TreeViewerDropDown { // Scroll down if (currentItem.getParentItem() == null) { int index= tree.indexOf((TreeItem) o); - if (index >= tree.getItemCount() - 1) - return; + if (index >= tree.getItemCount() - 1) { + return; + } fLastItem= tree.getItem(index + 1); tree.setSelection(new TreeItem[] { fLastItem }); @@ -191,7 +203,8 @@ public abstract class TreeViewerDropDown { }); tree.addKeyListener(new KeyListener() { - public void keyPressed(KeyEvent e) { + @Override + public void keyPressed(KeyEvent e) { if (e.keyCode == SWT.ARROW_UP) { // No elements in the tree (bug 262961). if (tree.getItemCount() == 0) { @@ -200,30 +213,36 @@ public abstract class TreeViewerDropDown { } TreeItem[] selection= tree.getSelection(); - if (selection.length != 1) - return; + if (selection.length != 1) { + return; + } int selectionIndex= tree.indexOf(selection[0]); - if (selectionIndex != 0) - return; + if (selectionIndex != 0) { + return; + } fDropDownSite.close(); } } - public void keyReleased(KeyEvent e) { + @Override + public void keyReleased(KeyEvent e) { } }); fDropDownViewer.addTreeListener(new ITreeViewerListener() { - public void treeCollapsed(TreeExpansionEvent event) { + @Override + public void treeCollapsed(TreeExpansionEvent event) { } - public void treeExpanded(TreeExpansionEvent event) { + @Override + public void treeExpanded(TreeExpansionEvent event) { tree.setRedraw(false); new UIJob(tree.getDisplay(), IInternalDebugCoreConstants.EMPTY_STRING) { { setSystem(true); } - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { if (!tree.isDisposed()) { try { fDropDownSite.updateSize(); @@ -260,8 +279,9 @@ public abstract class TreeViewerDropDown { * @param selection The selection to open. */ protected void openElement(ISelection selection) { - if (selection == null || !(selection instanceof ITreeSelection) || selection.isEmpty()) - return; + if (selection == null || !(selection instanceof ITreeSelection) || selection.isEmpty()) { + return; + } // This might or might not open an editor fDropDownSite.notifySelection(selection); @@ -276,8 +296,9 @@ public abstract class TreeViewerDropDown { DebugUIPlugin.trace(" tree hasFocus: " + treeHasFocus); //$NON-NLS-1$ } - if (tree.isDisposed()) - return; + if (tree.isDisposed()) { + return; + } if (!treeHasFocus) { fDropDownSite.close(); @@ -289,9 +310,9 @@ public abstract class TreeViewerDropDown { private void toggleExpansionState(TreePath path) { Tree tree= fDropDownViewer.getTree(); - if (fDropDownViewer.getExpandedState(path)) - fDropDownViewer.collapseToLevel(path, 1); - else { + if (fDropDownViewer.getExpandedState(path)) { + fDropDownViewer.collapseToLevel(path, 1); + } else { tree.setRedraw(false); try { fDropDownViewer.expandToLevel(path, 1); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java index eace53efe..4b1cf136e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU * Other child count updates for the same content provider. Coalesced requests are * batched together into an array. */ - private List fBatchedRequests = null; + private List<ViewerUpdateMonitor> fBatchedRequests = null; /** * Flag whether filtering is enabled in viewer. If filtering is enabled, then a @@ -68,6 +68,7 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU fFilteredChildren = provider.getFilteredChildren(elementPath); } + @Override public synchronized void cancel() { if (fChildrenUpdate != null) { fChildrenUpdate.cancel(); @@ -75,6 +76,7 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU super.cancel(); } + @Override protected synchronized void scheduleViewerUpdate() { // If filtering is enabled perform child update on all children in order to update // viewer filters. @@ -92,14 +94,17 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU } fChildrenUpdate = new ChildrenUpdate(getContentProvider(), getViewerInput(), getElementPath(), getElement(), startIdx, count, getElementContentProvider()) { - protected void performUpdate() { + @Override + protected void performUpdate() { performUpdate(true); ChildrenCountUpdate.super.scheduleViewerUpdate(); } - protected void scheduleViewerUpdate() { + @Override + protected void scheduleViewerUpdate() { execInDisplayThread(new Runnable() { - public void run() { + @Override + public void run() { if (!getContentProvider().isDisposed() && !isCanceled()) { performUpdate(); } @@ -108,7 +113,8 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU } }; execInDisplayThread(new Runnable() { - public void run() { + @Override + public void run() { fChildrenUpdate.startRequest(); } }); @@ -123,6 +129,7 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.ViewerUpdateMonitor#performUpdate() */ + @Override protected void performUpdate() { int viewCount = fCount; TreePath elementPath = getElementPath(); @@ -145,10 +152,12 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU getContentProvider().getStateTracker().restorePendingStateOnUpdate(getElementPath(), -1, true, true, false); } + @Override public void setChildCount(int numChildren) { fCount = numChildren; } + @Override public String toString() { StringBuffer buf = new StringBuffer(); buf.append("IChildrenCountUpdate: "); //$NON-NLS-1$ @@ -159,6 +168,7 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#coalesce(org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor) */ + @Override boolean coalesce(ViewerUpdateMonitor request) { if (request instanceof ChildrenCountUpdate) { if (getElementPath().equals(request.getElementPath())) { @@ -166,7 +176,7 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU return true; } else if (getElementContentProvider().equals(request.getElementContentProvider())) { if (fBatchedRequests == null) { - fBatchedRequests = new ArrayList(4); + fBatchedRequests = new ArrayList<ViewerUpdateMonitor>(4); fBatchedRequests.add(this); } fBatchedRequests.add(request); @@ -179,11 +189,12 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#startRequest() */ + @Override void startRequest() { if (fBatchedRequests == null) { getElementContentProvider().update(new IChildrenCountUpdate[]{this}); } else { - IChildrenCountUpdate[] updates = (IChildrenCountUpdate[]) fBatchedRequests.toArray(new IChildrenCountUpdate[fBatchedRequests.size()]); + IChildrenCountUpdate[] updates = fBatchedRequests.toArray(new IChildrenCountUpdate[fBatchedRequests.size()]); // notify that the other updates have also started to ensure correct sequence // of model updates - **** start at index 1 since the first (0) update has // already notified the content provider that it has started. @@ -194,12 +205,13 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU } } + @Override boolean containsUpdate(TreePath path) { if (getElementPath().equals(path)) { return true; } else if (fBatchedRequests != null) { for (int i = 0; i < fBatchedRequests.size(); i++) { - if (((ViewerUpdateMonitor)fBatchedRequests.get(i)).getElementPath().equals(path)) { + if (fBatchedRequests.get(i).getElementPath().equals(path)) { return true; } } @@ -210,6 +222,7 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#getPriority() */ + @Override int getPriority() { return 2; } @@ -217,6 +230,7 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#getSchedulingPath() */ + @Override TreePath getSchedulingPath() { TreePath path = getElementPath(); if (path.getSegmentCount() > 0) { @@ -229,14 +243,16 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU return fCount; } - protected boolean doEquals(ViewerUpdateMonitor update) { + @Override + protected boolean doEquals(ViewerUpdateMonitor update) { return update instanceof ChildrenCountUpdate && getViewerInput().equals(update.getViewerInput()) && getElementPath().equals(update.getElementPath()); } - protected int doHashCode() { + @Override + protected int doHashCode() { return getClass().hashCode() + getViewerInput().hashCode() + getElementPath().hashCode(); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenUpdate.java index 0020eaf7d..db71f4c80 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenUpdate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenUpdate.java @@ -109,6 +109,7 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda * * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#performUpdate() */ + @Override protected void performUpdate() { performUpdate(false); } @@ -116,6 +117,7 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate#setChild(java.lang.Object, int) */ + @Override public void setChild(Object child, int index) { if (fElements == null) { fElements = new Object[fLength]; @@ -129,6 +131,7 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda * * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#coalesce(org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor) */ + @Override public synchronized boolean coalesce(ViewerUpdateMonitor request) { if (request instanceof ChildrenUpdate) { ChildrenUpdate cu = (ChildrenUpdate) request; @@ -151,6 +154,7 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda return false; } + @Override boolean containsUpdate(TreePath path) { return getElementPath().equals(path); } @@ -160,6 +164,7 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate#getLength() */ + @Override public int getLength() { return fLength; } @@ -167,6 +172,7 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate#getOffset() */ + @Override public int getOffset() { return fIndex; } @@ -174,10 +180,12 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#startRequest() */ + @Override void startRequest() { getElementContentProvider().update(new IChildrenUpdate[]{this}); } + @Override public String toString() { StringBuffer buf = new StringBuffer(); buf.append("IChildrenUpdate: "); //$NON-NLS-1$ @@ -193,6 +201,7 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#getPriority() */ + @Override int getPriority() { return 3; } @@ -200,6 +209,7 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#getSchedulingPath() */ + @Override TreePath getSchedulingPath() { return getElementPath(); } @@ -218,7 +228,8 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda return fElements; } - protected boolean doEquals(ViewerUpdateMonitor update) { + @Override + protected boolean doEquals(ViewerUpdateMonitor update) { return update instanceof ChildrenUpdate && ((ChildrenUpdate)update).getOffset() == getOffset() && @@ -227,7 +238,8 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda getElementPath().equals(update.getElementPath()); } - protected int doHashCode() { + @Override + protected int doHashCode() { return (int)Math.pow( (getClass().hashCode() + getViewerInput().hashCode() + getElementPath().hashCode()) * (getOffset() + 2), getLength() + 2); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementCompareRequest.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementCompareRequest.java index ee9922504..592b73664 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementCompareRequest.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementCompareRequest.java @@ -60,6 +60,7 @@ public class ElementCompareRequest extends MementoUpdate implements IElementComp /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest#setEqual(boolean) */ + @Override public void setEqual(boolean equal) { fEqual = equal; } @@ -67,6 +68,7 @@ public class ElementCompareRequest extends MementoUpdate implements IElementComp /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#done() */ + @Override public void done() { ITreeModelViewer viewer = getContentProvider().getViewer(); if (viewer == null) return; // disposed @@ -74,7 +76,8 @@ public class ElementCompareRequest extends MementoUpdate implements IElementComp fProvider.getStateTracker().compareFinished(ElementCompareRequest.this, fDelta); } else { viewer.getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { if (getContentProvider().isDisposed()) return; fProvider.getStateTracker().compareFinished(ElementCompareRequest.this, fDelta); } @@ -119,7 +122,8 @@ public class ElementCompareRequest extends MementoUpdate implements IElementComp return fCheckChildrenRealized; } - public String toString() { + @Override + public String toString() { StringBuffer buf = new StringBuffer(); buf.append("IElementCompareRequest: "); //$NON-NLS-1$ buf.append(getElement()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementMementoRequest.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementMementoRequest.java index 1a706ce9c..6351fc3a4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementMementoRequest.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementMementoRequest.java @@ -45,6 +45,7 @@ class ElementMementoRequest extends MementoUpdate implements IElementMementoRequ /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#done() */ + @Override public void done() { ITreeModelViewer viewer = getContentProvider().getViewer(); @@ -53,7 +54,8 @@ class ElementMementoRequest extends MementoUpdate implements IElementMementoRequ doComplete(); } else { viewer.getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { doComplete(); } }); @@ -71,6 +73,7 @@ class ElementMementoRequest extends MementoUpdate implements IElementMementoRequ fManager.requestComplete(ElementMementoRequest.this); } + @Override public String toString() { StringBuffer buf = new StringBuffer(); buf.append("IElementMementoRequest: "); //$NON-NLS-1$ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/FilterTransform.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/FilterTransform.java index 22450539b..af91ff4ea 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/FilterTransform.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/FilterTransform.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,7 +38,8 @@ public class FilterTransform { class Node { private int[] filteredIndexes = null; private Object[] filteredElements = null; - private Map children = null; // only set for parent nodes, indexed by child + private Map<Object, Node> children = null; // only set for parent nodes, + // indexed by child Node() { } @@ -81,10 +82,10 @@ public class FilterTransform { } if (children == null) { - children = new HashMap(); + children = new HashMap<Object, Node>(); } Object element = path.getSegment(pathIndex); - Node node = (Node) children.get(element); + Node node = children.get(element); if (node == null) { node = new Node(); children.put(element, node); @@ -100,7 +101,7 @@ public class FilterTransform { return false; } Object child = path.getSegment(pathIndex); - Node node = (Node) children.get(child); + Node node = children.get(child); if (node != null) { if (node.clear(path, pathIndex + 1)) { children.remove(child); @@ -146,7 +147,7 @@ public class FilterTransform { return false; } Object element = path.getSegment(pathIndex); - Node node = (Node) children.get(element); + Node node = children.get(element); if (node == null) { return false; } @@ -160,13 +161,14 @@ public class FilterTransform { } Node find(TreePath path, int pathIndex) { - if (pathIndex == path.getSegmentCount()) + if (pathIndex == path.getSegmentCount()) { return this; + } if (children == null) { return null; } Object child = path.getSegment(pathIndex); - Node node = (Node) children.get(child); + Node node = children.get(child); if (node != null) { return node.find(path, pathIndex + 1); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java index 942b0b82b..d16ba7b2c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,7 +27,7 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat private boolean fHasChildren = false; - private List fBatchedRequests = null; + private List<ViewerUpdateMonitor> fBatchedRequests = null; /** * Constructs a request to update an element @@ -45,6 +45,7 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.ViewerUpdateMonitor#performUpdate() */ + @Override protected void performUpdate() { TreeModelContentProvider contentProvider = getContentProvider(); TreePath elementPath = getElementPath(); @@ -62,10 +63,12 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat } } + @Override public void setHasChilren(boolean hasChildren) { fHasChildren = hasChildren; } + @Override public String toString() { StringBuffer buf = new StringBuffer(); buf.append("IHasChildrenUpdate: "); //$NON-NLS-1$ @@ -76,6 +79,7 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#coalesce(org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor) */ + @Override boolean coalesce(ViewerUpdateMonitor request) { if (request instanceof HasChildrenUpdate) { if (getElementPath().equals(request.getElementPath())) { @@ -83,7 +87,7 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat return true; } else if (getElementContentProvider().equals(request.getElementContentProvider())) { if (fBatchedRequests == null) { - fBatchedRequests = new ArrayList(); + fBatchedRequests = new ArrayList<ViewerUpdateMonitor>(); fBatchedRequests.add(this); } fBatchedRequests.add(request); @@ -96,11 +100,12 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#startRequest() */ + @Override void startRequest() { if (fBatchedRequests == null) { getElementContentProvider().update(new IHasChildrenUpdate[]{this}); } else { - IHasChildrenUpdate[] updates = (IHasChildrenUpdate[]) fBatchedRequests.toArray(new IHasChildrenUpdate[fBatchedRequests.size()]); + IHasChildrenUpdate[] updates = fBatchedRequests.toArray(new IHasChildrenUpdate[fBatchedRequests.size()]); // notify that the other updates have also started to ensure correct sequence // of model updates - **** start at index 1 since the first (0) update has // already notified the content provider that it has started. @@ -111,12 +116,13 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat } } + @Override boolean containsUpdate(TreePath path) { if (getElementPath().equals(path)) { return true; } else if (fBatchedRequests != null) { for (int i = 0; i < fBatchedRequests.size(); i++) { - if (((ViewerUpdateMonitor)fBatchedRequests.get(i)).getElementPath().equals(path)) { + if (fBatchedRequests.get(i).getElementPath().equals(path)) { return true; } } @@ -128,6 +134,7 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#getPriority() */ + @Override int getPriority() { return 1; } @@ -135,6 +142,7 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor#getSchedulingPath() */ + @Override TreePath getSchedulingPath() { TreePath path = getElementPath(); if (path.getSegmentCount() > 0) { @@ -147,14 +155,16 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat return fHasChildren; } - protected boolean doEquals(ViewerUpdateMonitor update) { + @Override + protected boolean doEquals(ViewerUpdateMonitor update) { return update instanceof HasChildrenUpdate && getViewerInput().equals(update.getViewerInput()) && getElementPath().equals(update.getElementPath()); } - protected int doHashCode() { + @Override + protected int doHashCode() { return getClass().hashCode() + getViewerInput().hashCode() + getElementPath().hashCode(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/IInternalTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/IInternalTreeModelViewer.java index a0ed967ea..9aa4c1f62 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/IInternalTreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/IInternalTreeModelViewer.java @@ -35,7 +35,8 @@ public interface IInternalTreeModelViewer extends ITreeModelViewer { * @return an array of viewer filters * @see org.eclipse.jface.viewers.StructuredViewer#setFilters(ViewerFilter[]) */ - public ViewerFilter[] getFilters(); + @Override + public ViewerFilter[] getFilters(); /** * Reveals the given element in the viewer. diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ITreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ITreeModelViewer.java index e85d818fa..8d064cb27 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ITreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ITreeModelViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.viewers.model; @@ -17,6 +18,7 @@ package org.eclipse.debug.internal.ui.viewers.model; * * @deprecated This internal interface was replaced by {@link org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer}. */ +@Deprecated public interface ITreeModelViewer extends org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java index 829ae860e..cbd39c940 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java @@ -15,7 +15,6 @@ package org.eclipse.debug.internal.ui.viewers.model; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -76,6 +75,7 @@ import org.eclipse.ui.IMemento; * * @since 3.3 */ +@SuppressWarnings("deprecation") public class InternalTreeModelViewer extends TreeViewer implements IInternalTreeModelViewer, org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer { @@ -90,25 +90,25 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * Map of columns presentation id to its visible columns id's (String[]) * When a columns presentation is not in the map, default settings are used. */ - private final Map fVisibleColumns = new HashMap(); + private final Map<String, String[]> fVisibleColumns = new HashMap<String, String[]>(); /** * Map of column id's to persisted sizes */ - private final Map fColumnSizes = new HashMap(); + private final Map<Object, Integer> fColumnSizes = new HashMap<Object, Integer>(); /** * Map of column presentation id's to an array of integers representing the column order * for that presentation, or <code>null</code> if default. */ - private final Map fColumnOrder = new HashMap(); + private final Map<String, int[]> fColumnOrder = new HashMap<String, int[]>(); /** * Map of column presentation id to whether columns should be displayed * for that presentation (the user can toggle columns on/off when a * presentation is optional. */ - private final Map fShowColumns = new HashMap(); + private final Map<String, Boolean> fShowColumns = new HashMap<String, Boolean>(); /** * Item's tree path cache @@ -163,6 +163,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* (non-Javadoc) * @see org.eclipse.swt.events.ControlListener#controlMoved(org.eclipse.swt.events.ControlEvent) */ + @Override public void controlMoved(ControlEvent e) { persistColumnOrder(); } @@ -170,6 +171,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* (non-Javadoc) * @see org.eclipse.swt.events.ControlListener#controlResized(org.eclipse.swt.events.ControlEvent) */ + @Override public void controlResized(ControlEvent e) { persistColumnSizes(); } @@ -187,6 +189,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String) */ + @Override public boolean canModify(Object element, String property) { IElementEditor editor = ViewerAdapterService.getElementEditor(element); if (editor != null) { @@ -213,6 +216,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String) */ + @Override public Object getValue(Object element, String property) { if (fModifier != null) { return fModifier.getValue(element, property); @@ -223,6 +227,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object) */ + @Override public void modify(Object element, String property, Object value) { if (fModifier != null) { if (element instanceof Item) { @@ -311,9 +316,11 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @see org.eclipse.jface.viewers.TreeViewer#hookControl(org.eclipse.swt.widgets.Control) */ + @Override protected void hookControl(Control control) { Tree treeControl = (Tree) control; treeControl.addListener(SWT.SetData, new Listener() { + @Override public void handleEvent(Event event) { // to avoid flash, reset previous label data TreeItem item = (TreeItem) event.item; @@ -375,6 +382,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * Override the default handler for invalid selection to allow model * selection policy to select the new selection. */ + @Override protected void handleInvalidSelection(ISelection selection, ISelection newSelection) { IModelSelectionPolicy selectionPolicy = ViewerAdapterService.getSelectionPolicy(selection, getPresentationContext()); if (selectionPolicy != null) { @@ -399,6 +407,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* (non-Javadoc) * @see org.eclipse.jface.viewers.ContentViewer#handleDispose(org.eclipse.swt.events.DisposeEvent) */ + @Override protected void handleDispose(DisposeEvent event) { if (fColumnPresentation != null) { fColumnPresentation.dispose(); @@ -413,10 +422,12 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @return presentation context */ + @Override public IPresentationContext getPresentationContext() { return fContext; } + @Override protected void unmapElement(Object element, Widget widget) { if (fNotifyUnmap) { // TODO: should we update the filter with the "new non-identical element"? @@ -425,6 +436,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree super.unmapElement(element, widget); } + @Override protected void associate(Object element, Item item) { // see AbstractTreeViewer.associate(...) Object data = item.getData(); @@ -448,6 +460,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @see org.eclipse.jface.viewers.TreeViewer#mapElement(java.lang.Object, org.eclipse.swt.widgets.Widget) */ + @Override protected void mapElement(Object element, Widget widget) { super.mapElement(element, widget); if (widget instanceof Item) { @@ -463,6 +476,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @see org.eclipse.jface.viewers.AbstractTreeViewer#insert(java.lang.Object, java.lang.Object, int) */ + @Override public void insert(Object parentElementOrTreePath, Object element, int position) { try { fInserting = true; @@ -478,6 +492,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @see org.eclipse.jface.viewers.StructuredViewer#hasFilters() */ + @Override protected boolean hasFilters() { if (fInserting) { return false; @@ -485,6 +500,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree return super.hasFilters(); } + @Override protected void unmapAllElements() { // Do nothing when called from StructuredViewer.setInput(), to avoid // clearing elements before viewer state is saved. @@ -497,6 +513,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* (non-Javadoc) * @see org.eclipse.jface.viewers.AbstractTreeViewer#inputChanged(java.lang.Object, java.lang.Object) */ + @Override protected void inputChanged(Object input, Object oldInput) { fCellModifier.clear(); // Clear items map now that ITreeModelContentProvider.inputChanged() was already called. @@ -626,6 +643,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } + @Override protected void internalRefresh(Object element, boolean updateLabels) { ITreeModelContentProvider contentProvider = (ITreeModelContentProvider)getContentProvider(); @@ -677,7 +695,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } protected boolean isShowColumns(String columnPresentationId) { - Boolean bool = (Boolean) fShowColumns.get(columnPresentationId); + Boolean bool = fShowColumns.get(columnPresentationId); if (bool == null) { return true; } @@ -719,7 +737,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } column.setData(id); } - int[] order = (int[]) fColumnOrder.get(presentation.getId()); + int[] order = fColumnOrder.get(presentation.getId()); if (order != null) { tree.setColumnOrder(order); } @@ -744,7 +762,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree if (avg == 0) { tree.addPaintListener(new PaintListener() { - public void paintControl(PaintEvent e) { + @Override + public void paintControl(PaintEvent e) { Tree tree2 = getTree(); String[] visibleColumns = getVisibleColumns(); if (visibleColumns != null) { @@ -766,7 +785,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree TreeColumn treeColumn = columns[i]; Object colData = treeColumn.getData(); String columnId = colData instanceof String ? (String) colData : null; - Integer width = (Integer) fColumnSizes.get(colData); + Integer width = fColumnSizes.get(colData); if (width == null) { int ans = getInitialColumnWidth(columnId, treeWidgetWidth, visibleColumnIds); if (ans == -1) { @@ -797,11 +816,12 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @return visible columns or <code>null</code> */ + @Override public String[] getVisibleColumns() { if (isShowColumns()) { IColumnPresentation presentation = getColumnPresentation(); if (presentation != null) { - String[] columns = (String[]) fVisibleColumns.get(presentation.getId()); + String[] columns = fVisibleColumns.get(presentation.getId()); if (columns == null) { return presentation.getInitialColumns(); } else { @@ -892,28 +912,22 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree */ public void saveState(IMemento memento) { if (!fColumnSizes.isEmpty()) { - Iterator iterator = fColumnSizes.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = (Entry) iterator.next(); + for (Entry<Object, Integer> entry : fColumnSizes.entrySet()) { IMemento sizes = memento.createChild(COLUMN_SIZES, (String)entry.getKey()); - sizes.putInteger(SIZE, ((Integer)entry.getValue()).intValue()); + sizes.putInteger(SIZE, entry.getValue().intValue()); } } if (!fShowColumns.isEmpty()) { - Iterator iterator = fShowColumns.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = (Entry) iterator.next(); - IMemento sizes = memento.createChild(SHOW_COLUMNS, (String)entry.getKey()); - sizes.putString(SHOW_COLUMNS, ((Boolean)entry.getValue()).toString()); + for (Entry<String, Boolean> entry : fShowColumns.entrySet()) { + IMemento sizes = memento.createChild(SHOW_COLUMNS, entry.getKey()); + sizes.putString(SHOW_COLUMNS, entry.getValue().toString()); } } if (!fVisibleColumns.isEmpty()) { - Iterator iterator = fVisibleColumns.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = (Entry) iterator.next(); - String id = (String) entry.getKey(); + for (Entry<String, String[]> entry : fVisibleColumns.entrySet()) { + String id = entry.getKey(); IMemento visible = memento.createChild(VISIBLE_COLUMNS, id); - String[] columns = (String[]) entry.getValue(); + String[] columns = entry.getValue(); visible.putInteger(SIZE, columns.length); for (int i = 0; i < columns.length; i++) { visible.putString(COLUMN+Integer.toString(i), columns[i]); @@ -921,12 +935,10 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } if (!fColumnOrder.isEmpty()) { - Iterator iterator = fColumnOrder.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = (Entry) iterator.next(); - String id = (String) entry.getKey(); + for (Entry<String, int[]> entry : fColumnOrder.entrySet()) { + String id = entry.getKey(); IMemento orderMemento = memento.createChild(COLUMN_ORDER, id); - int[] order = (int[]) entry.getValue(); + int[] order = entry.getValue(); orderMemento.putInteger(SIZE, order.length); for (int i = 0; i < order.length; i++) { orderMemento.putInteger(COLUMN+Integer.toString(i), order[i]); @@ -1010,6 +1022,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * @param candidate the candidate for the new selection * @return if the current selection should be replaced with the candidate selection */ + @Override public boolean overrideSelection(ISelection current, ISelection candidate) { IModelSelectionPolicy selectionPolicy = ViewerAdapterService.getSelectionPolicy(current, getPresentationContext()); if (selectionPolicy == null) { @@ -1027,6 +1040,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @see org.eclipse.jface.viewers.StructuredViewer#setSelection(org.eclipse.jface.viewers.ISelection, boolean) */ + @Override public void setSelection(ISelection selection, boolean reveal) { if (!overrideSelection(getSelection(), selection)) { return; @@ -1038,6 +1052,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer#setSelection(org.eclipse.jface.viewers.ISelection, boolean, boolean) */ + @Override public void setSelection(ISelection selection, boolean reveal, boolean force) { trySelection(selection, reveal, force); } @@ -1045,6 +1060,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer#trySelection(org.eclipse.jface.viewers.ISelection, boolean, boolean) */ + @Override public boolean trySelection(ISelection selection, boolean reveal, boolean force) { if (force || overrideSelection(getSelection(), selection)) { super.setSelection(selection, reveal); @@ -1057,6 +1073,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @param listener listener */ + @Override public void addViewerUpdateListener(IViewerUpdateListener listener) { ((ITreeModelContentProvider)getContentProvider()).addViewerUpdateListener(listener); } @@ -1066,6 +1083,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @param listener listener */ + @Override public void removeViewerUpdateListener(IViewerUpdateListener listener) { ITreeModelContentProvider cp = (ITreeModelContentProvider)getContentProvider(); if (cp != null) { @@ -1078,6 +1096,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @param listener model delta listener */ + @Override public void addModelChangedListener(IModelChangedListener listener) { ((ITreeModelContentProvider)getContentProvider()).addModelChangedListener(listener); } @@ -1087,6 +1106,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @param listener model delta listener */ + @Override public void removeModelChangedListener(IModelChangedListener listener) { ITreeModelContentProvider cp = (ITreeModelContentProvider)getContentProvider(); if (cp != null) { @@ -1094,11 +1114,13 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } - public void addStateUpdateListener(IStateUpdateListener listener) { + @Override + public void addStateUpdateListener(IStateUpdateListener listener) { ((ITreeModelContentProvider)getContentProvider()).addStateUpdateListener(listener); } - public void removeStateUpdateListener(IStateUpdateListener listener) { + @Override + public void removeStateUpdateListener(IStateUpdateListener listener) { ITreeModelContentProvider cp = (ITreeModelContentProvider)getContentProvider(); if (cp != null) { cp.removeStateUpdateListener(listener); @@ -1108,6 +1130,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* * (non-Javadoc) Method declared in AbstractTreeViewer. */ + @Override protected void doUpdateItem(final Item item, Object element) { if (!(item instanceof TreeItem)) { return; @@ -1132,10 +1155,12 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } + @Override public void addLabelUpdateListener(ILabelUpdateListener listener) { ((ITreeModelLabelProvider)getLabelProvider()).addLabelUpdateListener(listener); } + @Override public void removeLabelUpdateListener(ILabelUpdateListener listener) { if (!getControl().isDisposed()) { ((ITreeModelLabelProvider)getLabelProvider()).removeLabelUpdateListener(listener); @@ -1165,6 +1190,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree return null; } + @Override public Item[] getChildren(Widget widget) { return super.getChildren(widget); } @@ -1174,6 +1200,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * @param item the item to compute the {@link TreePath} for * @return {@link TreePath} */ + @Override protected TreePath getTreePathFromItem(Item item) { return super.getTreePathFromItem(item); } @@ -1190,6 +1217,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * @see org.eclipse.jface.viewers.AbstractTreeViewer#internalRefreshStruct(org.eclipse.swt.widgets.Widget, * java.lang.Object, boolean) */ + @Override protected void internalRefreshStruct(Widget widget, Object element, boolean updateLabels) { // clear all starting with the given widget @@ -1298,7 +1326,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree //************************************************************************** // Another couple of methods copied from TreeViewer to workaround the UI bug 266189. // - protected void createChildren(Widget widget) { + @Override + protected void createChildren(Widget widget) { Object element = widget.getData(); if (element == null && widget instanceof TreeItem) { // parent has not been materialized @@ -1349,6 +1378,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * * @param elementPath tree path to element to consider for expansion */ + @Override public void autoExpand(TreePath elementPath) { int level = getAutoExpandLevel(); if (level > 0 || level == ITreeModelViewer.ALL_LEVELS) { @@ -1358,7 +1388,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } - public int findElementIndex(TreePath parentPath, Object element) { + @Override + public int findElementIndex(TreePath parentPath, Object element) { Widget parentItem = findItem(parentPath); if (parentItem != null) { Item[] children = getChildren(parentItem); @@ -1373,7 +1404,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree return -1; } - public boolean getElementChildrenRealized(TreePath parentPath) { + @Override + public boolean getElementChildrenRealized(TreePath parentPath) { Widget parentItem = findItem(parentPath); if (parentItem != null) { Item[] children = getChildren(parentItem); @@ -1386,7 +1418,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree return true; } - public Display getDisplay() { + @Override + public Display getDisplay() { Control control = getControl(); if (control != null) { return control.getDisplay(); @@ -1396,7 +1429,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree protected static final String[] STATE_PROPERTIES = new String[]{ IBasicPropertyConstants.P_TEXT, IBasicPropertyConstants.P_IMAGE }; - public void update(Object element) { + @Override + public void update(Object element) { update(element, STATE_PROPERTIES); } @@ -1412,7 +1446,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree static String PREV_CHECKED_KEY = "PREV_CHECKED_KEY"; //$NON-NLS-1$ static String PREV_GRAYED_KEY = "PREV_GRAYED_KEY"; //$NON-NLS-1$ - public void setElementData(TreePath path, int numColumns, String[] labels, ImageDescriptor[] imageDescriptors, + @Override + public void setElementData(TreePath path, int numColumns, String[] labels, ImageDescriptor[] imageDescriptors, FontData[] fontDatas, RGB[] _foregrounds, RGB[] _backgrounds) { Widget widget = findItem(path); @@ -1512,7 +1547,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } - public ViewerLabel getElementLabel(TreePath path, String columnId) { + @Override + public ViewerLabel getElementLabel(TreePath path, String columnId) { if (path.getSegmentCount() == 0) { return null; } @@ -1545,7 +1581,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree return null; } - public void reveal(TreePath path, int index) { + @Override + public void reveal(TreePath path, int index) { Widget item = findItem(path); TreeItem[] children = null; if (item instanceof TreeItem) { @@ -1558,7 +1595,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } - public int getChildCount(TreePath path) { + @Override + public int getChildCount(TreePath path) { if (path.getSegmentCount() == 0) { return ((Tree)getControl()).getItemCount(); } else { @@ -1572,7 +1610,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree return -1; } - public Object getChildElement(TreePath path, int index) { + @Override + public Object getChildElement(TreePath path, int index) { TreeItem childItem = null; if (path.getSegmentCount() == 0) { Tree tree = (Tree)getControl(); @@ -1595,7 +1634,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree return null; } - public TreePath getTopElementPath() { + @Override + public TreePath getTopElementPath() { TreeItem topItem = ((Tree)getControl()).getTopItem(); if (topItem != null && topItem.getData() != null) { return getTreePathFromItem(topItem); @@ -1603,10 +1643,11 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree return null; } - public boolean saveElementState(TreePath path, ModelDelta delta, int flagsToSave) { + @Override + public boolean saveElementState(TreePath path, ModelDelta delta, int flagsToSave) { Tree tree = (Tree) getControl(); TreeItem[] selection = tree.getSelection(); - Set set = new HashSet(); + Set<TreeItem> set = new HashSet<TreeItem>(); for (int i = 0; i < selection.length; i++) { set.add(selection[i]); } @@ -1647,7 +1688,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } - private void doSaveElementState(TreePath parentPath, ModelDelta delta, TreeItem item, Collection set, int index, int flagsToSave) { + private void doSaveElementState(TreePath parentPath, ModelDelta delta, TreeItem item, Collection<TreeItem> set, int index, int flagsToSave) { Object element = item.getData(); if (element != null) { boolean expanded = item.getExpanded(); @@ -1681,7 +1722,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } - public void updateViewer(IModelDelta delta) { + @Override + public void updateViewer(IModelDelta delta) { ((ITreeModelContentProvider)getContentProvider()).updateModel(delta, ITreeModelContentProvider.ALL_MODEL_DELTA_FLAGS); } @@ -1689,6 +1731,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ITreeModelCheckProvider#setElementChecked(org.eclipse.jface.viewers.TreePath, boolean, boolean) */ + @Override public void setElementChecked(TreePath path, boolean checked, boolean grayed) { Widget widget = findItem(path); @@ -1703,7 +1746,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } - public boolean getElementChecked(TreePath path) { + @Override + public boolean getElementChecked(TreePath path) { Widget widget = findItem(path); if (widget != null && widget instanceof TreeItem && !widget.isDisposed()) { @@ -1720,7 +1764,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * @param path the path of the element to set grayed * @return grayed */ - public boolean getElementGrayed(TreePath path) { + @Override + public boolean getElementGrayed(TreePath path) { Widget widget = findItem(path); if (widget != null && widget instanceof TreeItem && !widget.isDisposed()) { @@ -1731,7 +1776,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree return false; } - public boolean getHasChildren(Object elementOrTreePath) { + @Override + public boolean getHasChildren(Object elementOrTreePath) { if (elementOrTreePath instanceof TreePath && ((TreePath)elementOrTreePath).getSegmentCount() == 0) { @@ -1750,7 +1796,8 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree return false; } - public TreePath[] getElementPaths(Object element) { + @Override + public TreePath[] getElementPaths(Object element) { Widget[] items = internalFindItems(element); TreePath[] paths = new TreePath[items.length]; for (int i = 0; i < items.length; i++) { @@ -1767,6 +1814,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * (non-Javadoc) * @see org.eclipse.jface.viewers.StructuredViewer#handleSelect(org.eclipse.swt.events.SelectionEvent) */ + @Override protected void handleSelect(SelectionEvent event) { super.handleSelect(event); @@ -1794,6 +1842,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } + @Override protected void handleTreeExpand(TreeEvent event) { super.handleTreeExpand(event); IContentProvider contentProvider = getContentProvider(); @@ -1803,6 +1852,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree } } + @Override protected void handleTreeCollapse(TreeEvent event) { super.handleTreeCollapse(event); IContentProvider contentProvider = getContentProvider(); @@ -1815,6 +1865,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ITreeModelContentProviderTarget#clearSelectionQuiet() */ + @Override public void clearSelectionQuiet() { getTree().setSelection(new TreeItem[0]); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java index b4d8a6554..68e472f61 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,7 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation - * IBM - ongoing bug fixing + * IBM Corporation - ongoing bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.viewers.model; @@ -63,6 +63,7 @@ import org.eclipse.ui.IMemento; * A tree model viewer without a UI component. * @since 3.5 */ +@SuppressWarnings("deprecation") public class InternalVirtualTreeModelViewer extends Viewer implements IVirtualItemListener, org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer, @@ -127,7 +128,7 @@ public class InternalVirtualTreeModelViewer extends Viewer * tree may contain the same element in several places, so the map values * are lists. */ - private Map fItemsMap = new HashMap(); + private Map<Object, List<VirtualItem>> fItemsMap = new HashMap<Object, List<VirtualItem>>(); /** * Whether to notify the content provider when an element is unmapped. @@ -172,14 +173,14 @@ public class InternalVirtualTreeModelViewer extends Viewer * Map of columns presentation id to its visible columns id's (String[]) * When a columns presentation is not in the map, default settings are used. */ - private Map fVisibleColumns = new HashMap(); + private Map<String, String[]> fVisibleColumns = new HashMap<String, String[]>(); /** * Map of column presentation id to whether columns should be displayed * for that presentation (the user can toggle columns on/off when a * presentation is optional. */ - private Map fShowColumns = new HashMap(); + private Map<String, Boolean> fShowColumns = new HashMap<String, Boolean>(); /** * Runnable for validating the virtual tree. It is scheduled to run in the @@ -201,21 +202,25 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - public Object getInput() { + @Override + public Object getInput() { return fInput; } - public Control getControl() { + @Override + public Control getControl() { // The virtual viewer does not have an SWT control associated with it. // Fortunately this method is not used by the base Viewer class. return null; } - public Display getDisplay() { + @Override + public Display getDisplay() { return fDisplay; } - public void setInput(Object input) { + @Override + public void setInput(Object input) { Object oldInput = fInput; getContentProvider().inputChanged(this, oldInput, input); fItemsMap.clear(); @@ -229,7 +234,8 @@ public class InternalVirtualTreeModelViewer extends Viewer refresh(); } - public void replace(Object parentElementOrTreePath, final int index, Object element) { + @Override + public void replace(Object parentElementOrTreePath, final int index, Object element) { VirtualItem[] selectedItems = fTree.getSelection(); TreeSelection selection = (TreeSelection) getSelection(); VirtualItem[] itemsToDisassociate; @@ -281,7 +287,8 @@ public class InternalVirtualTreeModelViewer extends Viewer return fTree; } - public void insert(Object parentOrTreePath, Object element, int position) { + @Override + public void insert(Object parentOrTreePath, Object element, int position) { if (parentOrTreePath instanceof TreePath) { VirtualItem parentItem = findItem((TreePath) parentOrTreePath); if (parentItem != null) { @@ -296,17 +303,19 @@ public class InternalVirtualTreeModelViewer extends Viewer validate(); } - public void remove(final Object parentOrTreePath, final int index) { - final List oldSelection = new LinkedList(Arrays - .asList(((TreeSelection) getSelection()).getPaths())); + @Override + public void remove(final Object parentOrTreePath, final int index) { + final List<TreePath> oldSelection = new LinkedList<TreePath>(Arrays.asList(((TreeSelection) getSelection()).getPaths())); preservingSelection(new Runnable() { - public void run() { + @Override + public void run() { TreePath removedPath = null; VirtualItem[] parentItems = findItems(parentOrTreePath); for (int i = 0; i < parentItems.length; i++) { VirtualItem parentItem = parentItems[i]; - if (parentItem.isDisposed()) - continue; + if (parentItem.isDisposed()) { + continue; + } // Parent item is not expanded so just update its contents so that // the plus sign gets refreshed. @@ -329,8 +338,8 @@ public class InternalVirtualTreeModelViewer extends Viewer if (removedPath != null) { boolean removed = false; - for (Iterator it = oldSelection.iterator(); it.hasNext();) { - TreePath path = (TreePath) it.next(); + for (Iterator<TreePath> it = oldSelection.iterator(); it.hasNext();) { + TreePath path = it.next(); if (path.startsWith(removedPath, null)) { it.remove(); removed = true; @@ -338,7 +347,7 @@ public class InternalVirtualTreeModelViewer extends Viewer } if (removed) { setSelection( - new TreeSelection((TreePath[]) oldSelection.toArray(new TreePath[oldSelection.size()])), + new TreeSelection(oldSelection.toArray(new TreePath[oldSelection.size()])), false); } } @@ -346,7 +355,8 @@ public class InternalVirtualTreeModelViewer extends Viewer }); } - public void remove(Object elementOrPath) { + @Override + public void remove(Object elementOrPath) { if (elementOrPath.equals(getInput()) || TreePath.EMPTY.equals(elementOrPath)) { setInput(null); return; @@ -441,7 +451,8 @@ public class InternalVirtualTreeModelViewer extends Viewer // } - public void reveal(TreePath path, final int index) { + @Override + public void reveal(TreePath path, final int index) { VirtualItem parentItem = findItem(path); if (parentItem != null && parentItem.getItemCount() >= index) { VirtualItem revealItem = parentItem.getItem(new Index(index)); @@ -451,7 +462,8 @@ public class InternalVirtualTreeModelViewer extends Viewer // TODO: implement reveal() } - public int findElementIndex(TreePath parentPath, Object element) { + @Override + public int findElementIndex(TreePath parentPath, Object element) { VirtualItem parentItem = findItem(parentPath); if (parentItem != null) { VirtualItem item = parentItem.findItem(element); @@ -462,7 +474,8 @@ public class InternalVirtualTreeModelViewer extends Viewer return -1; } - public boolean getElementChildrenRealized(TreePath parentPath) { + @Override + public boolean getElementChildrenRealized(TreePath parentPath) { VirtualItem parentItem = findItem(parentPath); if (parentItem != null) { return !parentItem.childrenNeedDataUpdate(); @@ -481,12 +494,14 @@ public class InternalVirtualTreeModelViewer extends Viewer public static int ALL_LEVELS = -1; - public void refresh() { + @Override + public void refresh() { refresh(fTree); validate(); } - public void refresh(Object element) { + @Override + public void refresh(Object element) { VirtualItem[] items = findItems(element); for (int i = 0; i < items.length; i++) { refresh(items[i]); @@ -537,7 +552,8 @@ public class InternalVirtualTreeModelViewer extends Viewer private void validate() { if (fValidateRunnable == null) { fValidateRunnable = new Runnable() { - public void run() { + @Override + public void run() { if (!fTree.isDisposed()) { fValidateRunnable = null; fTree.validate(); @@ -548,15 +564,18 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - protected void inputChanged(Object input, Object oldInput) { + @Override + protected void inputChanged(Object input, Object oldInput) { resetColumns(input); } - public int getAutoExpandLevel() { + @Override + public int getAutoExpandLevel() { return fAutoExpandToLevel; } - public void setAutoExpandLevel(int level) { + @Override + public void setAutoExpandLevel(int level) { fAutoExpandToLevel = level; } @@ -565,11 +584,11 @@ public class InternalVirtualTreeModelViewer extends Viewer return fTree; } - List itemsList = (List)fItemsMap.get(path.getLastSegment()); + List<VirtualItem> itemsList = fItemsMap.get(path.getLastSegment()); if (itemsList != null) { - for (int i = 0; i < itemsList.size(); i++) { - if ( path.equals(getTreePathFromItem((VirtualItem)itemsList.get(i))) ) { - return (VirtualItem)itemsList.get(i); + for (VirtualItem item : itemsList) { + if (path.equals(getTreePathFromItem(item))) { + return item; } } } @@ -588,15 +607,16 @@ public class InternalVirtualTreeModelViewer extends Viewer } element = path.getLastSegment(); } - List itemsList = (List) fItemsMap.get(element); + List<VirtualItem> itemsList = fItemsMap.get(element); if (itemsList == null) { return EMPTY_ITEMS_ARRAY; } else { - return (VirtualItem[]) itemsList.toArray(new VirtualItem[itemsList.size()]); + return itemsList.toArray(new VirtualItem[itemsList.size()]); } } - public void setElementData(TreePath path, int numColumns, String[] labels, ImageDescriptor[] images, + @Override + public void setElementData(TreePath path, int numColumns, String[] labels, ImageDescriptor[] images, FontData[] fontDatas, RGB[] foregrounds, RGB[] backgrounds) { VirtualItem item = findItem(path); if (item != null) { @@ -608,9 +628,11 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - public void setChildCount(final Object elementOrTreePath, final int count) { + @Override + public void setChildCount(final Object elementOrTreePath, final int count) { preservingSelection(new Runnable() { - public void run() { + @Override + public void run() { VirtualItem[] items = findItems(elementOrTreePath); for (int i = 0; i < items.length; i++) { VirtualItem[] children = items[i].getItems(); @@ -627,9 +649,11 @@ public class InternalVirtualTreeModelViewer extends Viewer validate(); } - public void setHasChildren(final Object elementOrTreePath, final boolean hasChildren) { + @Override + public void setHasChildren(final Object elementOrTreePath, final boolean hasChildren) { preservingSelection(new Runnable() { - public void run() { + @Override + public void run() { VirtualItem[] items = findItems(elementOrTreePath); for (int i = 0; i < items.length; i++) { VirtualItem item = items[i]; @@ -656,7 +680,8 @@ public class InternalVirtualTreeModelViewer extends Viewer }); } - public boolean getHasChildren(Object elementOrTreePath) { + @Override + public boolean getHasChildren(Object elementOrTreePath) { VirtualItem[] items = findItems(elementOrTreePath); if (items.length > 0) { return items[0].hasItems(); @@ -691,7 +716,7 @@ public class InternalVirtualTreeModelViewer extends Viewer } private TreePath getTreePathFromItem(VirtualItem item) { - List segments = new LinkedList(); + List<Object> segments = new LinkedList<Object>(); while (item.getParent() != null) { segments.add(0, item.getData()); item = item.getParent(); @@ -708,7 +733,7 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - List itemsList = (List) fItemsMap.get(element); + List<VirtualItem> itemsList = fItemsMap.get(element); if (itemsList != null) { itemsList.remove(item); if (itemsList.isEmpty()) { @@ -723,9 +748,9 @@ public class InternalVirtualTreeModelViewer extends Viewer // re-inserted to make sure that the new instance of element is used // in case the element has changed but the elment is equal to the old // one. - List itemsList = (List) fItemsMap.remove(element); + List<VirtualItem> itemsList = fItemsMap.remove(element); if (itemsList == null) { - itemsList = new ArrayList(1); + itemsList = new ArrayList<VirtualItem>(1); } if (!itemsList.contains(item)) { @@ -738,7 +763,8 @@ public class InternalVirtualTreeModelViewer extends Viewer item.setData(TREE_PATH_KEY, getTreePathFromItem(item)); } - public void revealed(VirtualItem item) { + @Override + public void revealed(VirtualItem item) { if (item.needsDataUpdate()) { virtualLazyUpdateData(item); } else if (item.getData() != null) { @@ -751,7 +777,8 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - public void disposed(VirtualItem item) { + @Override + public void disposed(VirtualItem item) { if (!fTree.isDisposed()) { Object data = item.getData(); if (data != null) { @@ -817,21 +844,24 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - public void setSelection(ISelection selection, boolean reveal) { + @Override + public void setSelection(ISelection selection, boolean reveal) { setSelection(selection, reveal, false); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer#setSelection(org.eclipse.jface.viewers.ISelection, boolean, boolean) */ - public void setSelection(ISelection selection, boolean reveal, boolean force) { + @Override + public void setSelection(ISelection selection, boolean reveal, boolean force) { trySelection(selection, reveal, force); } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer#trySelection(org.eclipse.jface.viewers.ISelection, boolean, boolean) */ - public boolean trySelection(ISelection selection, boolean reveal, boolean force) { + @Override + public boolean trySelection(ISelection selection, boolean reveal, boolean force) { if (!force && !overrideSelection(getSelection(), selection)) { return false; } @@ -849,7 +879,7 @@ public class InternalVirtualTreeModelViewer extends Viewer private void internalSetSelection(ISelection selection, boolean reveal) { if (selection instanceof ITreeSelection) { TreePath[] paths = ((ITreeSelection) selection).getPaths(); - List newSelection = new ArrayList(paths.length); + List<VirtualItem> newSelection = new ArrayList<VirtualItem>(paths.length); for (int i = 0; i < paths.length; ++i) { // Use internalExpand since item may not yet be created. See // 1G6B1AR. @@ -858,7 +888,7 @@ public class InternalVirtualTreeModelViewer extends Viewer newSelection.add(item); } } - fTree.setSelection((VirtualItem[]) newSelection.toArray(new VirtualItem[newSelection.size()])); + fTree.setSelection(newSelection.toArray(new VirtualItem[newSelection.size()])); // Although setting the selection in the control should reveal it, // setSelection may be a no-op if the selection is unchanged, @@ -868,7 +898,7 @@ public class InternalVirtualTreeModelViewer extends Viewer // Iterate backwards so the first item in the list // is the one guaranteed to be visible for (int i = (newSelection.size() - 1); i >= 0; i--) { - fTree.showItem((VirtualItem) newSelection.get(i)); + fTree.showItem(newSelection.get(i)); } } } else { @@ -879,7 +909,8 @@ public class InternalVirtualTreeModelViewer extends Viewer validate(); } - public void update(Object element) { + @Override + public void update(Object element) { VirtualItem[] items = findItems(element); for (int i = 0; i < items.length; i++) { doUpdate(items[i]); @@ -891,25 +922,23 @@ public class InternalVirtualTreeModelViewer extends Viewer validate(); } - public ISelection getSelection() { + @Override + public ISelection getSelection() { if (fTree.isDisposed()) { return TreeSelection.EMPTY; } VirtualItem[] items = fTree.getSelection(); - ArrayList list = new ArrayList(items.length); - Map map = new LinkedHashMap(items.length * 4/3); - + ArrayList<TreePath> list = new ArrayList<TreePath>(items.length); + Map<VirtualItem, TreePath> map = new LinkedHashMap<VirtualItem, TreePath>(items.length * 4 / 3); for (int i = 0; i < items.length; i++) { TreePath path = null; - if (items[i].getData() != null) { path = getTreePathFromItem(items[i]); list.add(path); } map.put(items[i], path); } - //return new VirtualTreeSelection(map, (TreePath[]) list.toArray(new TreePath[list.size()])); - return new TreeSelection((TreePath[]) list.toArray(new TreePath[list.size()])); + return new TreeSelection(list.toArray(new TreePath[list.size()])); } private void preservingSelection(Runnable updateCode) { @@ -939,7 +968,8 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - public void expandToLevel(Object elementOrTreePath, int level) { + @Override + public void expandToLevel(Object elementOrTreePath, int level) { VirtualItem[] items = findItems(elementOrTreePath); if (items.length > 0) { expandToLevel(items[0], level); @@ -947,7 +977,8 @@ public class InternalVirtualTreeModelViewer extends Viewer validate(); } - public void setExpandedState(Object elementOrTreePath, boolean expanded) { + @Override + public void setExpandedState(Object elementOrTreePath, boolean expanded) { VirtualItem[] items = findItems(elementOrTreePath); for (int i = 0; i < items.length; i++) { items[i].setExpanded(expanded); @@ -955,7 +986,8 @@ public class InternalVirtualTreeModelViewer extends Viewer validate(); } - public boolean getExpandedState(Object elementOrTreePath) { + @Override + public boolean getExpandedState(Object elementOrTreePath) { VirtualItem[] items = findItems(elementOrTreePath); if (items.length > 0) { return items[0].getExpanded(); @@ -1017,7 +1049,8 @@ public class InternalVirtualTreeModelViewer extends Viewer * @param candidate New potential selection requested by model. * @return true if candidate selection should be set to viewer. */ - public boolean overrideSelection(ISelection current, ISelection candidate) { + @Override + public boolean overrideSelection(ISelection current, ISelection candidate) { IModelSelectionPolicy selectionPolicy = ViewerAdapterService.getSelectionPolicy(current, getPresentationContext()); if (selectionPolicy == null) { return true; @@ -1028,18 +1061,21 @@ public class InternalVirtualTreeModelViewer extends Viewer return !selectionPolicy.isSticky(current, getPresentationContext()); } - public ViewerFilter[] getFilters() { + @Override + public ViewerFilter[] getFilters() { return fFilters; } - public void addFilter(ViewerFilter filter) { + @Override + public void addFilter(ViewerFilter filter) { ViewerFilter[] newFilters = new ViewerFilter[fFilters.length + 1]; System.arraycopy(fFilters, 0, newFilters, 0, fFilters.length); newFilters[fFilters.length] = filter; fFilters = newFilters; } - public void setFilters(ViewerFilter[] filters) { + @Override + public void setFilters(ViewerFilter[] filters) { fFilters = filters; } @@ -1066,7 +1102,8 @@ public class InternalVirtualTreeModelViewer extends Viewer * * @return presentation context */ - public IPresentationContext getPresentationContext() { + @Override + public IPresentationContext getPresentationContext() { return fContext; } @@ -1172,7 +1209,7 @@ public class InternalVirtualTreeModelViewer extends Viewer } protected boolean isShowColumns(String columnPresentationId) { - Boolean bool = (Boolean) fShowColumns.get(columnPresentationId); + Boolean bool = fShowColumns.get(columnPresentationId); if (bool == null) { return true; } @@ -1199,11 +1236,12 @@ public class InternalVirtualTreeModelViewer extends Viewer * * @return visible columns or <code>null</code> */ - public String[] getVisibleColumns() { + @Override + public String[] getVisibleColumns() { if (isShowColumns()) { IColumnPresentation presentation = getColumnPresentation(); if (presentation != null) { - String[] columns = (String[]) fVisibleColumns.get(presentation.getId()); + String[] columns = fVisibleColumns.get(presentation.getId()); if (columns == null) { return presentation.getInitialColumns(); } @@ -1263,20 +1301,15 @@ public class InternalVirtualTreeModelViewer extends Viewer */ public void saveState(IMemento memento) { if (!fShowColumns.isEmpty()) { - Iterator iterator = fShowColumns.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = (Entry) iterator.next(); - IMemento sizes = memento.createChild(SHOW_COLUMNS, (String)entry.getKey()); - sizes.putString(SHOW_COLUMNS, ((Boolean)entry.getValue()).toString()); + for (Entry<String, Boolean> entry : fShowColumns.entrySet()) { + IMemento sizes = memento.createChild(SHOW_COLUMNS, entry.getKey()); + sizes.putString(SHOW_COLUMNS, entry.getValue().toString()); } } if (!fVisibleColumns.isEmpty()) { - Iterator iterator = fVisibleColumns.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = (Entry) iterator.next(); - String id = (String) entry.getKey(); - IMemento visible = memento.createChild(VISIBLE_COLUMNS, id); - String[] columns = (String[]) entry.getValue(); + for (Entry<String, String[]> entry : fVisibleColumns.entrySet()) { + IMemento visible = memento.createChild(VISIBLE_COLUMNS, entry.getKey()); + String[] columns = entry.getValue(); visible.putInteger(SIZE, columns.length); for (int i = 0; i < columns.length; i++) { visible.putString(COLUMN+Integer.toString(i), columns[i]); @@ -1330,44 +1363,52 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - public void addViewerUpdateListener(IViewerUpdateListener listener) { + @Override + public void addViewerUpdateListener(IViewerUpdateListener listener) { getContentProvider().addViewerUpdateListener(listener); } - public void removeViewerUpdateListener(IViewerUpdateListener listener) { + @Override + public void removeViewerUpdateListener(IViewerUpdateListener listener) { ITreeModelContentProvider cp = getContentProvider(); if (cp != null) { cp.removeViewerUpdateListener(listener); } } - public void addModelChangedListener(IModelChangedListener listener) { + @Override + public void addModelChangedListener(IModelChangedListener listener) { getContentProvider().addModelChangedListener(listener); } - public void removeModelChangedListener(IModelChangedListener listener) { + @Override + public void removeModelChangedListener(IModelChangedListener listener) { ITreeModelContentProvider cp = getContentProvider(); if (cp != null) { cp.removeModelChangedListener(listener); } } - public void addStateUpdateListener(IStateUpdateListener listener) { + @Override + public void addStateUpdateListener(IStateUpdateListener listener) { getContentProvider().addStateUpdateListener(listener); } - public void removeStateUpdateListener(IStateUpdateListener listener) { + @Override + public void removeStateUpdateListener(IStateUpdateListener listener) { ITreeModelContentProvider cp = getContentProvider(); if (cp != null) { cp.removeStateUpdateListener(listener); } } - public void addLabelUpdateListener(ILabelUpdateListener listener) { + @Override + public void addLabelUpdateListener(ILabelUpdateListener listener) { getLabelProvider().addLabelUpdateListener(listener); } - public void removeLabelUpdateListener(ILabelUpdateListener listener) { + @Override + public void removeLabelUpdateListener(ILabelUpdateListener listener) { getLabelProvider().removeLabelUpdateListener(listener); } @@ -1377,7 +1418,8 @@ public class InternalVirtualTreeModelViewer extends Viewer * * @param elementPath tree path to element to consider for expansion */ - public void autoExpand(TreePath elementPath) { + @Override + public void autoExpand(TreePath elementPath) { int level = getAutoExpandLevel(); if (level > 0 || level == org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer.ALL_LEVELS) { if (level == org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer.ALL_LEVELS || level > elementPath.getSegmentCount()) { @@ -1386,7 +1428,8 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - public int getChildCount(TreePath path) { + @Override + public int getChildCount(TreePath path) { int childCount = -1; VirtualItem[] items = findItems(path); if (items.length > 0) { @@ -1401,7 +1444,8 @@ public class InternalVirtualTreeModelViewer extends Viewer return childCount; } - public Object getChildElement(TreePath path, int index) { + @Override + public Object getChildElement(TreePath path, int index) { VirtualItem[] items = findItems(path); if (items.length > 0) { if (index < items[0].getItemCount()) { @@ -1411,14 +1455,16 @@ public class InternalVirtualTreeModelViewer extends Viewer return null; } - public TreePath getTopElementPath() { + @Override + public TreePath getTopElementPath() { return null; } - public boolean saveElementState(TreePath path, ModelDelta delta, int flagsToSave) { + @Override + public boolean saveElementState(TreePath path, ModelDelta delta, int flagsToSave) { VirtualTree tree = getTree(); VirtualItem[] selection = tree.getSelection(); - Set set = new HashSet(); + Set<VirtualItem> set = new HashSet<VirtualItem>(); for (int i = 0; i < selection.length; i++) { set.add(selection[i]); } @@ -1450,7 +1496,7 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - private void doSaveElementState(TreePath parentPath, ModelDelta delta, VirtualItem item, Collection set, int flagsToSave) { + private void doSaveElementState(TreePath parentPath, ModelDelta delta, VirtualItem item, Collection<VirtualItem> set, int flagsToSave) { Object element = item.getData(); if (element != null) { boolean expanded = item.getExpanded(); @@ -1480,11 +1526,13 @@ public class InternalVirtualTreeModelViewer extends Viewer } } - public void updateViewer(IModelDelta delta) { + @Override + public void updateViewer(IModelDelta delta) { getContentProvider().updateModel(delta, ITreeModelContentProvider.ALL_MODEL_DELTA_FLAGS); } - public ViewerLabel getElementLabel(TreePath path, String columnId) { + @Override + public ViewerLabel getElementLabel(TreePath path, String columnId) { if (path.getSegmentCount() == 0) { return null; } @@ -1517,7 +1565,8 @@ public class InternalVirtualTreeModelViewer extends Viewer return null; } - public TreePath[] getElementPaths(Object element) { + @Override + public TreePath[] getElementPaths(Object element) { VirtualItem[] items = findItems(element); TreePath[] paths = new TreePath[items.length]; for (int i = 0; i < items.length; i++) { @@ -1570,25 +1619,30 @@ public class InternalVirtualTreeModelViewer extends Viewer /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.ITreeModelContentProviderTarget#clearSelectionQuiet() */ - public void clearSelectionQuiet() { + @Override + public void clearSelectionQuiet() { getTree().setSelection(EMPTY_ITEMS_ARRAY); } - public boolean getElementChecked(TreePath path) { + @Override + public boolean getElementChecked(TreePath path) { // Not supported return false; } - public boolean getElementGrayed(TreePath path) { + @Override + public boolean getElementGrayed(TreePath path) { // Not supported return false; } - public void setElementChecked(TreePath path, boolean checked, boolean grayed) { + @Override + public void setElementChecked(TreePath path, boolean checked, boolean grayed) { // Not supported } - public String toString() { + @Override + public String toString() { return getTree().toString(); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java index c188a4af1..5bbffb307 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java @@ -64,6 +64,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate#getColumnIds() */ + @Override public String[] getColumnIds() { return fColumnIds; } @@ -71,6 +72,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElementPath() */ + @Override public TreePath getElementPath() { return fElementPath; } @@ -78,6 +80,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate#setBackground(org.eclipse.swt.graphics.RGB, int) */ + @Override public void setBackground(RGB background, int columnIndex) { if (background == null) { return; @@ -91,6 +94,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate#setFontData(org.eclipse.swt.graphics.FontData, int) */ + @Override public void setFontData(FontData fontData, int columnIndex) { if (fontData == null) { return; @@ -104,6 +108,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate#setForeground(org.eclipse.swt.graphics.RGB, int) */ + @Override public void setForeground(RGB foreground, int columnIndex) { if (foreground == null) { return; @@ -117,6 +122,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate#setImageDescriptor(org.eclipse.jface.resource.ImageDescriptor, int) */ + @Override public void setImageDescriptor(ImageDescriptor image, int columnIndex) { if (image == null) { return; @@ -130,6 +136,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate#setLabel(java.lang.String, int) */ + @Override public void setLabel(String text, int columnIndex) { fLabels[columnIndex] = text; } @@ -137,6 +144,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getPresentationContext() */ + @Override public IPresentationContext getPresentationContext() { return fContext; } @@ -144,6 +152,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.core.commands.Request#done() */ + @Override public void done() { fProvider.complete(this); } @@ -160,10 +169,12 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElement() */ + @Override public Object getElement() { return getElementPath().getLastSegment(); } + @Override public String toString() { StringBuffer buf = new StringBuffer(); buf.append("ILabelUpdate: "); //$NON-NLS-1$ @@ -174,6 +185,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getViewerInput() */ + @Override public Object getViewerInput() { return fViewerInput; } @@ -181,6 +193,7 @@ class LabelUpdate extends Request implements ILabelUpdate, ICheckUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.ICheckUpdate#setChecked(boolean, boolean) */ + @Override public void setChecked(boolean checked, boolean grayed) { fChecked = checked; fGrayed = grayed; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/MementoUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/MementoUpdate.java index b4c8f5368..081058bd1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/MementoUpdate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/MementoUpdate.java @@ -50,6 +50,7 @@ abstract class MementoUpdate extends Request implements IViewerUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getPresentationContext() */ + @Override public IPresentationContext getPresentationContext() { return fContext; } @@ -57,6 +58,7 @@ abstract class MementoUpdate extends Request implements IViewerUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElement() */ + @Override public Object getElement() { return fElement; } @@ -64,6 +66,7 @@ abstract class MementoUpdate extends Request implements IViewerUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElementPath() */ + @Override public TreePath getElementPath() { return fElementPath; } @@ -83,6 +86,7 @@ abstract class MementoUpdate extends Request implements IViewerUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getViewerInput() */ + @Override public Object getViewerInput() { return fViewerInput; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/SubTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/SubTreeModelViewer.java index c76348744..36fa8c7d6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/SubTreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/SubTreeModelViewer.java @@ -82,13 +82,15 @@ public class SubTreeModelViewer extends TreeModelViewer { public class DelegatingTreeModelViewer extends Viewer implements IInternalTreeModelViewer { - public void reveal(TreePath path, int index) { + @Override + public void reveal(TreePath path, int index) { if (path.startsWith(fRootPath, null)) { SubTreeModelViewer.this.reveal(createSubPath(path), index); } } - public void replace(Object parentOrTreePath, int index, Object element) { + @Override + public void replace(Object parentOrTreePath, int index, Object element) { if (parentOrTreePath instanceof TreePath) { TreePath path = (TreePath)parentOrTreePath; if (path.startsWith(fRootPath, null)) { @@ -99,7 +101,8 @@ public class SubTreeModelViewer extends TreeModelViewer { } } - public void setChildCount(Object elementOrTreePath, int count) { + @Override + public void setChildCount(Object elementOrTreePath, int count) { if (elementOrTreePath instanceof TreePath) { TreePath path = (TreePath)elementOrTreePath; if (path.startsWith(fRootPath, null)) { @@ -110,7 +113,8 @@ public class SubTreeModelViewer extends TreeModelViewer { } } - public void setHasChildren(Object elementOrTreePath, boolean hasChildren) { + @Override + public void setHasChildren(Object elementOrTreePath, boolean hasChildren) { if (elementOrTreePath instanceof TreePath) { TreePath path = (TreePath)elementOrTreePath; if (path.startsWith(fRootPath, null)) { @@ -121,11 +125,13 @@ public class SubTreeModelViewer extends TreeModelViewer { } } - public void autoExpand(TreePath elementPath) { + @Override + public void autoExpand(TreePath elementPath) { // not supported } - public void setExpandedState(Object elementOrTreePath, boolean expanded) { + @Override + public void setExpandedState(Object elementOrTreePath, boolean expanded) { if (elementOrTreePath instanceof TreePath) { TreePath path = (TreePath)elementOrTreePath; if (path.startsWith(fRootPath, null)) { @@ -136,7 +142,8 @@ public class SubTreeModelViewer extends TreeModelViewer { } } - public void expandToLevel(Object elementOrTreePath, int level) { + @Override + public void expandToLevel(Object elementOrTreePath, int level) { if (elementOrTreePath instanceof TreePath) { TreePath path = (TreePath)elementOrTreePath; if (path.startsWith(fRootPath, null)) { @@ -147,7 +154,8 @@ public class SubTreeModelViewer extends TreeModelViewer { } } - public void remove(Object elementOrTreePath) { + @Override + public void remove(Object elementOrTreePath) { if (elementOrTreePath instanceof TreePath) { TreePath path = (TreePath)elementOrTreePath; if (path.startsWith(fRootPath, null)) { @@ -158,7 +166,8 @@ public class SubTreeModelViewer extends TreeModelViewer { } } - public void remove(Object parentOrTreePath, final int index) { + @Override + public void remove(Object parentOrTreePath, final int index) { if (parentOrTreePath instanceof TreePath) { TreePath path = (TreePath)parentOrTreePath; if (path.startsWith(fRootPath, null)) { @@ -169,7 +178,8 @@ public class SubTreeModelViewer extends TreeModelViewer { } } - public void insert(Object parentOrTreePath, Object element, int position) { + @Override + public void insert(Object parentOrTreePath, Object element, int position) { if (parentOrTreePath instanceof TreePath) { TreePath path = (TreePath)parentOrTreePath; if (path.startsWith(fRootPath, null)) { @@ -180,7 +190,8 @@ public class SubTreeModelViewer extends TreeModelViewer { } } - public boolean getExpandedState(Object elementOrTreePath) { + @Override + public boolean getExpandedState(Object elementOrTreePath) { if (elementOrTreePath instanceof TreePath) { TreePath path = (TreePath)elementOrTreePath; if (path.startsWith(fRootPath, null)) { @@ -192,14 +203,16 @@ public class SubTreeModelViewer extends TreeModelViewer { return false; } - public int getChildCount(TreePath path) { + @Override + public int getChildCount(TreePath path) { if (path.startsWith(fRootPath, null)) { return SubTreeModelViewer.this.getChildCount(createSubPath(path)); } return -1; } - public boolean getHasChildren(Object elementOrTreePath) { + @Override + public boolean getHasChildren(Object elementOrTreePath) { if (elementOrTreePath instanceof TreePath) { TreePath path = (TreePath)elementOrTreePath; if (path.startsWith(fRootPath, null)) { @@ -211,163 +224,200 @@ public class SubTreeModelViewer extends TreeModelViewer { return false; } - public Object getChildElement(TreePath path, int index) { + @Override + public Object getChildElement(TreePath path, int index) { if (path.startsWith(fRootPath, null)) { return SubTreeModelViewer.this.getChildElement(createSubPath(path), index); } return null; } - public TreePath getTopElementPath() { + @Override + public TreePath getTopElementPath() { return createFullPath(SubTreeModelViewer.this.getTopElementPath()); } - public int findElementIndex(TreePath parentPath, Object element) { + @Override + public int findElementIndex(TreePath parentPath, Object element) { if (parentPath.startsWith(fRootPath, null)) { return SubTreeModelViewer.this.findElementIndex(createSubPath(parentPath), element); } return -1; } - public boolean getElementChildrenRealized(TreePath parentPath) { + @Override + public boolean getElementChildrenRealized(TreePath parentPath) { if (parentPath.startsWith(fRootPath, null)) { return SubTreeModelViewer.this.getElementChildrenRealized(createSubPath(parentPath)); } return true; } - public void setElementData(TreePath path, int numColumns, String[] labels, ImageDescriptor[] images, FontData[] fontDatas, RGB[] foregrounds, RGB[] backgrounds) { + @Override + public void setElementData(TreePath path, int numColumns, String[] labels, ImageDescriptor[] images, FontData[] fontDatas, RGB[] foregrounds, RGB[] backgrounds) { if (path.startsWith(fRootPath, null)) { SubTreeModelViewer.this.setElementData(createSubPath(path), numColumns, labels, images, fontDatas, foregrounds, backgrounds); } } - public Control getControl() { + @Override + public Control getControl() { return SubTreeModelViewer.this.getControl(); } - public Object getInput() { + @Override + public Object getInput() { return SubTreeModelViewer.this.getInput(); } - public ISelection getSelection() { + @Override + public ISelection getSelection() { return SubTreeModelViewer.this.getSelection(); } - public void refresh() { + @Override + public void refresh() { SubTreeModelViewer.this.refresh(); } - public void setInput(Object input) { + @Override + public void setInput(Object input) { SubTreeModelViewer.this.setInput(input); } - public void setSelection(ISelection selection, boolean reveal) { + @Override + public void setSelection(ISelection selection, boolean reveal) { SubTreeModelViewer.this.setSelection(selection, reveal); } - public String[] getVisibleColumns() { + @Override + public String[] getVisibleColumns() { return SubTreeModelViewer.this.getVisibleColumns(); } - public void addLabelUpdateListener(ILabelUpdateListener listener) { + @Override + public void addLabelUpdateListener(ILabelUpdateListener listener) { SubTreeModelViewer.this.addLabelUpdateListener(listener); } - public void addModelChangedListener(IModelChangedListener listener) { + @Override + public void addModelChangedListener(IModelChangedListener listener) { SubTreeModelViewer.this.addModelChangedListener(listener); } - public void addStateUpdateListener(IStateUpdateListener listener) { + @Override + public void addStateUpdateListener(IStateUpdateListener listener) { SubTreeModelViewer.this.addStateUpdateListener(listener); } - public void addViewerUpdateListener(IViewerUpdateListener listener) { + @Override + public void addViewerUpdateListener(IViewerUpdateListener listener) { SubTreeModelViewer.this.addViewerUpdateListener(listener); } - public int getAutoExpandLevel() { + @Override + public int getAutoExpandLevel() { return SubTreeModelViewer.this.getAutoExpandLevel(); } - public Display getDisplay() { + @Override + public Display getDisplay() { return SubTreeModelViewer.this.getDisplay(); } - public ViewerLabel getElementLabel(TreePath path, String columnId) { + @Override + public ViewerLabel getElementLabel(TreePath path, String columnId) { return SubTreeModelViewer.this.getElementLabel(path, columnId); } - public IPresentationContext getPresentationContext() { + @Override + public IPresentationContext getPresentationContext() { return SubTreeModelViewer.this.getPresentationContext(); } - public void removeLabelUpdateListener(ILabelUpdateListener listener) { + @Override + public void removeLabelUpdateListener(ILabelUpdateListener listener) { SubTreeModelViewer.this.removeLabelUpdateListener(listener); } - public void removeModelChangedListener(IModelChangedListener listener) { + @Override + public void removeModelChangedListener(IModelChangedListener listener) { SubTreeModelViewer.this.removeModelChangedListener(listener); } - public void removeStateUpdateListener(IStateUpdateListener listener) { + @Override + public void removeStateUpdateListener(IStateUpdateListener listener) { SubTreeModelViewer.this.removeStateUpdateListener(listener); } - public void removeViewerUpdateListener(IViewerUpdateListener listener) { + @Override + public void removeViewerUpdateListener(IViewerUpdateListener listener) { SubTreeModelViewer.this.removeViewerUpdateListener(listener); } - public boolean saveElementState(TreePath path, ModelDelta delta, int deltaFlags) { + @Override + public boolean saveElementState(TreePath path, ModelDelta delta, int deltaFlags) { return SubTreeModelViewer.this.saveElementState(path, delta, deltaFlags); } - public void setAutoExpandLevel(int level) { + @Override + public void setAutoExpandLevel(int level) { SubTreeModelViewer.this.setAutoExpandLevel(level); } - public void setSelection(ISelection selection, boolean reveal, boolean force) { + @Override + public void setSelection(ISelection selection, boolean reveal, boolean force) { SubTreeModelViewer.this.setSelection(selection, reveal, force); } - public boolean trySelection(ISelection selection, boolean reveal, boolean force) { + @Override + public boolean trySelection(ISelection selection, boolean reveal, boolean force) { return SubTreeModelViewer.this.trySelection(selection, reveal, force); } - public void updateViewer(IModelDelta delta) { + @Override + public void updateViewer(IModelDelta delta) { SubTreeModelViewer.this.updateViewer(delta); } - public ViewerFilter[] getFilters() { + @Override + public ViewerFilter[] getFilters() { return SubTreeModelViewer.this.getFilters(); } - public void addFilter(ViewerFilter filter) { + @Override + public void addFilter(ViewerFilter filter) { SubTreeModelViewer.this.addFilter(filter); } - public void setFilters(ViewerFilter[] filters) { + @Override + public void setFilters(ViewerFilter[] filters) { SubTreeModelViewer.this.setFilters(filters); } - public boolean overrideSelection(ISelection current, ISelection candidate) { + @Override + public boolean overrideSelection(ISelection current, ISelection candidate) { return SubTreeModelViewer.this.overrideSelection(current, candidate); } - public void refresh(Object element) { + @Override + public void refresh(Object element) { SubTreeModelViewer.this.refresh(element); } - public void update(Object element) { + @Override + public void update(Object element) { SubTreeModelViewer.this.update(element); } - public void clearSelectionQuiet() { + @Override + public void clearSelectionQuiet() { SubTreeModelViewer.this.clearSelectionQuiet(); } - public TreePath[] getElementPaths(Object element) { + @Override + public TreePath[] getElementPaths(Object element) { TreePath[] subViewerPaths = SubTreeModelViewer.this.getElementPaths(element); TreePath[] retVal = new TreePath[subViewerPaths.length]; for (int i = 0; i < subViewerPaths.length; i++) { @@ -376,15 +426,18 @@ public class SubTreeModelViewer extends TreeModelViewer { return retVal; } - public boolean getElementChecked(TreePath path) { + @Override + public boolean getElementChecked(TreePath path) { return SubTreeModelViewer.this.getElementChecked(createSubPath(path)); } - public boolean getElementGrayed(TreePath path) { + @Override + public boolean getElementGrayed(TreePath path) { return SubTreeModelViewer.this.getElementGrayed(createSubPath(path)); } - public void setElementChecked(TreePath path, boolean checked, boolean grayed) { + @Override + public void setElementChecked(TreePath path, boolean checked, boolean grayed) { SubTreeModelViewer.this.setElementChecked(createSubPath(path), checked, grayed); } } @@ -402,75 +455,93 @@ public class SubTreeModelViewer extends TreeModelViewer { fBaseProvider = new TreeModelContentProvider(); } - public void updateHasChildren(TreePath path) { + @Override + public void updateHasChildren(TreePath path) { fBaseProvider.updateHasChildren(createFullPath(path)); } - public void updateChildCount(TreePath path, int currentChildCount) { + @Override + public void updateChildCount(TreePath path, int currentChildCount) { fBaseProvider.updateChildCount(createFullPath(path), currentChildCount); } - public void updateElement(TreePath parentPath, int viewIndex) { + @Override + public void updateElement(TreePath parentPath, int viewIndex) { fBaseProvider.updateElement(createFullPath(parentPath), viewIndex); } - public int viewToModelCount(TreePath parentPath, int count) { + @Override + public int viewToModelCount(TreePath parentPath, int count) { return fBaseProvider.viewToModelCount(createFullPath(parentPath), count); } - public int viewToModelIndex(TreePath parentPath, int index) { + @Override + public int viewToModelIndex(TreePath parentPath, int index) { return fBaseProvider.viewToModelIndex(createFullPath(parentPath), index); } - public void addModelChangedListener(IModelChangedListener listener) { + @Override + public void addModelChangedListener(IModelChangedListener listener) { fBaseProvider.addModelChangedListener(listener); } - public void preserveState(TreePath subPath) { + @Override + public void preserveState(TreePath subPath) { fBaseProvider.preserveState(createFullPath(subPath)); } - public void addStateUpdateListener(IStateUpdateListener listener) { + @Override + public void addStateUpdateListener(IStateUpdateListener listener) { fBaseProvider.addStateUpdateListener(listener); } - public void addViewerUpdateListener(IViewerUpdateListener listener) { + @Override + public void addViewerUpdateListener(IViewerUpdateListener listener) { fBaseProvider.addViewerUpdateListener(listener); } - public int getModelDeltaMask() { + @Override + public int getModelDeltaMask() { return fBaseProvider.getModelDeltaMask(); } - public int modelToViewChildCount(TreePath parentPath, int count) { + @Override + public int modelToViewChildCount(TreePath parentPath, int count) { return fBaseProvider.modelToViewChildCount(createFullPath(parentPath), count); } - public int modelToViewIndex(TreePath parentPath, int index) { + @Override + public int modelToViewIndex(TreePath parentPath, int index) { return fBaseProvider.modelToViewIndex(createFullPath(parentPath), index); } - public void removeModelChangedListener(IModelChangedListener listener) { + @Override + public void removeModelChangedListener(IModelChangedListener listener) { fBaseProvider.removeModelChangedListener(listener); } - public void removeStateUpdateListener(IStateUpdateListener listener) { + @Override + public void removeStateUpdateListener(IStateUpdateListener listener) { fBaseProvider.removeStateUpdateListener(listener); } - public void removeViewerUpdateListener(IViewerUpdateListener listener) { + @Override + public void removeViewerUpdateListener(IViewerUpdateListener listener) { fBaseProvider.removeViewerUpdateListener(listener); } - public void setModelDeltaMask(int mask) { + @Override + public void setModelDeltaMask(int mask) { fBaseProvider.setModelDeltaMask(mask); } - public boolean areTreeModelViewerFiltersApplicable(Object parentElement) { + @Override + public boolean areTreeModelViewerFiltersApplicable(Object parentElement) { return fBaseProvider.areTreeModelViewerFiltersApplicable(parentElement); } - public boolean shouldFilter(Object parentElementOrTreePath, Object element) { + @Override + public boolean shouldFilter(Object parentElementOrTreePath, Object element) { if (parentElementOrTreePath instanceof TreePath) { TreePath path = (TreePath)parentElementOrTreePath; return fBaseProvider.shouldFilter(createFullPath(path), element); @@ -480,37 +551,45 @@ public class SubTreeModelViewer extends TreeModelViewer { } - public void unmapPath(TreePath path) { + @Override + public void unmapPath(TreePath path) { fBaseProvider.unmapPath(createFullPath(path)); } - public void updateModel(IModelDelta delta, int mask) { + @Override + public void updateModel(IModelDelta delta, int mask) { fBaseProvider.updateModel(delta, mask); } - public TreePath[] getParents(Object element) { + @Override + public TreePath[] getParents(Object element) { // Not used return null; } - public void cancelRestore(TreePath path, int flags) { + @Override + public void cancelRestore(TreePath path, int flags) { fBaseProvider.cancelRestore(createFullPath(path), flags); } - public void dispose() { + @Override + public void dispose() { fBaseProvider.dispose(); } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { fBaseProvider.inputChanged(fDelegatingViewer, oldInput, newInput); } + @Override public void postInputChanged(IInternalTreeModelViewer viewer, Object oldInput, Object newInput) { fBaseProvider.postInputChanged(viewer, oldInput, newInput); } - public boolean setChecked(TreePath path, boolean checked) { + @Override + public boolean setChecked(TreePath path, boolean checked) { return fBaseProvider.setChecked(createFullPath(path), checked); } @@ -530,44 +609,54 @@ public class SubTreeModelViewer extends TreeModelViewer { fBaseProvider = new TreeModelLabelProvider(viewer); } - public boolean update(TreePath elementPath) { + @Override + public boolean update(TreePath elementPath) { return fBaseProvider.update( createFullPath(elementPath) ); } - public void addLabelUpdateListener(ILabelUpdateListener listener) { + @Override + public void addLabelUpdateListener(ILabelUpdateListener listener) { fBaseProvider.addLabelUpdateListener(listener); } - public Color getColor(RGB rgb) { + @Override + public Color getColor(RGB rgb) { return fBaseProvider.getColor(rgb); } - public Font getFont(FontData fontData) { + @Override + public Font getFont(FontData fontData) { return fBaseProvider.getFont(fontData); } - public Image getImage(ImageDescriptor descriptor) { + @Override + public Image getImage(ImageDescriptor descriptor) { return fBaseProvider.getImage(descriptor); } - public void removeLabelUpdateListener(ILabelUpdateListener listener) { + @Override + public void removeLabelUpdateListener(ILabelUpdateListener listener) { fBaseProvider.removeLabelUpdateListener(listener); } - public void addListener(ILabelProviderListener listener) { + @Override + public void addListener(ILabelProviderListener listener) { fBaseProvider.addListener(listener); } - public void dispose() { + @Override + public void dispose() { fBaseProvider.dispose(); super.dispose(); } - public boolean isLabelProperty(Object element, String property) { + @Override + public boolean isLabelProperty(Object element, String property) { return fBaseProvider.isLabelProperty(element, property); } - public void removeListener(ILabelProviderListener listener) { + @Override + public void removeListener(ILabelProviderListener listener) { fBaseProvider.removeListener(listener); } } @@ -609,11 +698,13 @@ public class SubTreeModelViewer extends TreeModelViewer { return fDelegatingViewer; } - protected ITreeModelContentProvider createContentProvider() { + @Override + protected ITreeModelContentProvider createContentProvider() { return new SubTreeModelContentProvider(); } - protected ITreeModelLabelProvider createLabelProvider() { + @Override + protected ITreeModelLabelProvider createLabelProvider() { return new SubTreeModelLabelProvider(getDelegatingViewer()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TimeTriggeredProgressMonitorDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TimeTriggeredProgressMonitorDialog.java index 68a194a69..da68d82c1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TimeTriggeredProgressMonitorDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TimeTriggeredProgressMonitorDialog.java @@ -82,7 +82,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * @see org.eclipse.core.runtime.IProgressMonitor#beginTask(java.lang.String, * int) */ - public void beginTask(String name, int totalWork) { + @Override + public void beginTask(String name, int totalWork) { superMonitor.beginTask(name, totalWork); checkTicking(); } @@ -107,7 +108,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#done() */ - public void done() { + @Override + public void done() { superMonitor.done(); checkTicking(); } @@ -117,7 +119,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#internalWorked(double) */ - public void internalWorked(double work) { + @Override + public void internalWorked(double work) { superMonitor.internalWorked(work); checkTicking(); } @@ -127,7 +130,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled() */ - public boolean isCanceled() { + @Override + public boolean isCanceled() { return superMonitor.isCanceled(); } @@ -136,7 +140,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean) */ - public void setCanceled(boolean value) { + @Override + public void setCanceled(boolean value) { superMonitor.setCanceled(value); } @@ -146,7 +151,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#setTaskName(java.lang.String) */ - public void setTaskName(String name) { + @Override + public void setTaskName(String name) { superMonitor.setTaskName(name); checkTicking(); @@ -157,7 +163,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#subTask(java.lang.String) */ - public void subTask(String name) { + @Override + public void subTask(String name) { superMonitor.subTask(name); checkTicking(); } @@ -167,7 +174,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#worked(int) */ - public void worked(int work) { + @Override + public void worked(int work) { superMonitor.worked(work); checkTicking(); @@ -180,7 +188,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.dialogs.ProgressMonitorDialog#getProgressMonitor() */ - public IProgressMonitor getProgressMonitor() { + @Override + public IProgressMonitor getProgressMonitor() { if (wrapperedMonitor == null) { createWrapperedMonitor(); } @@ -192,13 +201,15 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.operations.IRunnableContext#run(boolean, boolean, IRunnableWithProgress) */ - public void run(final boolean fork, final boolean cancelable, + @Override + public void run(final boolean fork, final boolean cancelable, final IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { final InvocationTargetException[] invokes = new InvocationTargetException[1]; final InterruptedException[] interrupt = new InterruptedException[1]; Runnable dialogWaitRunnable = new Runnable() { - public void run() { + @Override + public void run() { try { TimeTriggeredProgressMonitorDialog.super.run(fork, cancelable, runnable); } catch (InvocationTargetException e) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java index 131186b01..6a2b05603 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java @@ -29,7 +29,6 @@ import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.debug.core.IRequest; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.viewers.model.provisional.ICheckboxModelProxy; import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate; @@ -77,7 +76,10 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * Used to install different model proxy instances for one element depending * on the tree path. */ - private Map fTreeModelProxies = new HashMap(); // tree model proxy by + private Map<TreePath, IModelProxy> fTreeModelProxies = new HashMap<TreePath, IModelProxy>(); // tree + // model + // proxy + // by // element tree path /** @@ -86,7 +88,10 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * Used to install a single model proxy which is responsible for all * instances of an element in the model tree. */ - private Map fModelProxies = new HashMap(); // model proxy by element + private Map<Object, IModelProxy> fModelProxies = new HashMap<Object, IModelProxy>(); // model + // proxy + // by + // element /** * Map of nodes that have been filtered from the viewer. @@ -112,15 +117,15 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon /** * Map of updates in progress: element path -> list of requests */ - private Map fRequestsInProgress = new HashMap(); + private Map<TreePath, List<ViewerUpdateMonitor>> fRequestsInProgress = new HashMap<TreePath, List<ViewerUpdateMonitor>>(); /** * Map of dependent requests waiting for parent requests to complete: * element path -> list of requests */ - private Map fWaitingRequests = new HashMap(); + private Map<TreePath, List<ViewerUpdateMonitor>> fWaitingRequests = new HashMap<TreePath, List<ViewerUpdateMonitor>>(); - private List fCompletedUpdates = new ArrayList(); + private List<ViewerUpdateMonitor> fCompletedUpdates = new ArrayList<ViewerUpdateMonitor>(); private Runnable fCompletedUpdatesRunnable; @@ -143,18 +148,18 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon */ static final TreePath EMPTY_TREE_PATH = new TreePath(new Object[] {}); - public void dispose() { - if (fViewer == null) return; + @Override + public void dispose() { + if (fViewer == null) { + return; + } Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); // cancel pending updates - Iterator iterator = fRequestsInProgress.values().iterator(); - while (iterator.hasNext()) { - List requests = (List) iterator.next(); - Iterator reqIter = requests.iterator(); - while (reqIter.hasNext()) { - ((IRequest) reqIter.next()).cancel(); + for (List<ViewerUpdateMonitor> requests : fRequestsInProgress.values()) { + for (ViewerUpdateMonitor vu : requests) { + vu.cancel(); } } fWaitingRequests.clear(); @@ -178,7 +183,8 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { synchronized(this) { fViewer = (IInternalTreeModelViewer) viewer; } @@ -190,7 +196,8 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } } - public void postInputChanged(IInternalTreeModelViewer viewer, Object oldInput, Object newInput) { + @Override + public void postInputChanged(IInternalTreeModelViewer viewer, Object oldInput, Object newInput) { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); cancelSubtreeUpdates(TreePath.EMPTY); @@ -203,39 +210,48 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } } - public void addViewerUpdateListener(IViewerUpdateListener listener) { + @Override + public void addViewerUpdateListener(IViewerUpdateListener listener) { fUpdateListeners.add(listener); } - public void removeViewerUpdateListener(IViewerUpdateListener listener) { + @Override + public void removeViewerUpdateListener(IViewerUpdateListener listener) { fUpdateListeners.remove(listener); } - public void addStateUpdateListener(IStateUpdateListener listener) { + @Override + public void addStateUpdateListener(IStateUpdateListener listener) { fStateTracker.addStateUpdateListener(listener); } - public void preserveState(TreePath path) { + @Override + public void preserveState(TreePath path) { fStateTracker.appendToPendingStateDelta(path); } - public void removeStateUpdateListener(IStateUpdateListener listener) { + @Override + public void removeStateUpdateListener(IStateUpdateListener listener) { fStateTracker.removeStateUpdateListener(listener); } - public void addModelChangedListener(IModelChangedListener listener) { + @Override + public void addModelChangedListener(IModelChangedListener listener) { fModelListeners.add(listener); } - public void removeModelChangedListener(IModelChangedListener listener) { + @Override + public void removeModelChangedListener(IModelChangedListener listener) { fModelListeners.remove(listener); } - public void cancelRestore(final TreePath path, final int flags) { + @Override + public void cancelRestore(final TreePath path, final int flags) { fStateTracker.cancelRestore(path, flags); } - public boolean setChecked(TreePath path, boolean checked) { + @Override + public boolean setChecked(TreePath path, boolean checked) { IModelProxy elementProxy = getElementProxy(path); if (elementProxy instanceof ICheckboxModelProxy) { return ((ICheckboxModelProxy) elementProxy).setChecked(getPresentationContext(), getViewer().getInput(), path, checked); @@ -277,7 +293,8 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } else if (proxy != null) { final IModelProxy finalProxy = proxy; Job job = new Job("Model Proxy installed notification job") {//$NON-NLS-1$ - protected IStatus run(IProgressMonitor monitor) { + @Override + protected IStatus run(IProgressMonitor monitor) { if (!monitor.isCanceled()) { IPresentationContext context = null; Viewer viewer = null; @@ -296,7 +313,8 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon return Status.OK_STATUS; } - public boolean shouldRun() { + @Override + public boolean shouldRun() { return !isDisposed(); } }; @@ -313,13 +331,13 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon */ private IModelProxy getElementProxy(TreePath path) { while (path != null) { - IModelProxy proxy = (IModelProxy) fTreeModelProxies.get(path); + IModelProxy proxy = fTreeModelProxies.get(path); if (proxy != null) { return proxy; } Object element = path.getSegmentCount() == 0 ? getViewer().getInput() : path.getLastSegment(); - proxy = (IModelProxy) fModelProxies.get(element); + proxy = fModelProxies.get(element); if (proxy != null) { return proxy; } @@ -334,17 +352,11 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon */ private void disposeAllModelProxies() { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); - - Iterator updatePolicies = fModelProxies.values().iterator(); - while (updatePolicies.hasNext()) { - IModelProxy proxy = (IModelProxy) updatePolicies.next(); + for (IModelProxy proxy : fModelProxies.values()) { proxy.dispose(); } fModelProxies.clear(); - - updatePolicies = fTreeModelProxies.values().iterator(); - while (updatePolicies.hasNext()) { - IModelProxy proxy = (IModelProxy) updatePolicies.next(); + for (IModelProxy proxy : fTreeModelProxies.values()) { proxy.dispose(); } fTreeModelProxies.clear(); @@ -355,17 +367,18 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * @param path the {@link TreePath} to dispose the model proxy for */ private void disposeModelProxy(TreePath path) { - IModelProxy proxy = (IModelProxy) fTreeModelProxies.remove(path); + IModelProxy proxy = fTreeModelProxies.remove(path); if (proxy != null) { proxy.dispose(); } - proxy = (IModelProxy) fModelProxies.remove(path.getLastSegment()); + proxy = fModelProxies.remove(path.getLastSegment()); if (proxy != null) { proxy.dispose(); } } - public void modelChanged(final IModelDelta delta, final IModelProxy proxy) { + @Override + public void modelChanged(final IModelDelta delta, final IModelProxy proxy) { Display display = null; // Check if the viewer is still available, i.e. if the content provider @@ -383,7 +396,8 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } else { fViewer.getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { doModelChanged(delta, proxy); } }); @@ -415,18 +429,23 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } } - public void setModelDeltaMask(int mask) { + @Override + public void setModelDeltaMask(int mask) { fModelDeltaMask = mask; } - public int getModelDeltaMask() { + @Override + public int getModelDeltaMask() { return fModelDeltaMask; } - public void updateModel(IModelDelta delta, int mask) { + @Override + public void updateModel(IModelDelta delta, int mask) { // Processing deltas with null input leads to NPEs // (Bug 380288 - NPE switching to the Breakpoints View) - if (getViewer() == null || getViewer().getInput() == null) return; + if (getViewer() == null || getViewer().getInput() == null) { + return; + } IModelDelta[] deltaArray = new IModelDelta[] { delta }; updateNodes(deltaArray, mask & (IModelDelta.REMOVED | IModelDelta.UNINSTALL)); @@ -445,7 +464,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * @return corresponding tree path */ TreePath getFullTreePath(IModelDelta node) { - ArrayList list = new ArrayList(); + ArrayList<Object> list = new ArrayList<Object>(); while (node.getParentDelta() != null) { list.add(0, node.getElement()); node = node.getParentDelta(); @@ -461,7 +480,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * @return corresponding tree path */ TreePath getViewerTreePath(IModelDelta node) { - ArrayList list = new ArrayList(); + ArrayList<Object> list = new ArrayList<Object>(); IModelDelta parentDelta = node.getParentDelta(); while (parentDelta != null) { list.add(0, node.getElement()); @@ -482,23 +501,28 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } } - public int viewToModelIndex(TreePath parentPath, int index) { + @Override + public int viewToModelIndex(TreePath parentPath, int index) { return fTransform.viewToModelIndex(parentPath, index); } - public int viewToModelCount(TreePath parentPath, int count) { + @Override + public int viewToModelCount(TreePath parentPath, int count) { return fTransform.viewToModelCount(parentPath, count); } - public int modelToViewIndex(TreePath parentPath, int index) { + @Override + public int modelToViewIndex(TreePath parentPath, int index) { return fTransform.modelToViewIndex(parentPath, index); } - public int modelToViewChildCount(TreePath parentPath, int count) { + @Override + public int modelToViewChildCount(TreePath parentPath, int count) { return fTransform.modelToViewCount(parentPath, count); } - public boolean areTreeModelViewerFiltersApplicable(Object parentElement) { + @Override + public boolean areTreeModelViewerFiltersApplicable(Object parentElement) { ViewerFilter[] filters = fViewer.getFilters(); if (filters.length > 0) { for (int j = 0; j < filters.length; j++) { @@ -512,7 +536,8 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon return false; } - public boolean shouldFilter(Object parentElementOrTreePath, Object element) { + @Override + public boolean shouldFilter(Object parentElementOrTreePath, Object element) { ViewerFilter[] filters = fViewer.getFilters(); if (filters.length > 0) { for (int j = 0; j < filters.length; j++) { @@ -520,7 +545,9 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon // Skip the filter if not applicable to parent element Object parentElement = parentElementOrTreePath instanceof TreePath ? ((TreePath)parentElementOrTreePath).getLastSegment() : parentElementOrTreePath; - if (parentElement == null) parentElement = fViewer.getInput(); + if (parentElement == null) { + parentElement = fViewer.getInput(); + } if (!((TreeModelViewerFilter)filters[j]).isApplicable(fViewer, parentElement)) { continue; } @@ -534,7 +561,8 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon return false; } - public void unmapPath(TreePath path) { + @Override + public void unmapPath(TreePath path) { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); fTransform.clear(path); cancelSubtreeUpdates(path); @@ -589,9 +617,9 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon void updateStarted(ViewerUpdateMonitor update) { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); - List requests = (List) fRequestsInProgress.get(update.getSchedulingPath()); + List<ViewerUpdateMonitor> requests = fRequestsInProgress.get(update.getSchedulingPath()); if (requests == null) { - requests = new ArrayList(); + requests = new ArrayList<ViewerUpdateMonitor>(); fRequestsInProgress.put(update.getSchedulingPath(), requests); } requests.add(update); @@ -613,9 +641,9 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * * @param updates the updates to notify */ - void updatesComplete(final List updates) { + void updatesComplete(final List<ViewerUpdateMonitor> updates) { for (int i = 0; i < updates.size(); i++) { - ViewerUpdateMonitor update = (ViewerUpdateMonitor)updates.get(i); + ViewerUpdateMonitor update = updates.get(i); notifyUpdate(UPDATE_COMPLETE, update); if (DebugUIPlugin.DEBUG_UPDATE_SEQUENCE && DebugUIPlugin.DEBUG_TEST_PRESENTATION_ID(getPresentationContext())) { DebugUIPlugin.trace("\tEND - " + update); //$NON-NLS-1$ @@ -624,15 +652,18 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon // Wait a single cycle to allow viewer to queue requests triggered by completed updates. getViewer().getDisplay().asyncExec(new Runnable() { - public void run() { - if (isDisposed()) return; + @Override + public void run() { + if (isDisposed()) { + return; + } for (int i = 0; i < updates.size(); i++) { - ViewerUpdateMonitor update = (ViewerUpdateMonitor)updates.get(i); + ViewerUpdateMonitor update = updates.get(i); // Search for update in list using identity test. Otherwise a completed canceled // update may trigger removal of up-to-date running update on the same element. - List requests = (List) fRequestsInProgress.get(update.getSchedulingPath()); + List<ViewerUpdateMonitor> requests = fRequestsInProgress.get(update.getSchedulingPath()); boolean found = false; if (requests != null) { for (int j = 0; j < requests.size(); j++) { @@ -694,7 +725,8 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon for (int i = 0; i < listeners.length; i++) { final IViewerUpdateListener listener = (IViewerUpdateListener) listeners[i]; SafeRunner.run(new ISafeRunnable() { - public void run() throws Exception { + @Override + public void run() throws Exception { switch (type) { case UPDATE_SEQUENCE_BEGINS: listener.viewerUpdatesBegin(); @@ -708,10 +740,13 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon case UPDATE_COMPLETE: listener.updateComplete(update); break; + default: + break; } } - public void handleException(Throwable exception) { + @Override + public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } }); @@ -726,34 +761,28 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon */ private void cancelSubtreeUpdates(TreePath path) { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); - - Iterator iterator = fRequestsInProgress.entrySet().iterator(); - while (iterator.hasNext()) { - Entry entry = (Entry) iterator.next(); - TreePath entryPath = (TreePath) entry.getKey(); + for (Entry<TreePath, List<ViewerUpdateMonitor>> entry : fRequestsInProgress.entrySet()) { + TreePath entryPath = entry.getKey(); if (entryPath.startsWith(path, null)) { - List requests = (List) entry.getValue(); - Iterator reqIter = requests.iterator(); + List<ViewerUpdateMonitor> requests = entry.getValue(); + Iterator<ViewerUpdateMonitor> reqIter = requests.iterator(); while (reqIter.hasNext()) { // Cancel update and remove from requests list. Removing from // fRequestsInProgress ensures that isRequestBlocked() won't be triggered // by a canceled update. - ((IRequest) reqIter.next()).cancel(); + reqIter.next().cancel(); reqIter.remove(); } } } - List purge = new ArrayList(); - iterator = fWaitingRequests.keySet().iterator(); - while (iterator.hasNext()) { - TreePath entryPath = (TreePath) iterator.next(); + List<TreePath> purge = new ArrayList<TreePath>(); + for (TreePath entryPath : fWaitingRequests.keySet()) { if (entryPath.startsWith(path, null)) { purge.add(entryPath); } } - iterator = purge.iterator(); - while (iterator.hasNext()) { - fWaitingRequests.remove(iterator.next()); + for (TreePath tp : purge) { + fWaitingRequests.remove(tp); } fStateTracker.cancelStateSubtreeUpdates(path); @@ -769,20 +798,20 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon Assert.isTrue(getViewer().getDisplay().getThread() == Thread.currentThread()); TreePath schedulingPath = update.getSchedulingPath(); - List requests = (List) fWaitingRequests.get(schedulingPath); + List<ViewerUpdateMonitor> requests = fWaitingRequests.get(schedulingPath); if (requests == null) { - requests = new LinkedList(); + requests = new LinkedList<ViewerUpdateMonitor>(); requests.add(update); fWaitingRequests.put(schedulingPath, requests); - List inProgressList = (List)fRequestsInProgress.get(schedulingPath); + List<ViewerUpdateMonitor> inProgressList = fRequestsInProgress.get(schedulingPath); if (inProgressList != null) { int staleUpdateIndex = inProgressList.indexOf(update); if (staleUpdateIndex >= 0) { // Cancel update and remove from requests list. Removing from // fRequestsInProgress ensures that isRequestBlocked() won't be triggered // by a canceled update. - ViewerUpdateMonitor staleUpdate = (ViewerUpdateMonitor)inProgressList.remove(staleUpdateIndex); + ViewerUpdateMonitor staleUpdate = inProgressList.remove(staleUpdateIndex); staleUpdate.cancel(); // Note: Do not reset the inProgressList to null. This would cause the // updateStarted() method to think that a new update sequence is @@ -792,8 +821,11 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } if (inProgressList == null || inProgressList.isEmpty()) { getViewer().getDisplay().asyncExec(new Runnable() { - public void run() { - if (isDisposed()) return; + @Override + public void run() { + if (isDisposed()) { + return; + } trigger(update.getSchedulingPath()); } }); @@ -813,10 +845,8 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * toCoalesce parameter request. Either way the returned request needs to be added to the * waiting requests list. */ - private ViewerUpdateMonitor coalesce(List requests, ViewerUpdateMonitor toCoalesce) { - Iterator reqIter = requests.iterator(); - while (reqIter.hasNext()) { - ViewerUpdateMonitor waiting = (ViewerUpdateMonitor) reqIter.next(); + private ViewerUpdateMonitor coalesce(List<ViewerUpdateMonitor> requests, ViewerUpdateMonitor toCoalesce) { + for (ViewerUpdateMonitor waiting : requests) { if (waiting.coalesce(toCoalesce)) { requests.remove(waiting); // coalesced with existing request, done @@ -836,8 +866,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon */ boolean areChildrenUpdatesPending(TreePath path) { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); - - List requests = (List) fWaitingRequests.get(path); + List<ViewerUpdateMonitor> requests = fWaitingRequests.get(path); if (requests != null) { for (int i = 0; i < requests.size(); i++) { if (requests.get(i) instanceof ChildrenUpdate) { @@ -845,7 +874,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } } } - requests = (List) fRequestsInProgress.get(path); + requests = fRequestsInProgress.get(path); if (requests != null) { int numChildrenUpdateRequests = 0; for (int i = 0; i < requests.size(); i++) { @@ -877,22 +906,20 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon if (fWaitingRequests.isEmpty()) { return; } - List waiting = (List) fWaitingRequests.get(schedulingPath); + List<ViewerUpdateMonitor> waiting = fWaitingRequests.get(schedulingPath); if (waiting == null) { // no waiting, update the entry with the shortest path int length = Integer.MAX_VALUE; - Iterator entries = fWaitingRequests.entrySet().iterator(); - Entry candidate = null; - while (entries.hasNext()) { - Entry entry = (Entry) entries.next(); - TreePath key = (TreePath) entry.getKey(); + Entry<TreePath, List<ViewerUpdateMonitor>> candidate = null; + for (Entry<TreePath, List<ViewerUpdateMonitor>> entry : fWaitingRequests.entrySet()) { + TreePath key = entry.getKey(); if (key.getSegmentCount() < length && !isRequestBlocked(key)) { candidate = entry; length = key.getSegmentCount(); } } if (candidate != null) { - startHighestPriorityRequest((TreePath) candidate.getKey(), (List) candidate.getValue()); + startHighestPriorityRequest(candidate.getKey(), candidate.getValue()); } } else if (!isRequestBlocked(schedulingPath)) { // start the highest priority request @@ -908,14 +935,14 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon */ private boolean isRequestBlocked(TreePath requestPath) { TreePath parentPath = requestPath; - List parentRequests = (List)fRequestsInProgress.get(parentPath); + List<ViewerUpdateMonitor> parentRequests = fRequestsInProgress.get(parentPath); while (parentRequests == null || parentRequests.isEmpty()) { parentPath = parentPath.getParentPath(); if (parentPath == null) { // no running requests: start request return false; } - parentRequests = (List)fRequestsInProgress.get(parentPath); + parentRequests = fRequestsInProgress.get(parentPath); } return true; } @@ -924,12 +951,10 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * @param key the {@link TreePath} * @param waiting the list of waiting requests */ - private void startHighestPriorityRequest(TreePath key, List waiting) { + private void startHighestPriorityRequest(TreePath key, List<ViewerUpdateMonitor> waiting) { int priority = 4; ViewerUpdateMonitor next = null; - Iterator requests = waiting.iterator(); - while (requests.hasNext()) { - ViewerUpdateMonitor vu = (ViewerUpdateMonitor) requests.next(); + for (ViewerUpdateMonitor vu : waiting) { if (vu.getPriority() < priority) { next = vu; priority = next.getPriority(); @@ -971,12 +996,12 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon private void rescheduleUpdates(TreePath parentPath, int modelIndex) { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); - List requests = (List) fRequestsInProgress.get(parentPath); - List reCreate = null; + List<ViewerUpdateMonitor> requests = fRequestsInProgress.get(parentPath); + List<IChildrenUpdate> reCreate = null; if (requests != null) { - Iterator iterator = requests.iterator(); + Iterator<ViewerUpdateMonitor> iterator = requests.iterator(); while (iterator.hasNext()) { - IViewerUpdate update = (IViewerUpdate) iterator.next(); + ViewerUpdateMonitor update = iterator.next(); if (update instanceof IChildrenUpdate) { IChildrenUpdate childrenUpdate = (IChildrenUpdate) update; if (childrenUpdate.getOffset() > modelIndex) { @@ -986,7 +1011,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon childrenUpdate.cancel(); iterator.remove(); if (reCreate == null) { - reCreate = new ArrayList(); + reCreate = new ArrayList<IChildrenUpdate>(); } reCreate.add(childrenUpdate); if (DebugUIPlugin.DEBUG_CONTENT_PROVIDER && DebugUIPlugin.DEBUG_TEST_PRESENTATION_ID(getPresentationContext())) { @@ -996,11 +1021,9 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } } } - requests = (List) fWaitingRequests.get(parentPath); + requests = fWaitingRequests.get(parentPath); if (requests != null) { - Iterator iterator = requests.iterator(); - while (iterator.hasNext()) { - IViewerUpdate update = (IViewerUpdate) iterator.next(); + for (ViewerUpdateMonitor update : requests) { if (update instanceof IChildrenUpdate) { IChildrenUpdate childrenUpdate = (IChildrenUpdate) update; if (childrenUpdate.getOffset() > modelIndex) { @@ -1016,9 +1039,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon // have to do this last else the requests would be waiting and // get modified. if (reCreate != null) { - Iterator iterator = reCreate.iterator(); - while (iterator.hasNext()) { - IChildrenUpdate childrenUpdate = (IChildrenUpdate) iterator.next(); + for (IChildrenUpdate childrenUpdate : reCreate) { int start = childrenUpdate.getOffset() - 1; int end = start + childrenUpdate.getLength(); for (int i = start; i < end; i++) { @@ -1071,37 +1092,37 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); TreePath parentPath = path.getParentPath(); - List requests = (List) fWaitingRequests.get(path); + List<ViewerUpdateMonitor> requests = fWaitingRequests.get(path); if (requests != null) { for (int i = 0; i < requests.size(); i++) { - ViewerUpdateMonitor update = (ViewerUpdateMonitor) requests.get(i); + ViewerUpdateMonitor update = requests.get(i); if (update instanceof ChildrenUpdate) { return true; } } } - requests = (List) fWaitingRequests.get(parentPath); + requests = fWaitingRequests.get(parentPath); if (requests != null) { for (int i = 0; i < requests.size(); i++) { - ViewerUpdateMonitor update = (ViewerUpdateMonitor) requests.get(i); + ViewerUpdateMonitor update = requests.get(i); if (update.containsUpdate(path)) { return true; } } } - requests = (List) fRequestsInProgress.get(path); + requests = fRequestsInProgress.get(path); if (requests != null) { for (int i = 0; i < requests.size(); i++) { - ViewerUpdateMonitor update = (ViewerUpdateMonitor) requests.get(i); + ViewerUpdateMonitor update = requests.get(i); if (update instanceof ChildrenUpdate) { return true; } } } - requests = (List) fRequestsInProgress.get(parentPath); + requests = fRequestsInProgress.get(parentPath); if (requests != null) { for (int i = 0; i < requests.size(); i++) { - ViewerUpdateMonitor update = (ViewerUpdateMonitor) requests.get(i); + ViewerUpdateMonitor update = requests.get(i); if (update.getElement().equals(path.getLastSegment())) { return true; } @@ -1597,6 +1618,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILazyTreePathContentProvider#getParents(java.lang.Object) */ + @Override public TreePath[] getParents(Object element) { return null; } @@ -1604,6 +1626,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILazyTreePathContentProvider#updateChildCount(org.eclipse.jface.viewers.TreePath, int) */ + @Override public void updateChildCount(TreePath treePath, int currentChildCount) { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); @@ -1616,6 +1639,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILazyTreePathContentProvider#updateElement(org.eclipse.jface.viewers.TreePath, int) */ + @Override public void updateElement(TreePath parentPath, int viewIndex) { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); @@ -1629,6 +1653,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILazyTreePathContentProvider#updateHasChildren(org.eclipse.jface.viewers.TreePath) */ + @Override public void updateHasChildren(TreePath path) { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); @@ -1648,12 +1673,15 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon Display display; Runnable updateJob = null; synchronized(this) { - if (isDisposed()) return; + if (isDisposed()) { + return; + } display = getViewer().getDisplay(); fCompletedUpdates.add(update); if (fCompletedUpdatesRunnable == null) { fCompletedUpdatesRunnable = new Runnable() { - public void run() { + @Override + public void run() { if (!isDisposed()) { performUpdates(); } @@ -1678,19 +1706,19 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon private void performUpdates() { Assert.isTrue( getViewer().getDisplay().getThread() == Thread.currentThread() ); - List jobCompletedUpdates; + List<ViewerUpdateMonitor> jobCompletedUpdates; synchronized(this) { if (isDisposed()) { return; } jobCompletedUpdates = fCompletedUpdates; fCompletedUpdatesRunnable = null; - fCompletedUpdates = new ArrayList(); + fCompletedUpdates = new ArrayList<ViewerUpdateMonitor>(); } // necessary to check if viewer is disposed try { for (int i = 0; i < jobCompletedUpdates.size(); i++) { - ViewerUpdateMonitor completedUpdate = (ViewerUpdateMonitor)jobCompletedUpdates.get(i); + ViewerUpdateMonitor completedUpdate = jobCompletedUpdates.get(i); if (!completedUpdate.isCanceled() && !isDisposed()) { IStatus status = completedUpdate.getStatus(); if (status == null || status.isOK()) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java index 2b37f0e03..3aeea632b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,10 +14,10 @@ package org.eclipse.debug.internal.ui.viewers.model; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.ISafeRunnable; @@ -54,28 +54,28 @@ public class TreeModelLabelProvider extends ColumnLabelProvider /** * Note: access this variable should be synchronized with <code>this</code>. */ - private List fComplete; + private List<ILabelUpdate> fComplete; /** * Cache of images used for elements in this label provider. Label updates * use the method <code>getImage(...)</code> to cache images for * image descriptors. The images are disposed with this label provider. */ - private Map fImageCache = new HashMap(); + private Map<ImageDescriptor, Image> fImageCache = new HashMap<ImageDescriptor, Image>(); /** * Cache of the fonts used for elements in this label provider. Label updates * use the method <code>getFont(...)</code> to cache fonts for * FontData objects. The fonts are disposed with this label provider. */ - private Map fFontCache = new HashMap(); + private Map<FontData, Font> fFontCache = new HashMap<FontData, Font>(); /** * Cache of the colors used for elements in this label provider. Label updates * use the method <code>getColor(...)</code> to cache colors for * RGB values. The colors are disposed with this label provider. */ - private Map fColorCache = new HashMap(); + private Map<RGB, Color> fColorCache = new HashMap<RGB, Color>(); /** * Label listeners @@ -86,7 +86,7 @@ public class TreeModelLabelProvider extends ColumnLabelProvider * Updates waiting to be sent to the label provider. The map contains * lists of updates, keyed using the provider. */ - private Map fPendingUpdates = new HashMap(); + private Map<IElementLabelProvider, List<ILabelUpdate>> fPendingUpdates = new HashMap<IElementLabelProvider, List<ILabelUpdate>>(); /** * A runnable that will send the label update requests. @@ -98,7 +98,7 @@ public class TreeModelLabelProvider extends ColumnLabelProvider /** * List of updates in progress */ - private List fUpdatesInProgress = new ArrayList(); + private List<ILabelUpdate> fUpdatesInProgress = new ArrayList<ILabelUpdate>(); /** * Delta visitor actively cancels the outstanding label updates for @@ -108,7 +108,8 @@ public class TreeModelLabelProvider extends ColumnLabelProvider /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelDeltaVisitor#visit(org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta, int) */ - public boolean visit(IModelDelta delta, int depth) { + @Override + public boolean visit(IModelDelta delta, int depth) { if ((delta.getFlags() & IModelDelta.CONTENT) > 0) { cancelElementUpdates(delta.getElement(), true); return false; @@ -141,11 +142,12 @@ public class TreeModelLabelProvider extends ColumnLabelProvider * @param descriptor image descriptor or <code>null</code> * @return image or <code>null</code> */ + @Override public Image getImage(ImageDescriptor descriptor) { if (descriptor == null) { return null; } - Image image = (Image) fImageCache.get(descriptor); + Image image = fImageCache.get(descriptor); if (image == null) { image = new Image(getDisplay(), descriptor.getImageData()); fImageCache.put(descriptor, image); @@ -169,11 +171,12 @@ public class TreeModelLabelProvider extends ColumnLabelProvider * @param fontData font data or <code>null</code> * @return font font or <code>null</code> */ + @Override public Font getFont(FontData fontData) { if (fontData == null) { return null; } - Font font = (Font) fFontCache.get(fontData); + Font font = fFontCache.get(fontData); if (font == null) { font = new Font(getDisplay(), fontData); fFontCache.put(fontData, font); @@ -188,11 +191,12 @@ public class TreeModelLabelProvider extends ColumnLabelProvider * @param rgb RGB or <code>null</code> * @return color or <code>null</code> */ + @Override public Color getColor(RGB rgb) { if (rgb == null) { return null; } - Color color = (Color) fColorCache.get(rgb); + Color color = fColorCache.get(rgb); if (color == null) { color = new Color(getDisplay(), rgb); fColorCache.put(rgb, color); @@ -203,60 +207,48 @@ public class TreeModelLabelProvider extends ColumnLabelProvider /* (non-Javadoc) * @see org.eclipse.jface.viewers.BaseLabelProvider#dispose() */ + @Override public void dispose() { Assert.isTrue(fViewer.getDisplay().getThread() == Thread.currentThread()); fViewer.removeModelChangedListener(this); fViewer = null; - List complete = null; + List<ILabelUpdate> complete = null; synchronized(this) { complete = fComplete; fComplete = null; } if (complete != null) { - for (Iterator itr = complete.iterator(); itr.hasNext();) { - ((ILabelUpdate)itr.next()).cancel(); - } + for (ILabelUpdate update : complete) { + update.cancel(); + } } - - Iterator updatesInProgress = fUpdatesInProgress.iterator(); - while (updatesInProgress.hasNext()) { - ILabelUpdate currentUpdate = (ILabelUpdate) updatesInProgress.next(); + for (ILabelUpdate currentUpdate : fUpdatesInProgress) { currentUpdate.cancel(); } if (fPendingUpdatesRunnable != null) { fPendingUpdatesRunnable = null; } - for (Iterator itr = fPendingUpdates.values().iterator(); itr.hasNext();) { - List updateList = (List)itr.next(); - for (Iterator listItr = updateList.iterator(); listItr.hasNext();) { - ((LabelUpdate)listItr.next()).cancel(); + for (List<ILabelUpdate> updateList : fPendingUpdates.values()) { + for (ILabelUpdate update : updateList) { + update.cancel(); } } fPendingUpdates.clear(); - Iterator images = fImageCache.values().iterator(); - while (images.hasNext()) { - Image image = (Image) images.next(); + for (Image image : fImageCache.values()) { image.dispose(); } fImageCache.clear(); - - Iterator fonts = fFontCache.values().iterator(); - while (fonts.hasNext()) { - Font font = (Font) fonts.next(); + for (Font font : fFontCache.values()) { font.dispose(); } fFontCache.clear(); - - Iterator colors = fColorCache.values().iterator(); - while (colors.hasNext()) { - Color color = (Color) colors.next(); + for (Color color : fColorCache.values()) { color.dispose(); } fColorCache.clear(); - super.dispose(); } @@ -264,10 +256,12 @@ public class TreeModelLabelProvider extends ColumnLabelProvider return fViewer == null; } + @Override public void update(ViewerCell cell) { // NOT USED - the viewer updates each row instead } + @Override public boolean update(TreePath elementPath) { Assert.isTrue(fViewer.getDisplay().getThread() == Thread.currentThread()); @@ -277,15 +271,18 @@ public class TreeModelLabelProvider extends ColumnLabelProvider Object element = elementPath.getLastSegment(); IElementLabelProvider presentation = ViewerAdapterService.getLabelProvider(element); if (presentation != null) { - List updates = (List)fPendingUpdates.get(presentation); + List<ILabelUpdate> updates = fPendingUpdates.get(presentation); if (updates == null) { - updates = new LinkedList(); + updates = new LinkedList<ILabelUpdate>(); fPendingUpdates.put(presentation, updates); } updates.add(new LabelUpdate(fViewer.getInput(), elementPath, this, visibleColumns, fViewer.getPresentationContext())); fPendingUpdatesRunnable = new Runnable() { - public void run() { - if (isDisposed()) return; + @Override + public void run() { + if (isDisposed()) { + return; + } startRequests(this); } }; @@ -302,10 +299,7 @@ public class TreeModelLabelProvider extends ColumnLabelProvider */ private void cancelPathUpdates(TreePath elementPath) { Assert.isTrue(fViewer.getDisplay().getThread() == Thread.currentThread()); - - Iterator updatesInProgress = fUpdatesInProgress.iterator(); - while (updatesInProgress.hasNext()) { - ILabelUpdate currentUpdate = (ILabelUpdate) updatesInProgress.next(); + for (ILabelUpdate currentUpdate : fUpdatesInProgress) { if (elementPath.equals(currentUpdate.getElementPath())) { currentUpdate.cancel(); } @@ -340,15 +334,14 @@ public class TreeModelLabelProvider extends ColumnLabelProvider if (runnable != fPendingUpdatesRunnable) { return; } - if (!fPendingUpdates.isEmpty()) { - for (Iterator itr = fPendingUpdates.keySet().iterator(); itr.hasNext();) { - IElementLabelProvider provider = (IElementLabelProvider)itr.next(); - List list = (List)fPendingUpdates.get(provider); - for (Iterator listItr = list.iterator(); listItr.hasNext();) { - updateStarted((ILabelUpdate)listItr.next()); + List<ILabelUpdate> list = null; + for (Entry<IElementLabelProvider, List<ILabelUpdate>> entry : fPendingUpdates.entrySet()) { + list = entry.getValue(); + for (ILabelUpdate update : list) { + updateStarted(update); } - provider.update( (ILabelUpdate[])list.toArray(new ILabelUpdate[list.size()]) ); + entry.getKey().update(list.toArray(new ILabelUpdate[list.size()])); } } fPendingUpdates.clear(); @@ -364,10 +357,7 @@ public class TreeModelLabelProvider extends ColumnLabelProvider * of the update */ private void cancelElementUpdates(Object element, boolean searchFullPath) { - Iterator updatesInProgress = fUpdatesInProgress.iterator(); - while (updatesInProgress.hasNext()) { - ILabelUpdate currentUpdate = (ILabelUpdate) updatesInProgress.next(); - + for (ILabelUpdate currentUpdate : fUpdatesInProgress) { if (searchFullPath) { if (element.equals(fViewer.getInput())) { currentUpdate.cancel(); @@ -403,24 +393,28 @@ public class TreeModelLabelProvider extends ColumnLabelProvider * @param update Update that is to be completed. */ synchronized void complete(ILabelUpdate update) { - if (fViewer == null) return; + if (fViewer == null) { + return; + } if (fComplete == null) { - fComplete = new LinkedList(); + fComplete = new LinkedList<ILabelUpdate>(); fViewer.getDisplay().asyncExec(new Runnable() { - public void run() { - if (isDisposed()) return; - List updates = null; + @Override + public void run() { + if (isDisposed()) { + return; + } + List<ILabelUpdate> updates = null; synchronized (TreeModelLabelProvider.this) { updates = fComplete; fComplete = null; } - for (Iterator itr = updates.iterator(); itr.hasNext();) { - LabelUpdate itrUpdate = (LabelUpdate)itr.next(); + for (ILabelUpdate itrUpdate : updates) { if (itrUpdate.isCanceled()) { updateComplete(itrUpdate); } else { - itrUpdate.performUpdate(); + ((LabelUpdate) itrUpdate).performUpdate(); } } } @@ -429,10 +423,12 @@ public class TreeModelLabelProvider extends ColumnLabelProvider fComplete.add(update); } + @Override public void addLabelUpdateListener(ILabelUpdateListener listener) { fLabelListeners.add(listener); } + @Override public void removeLabelUpdateListener(ILabelUpdateListener listener) { fLabelListeners.remove(listener); } @@ -486,6 +482,7 @@ public class TreeModelLabelProvider extends ColumnLabelProvider for (int i = 0; i < listeners.length; i++) { final ILabelUpdateListener listener = (ILabelUpdateListener) listeners[i]; SafeRunner.run(new ISafeRunnable() { + @Override public void run() throws Exception { switch (type) { case TreeModelContentProvider.UPDATE_SEQUENCE_BEGINS: @@ -500,8 +497,11 @@ public class TreeModelLabelProvider extends ColumnLabelProvider case TreeModelContentProvider.UPDATE_COMPLETE: listener.labelUpdateComplete(update); break; + default: + break; } } + @Override public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } @@ -510,6 +510,7 @@ public class TreeModelLabelProvider extends ColumnLabelProvider } } + @Override public void modelChanged(IModelDelta delta, IModelProxy proxy) { delta.accept(fCancelPendingUpdatesVisitor); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerAdapterService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerAdapterService.java index 539e806c4..15b304571 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerAdapterService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerAdapterService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -154,7 +154,7 @@ public class ViewerAdapterService { * @param type adapter type * @return adapter or <code>null</code> */ - private static Object getAdapter(Object element, Class type) { + private static Object getAdapter(Object element, Class<?> type) { return DebugPlugin.getAdapter(element, type); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerInputUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerInputUpdate.java index dcf9a2015..3c46cf1b9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerInputUpdate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerInputUpdate.java @@ -64,7 +64,8 @@ public class ViewerInputUpdate extends Request implements IViewerInputUpdate { * When <code>done()</code> is called, the viewer must be informed that the update is complete in the UI thread. */ protected WorkbenchJob fViewerInputUpdateJob = new WorkbenchJob("Asynchronous viewer input update") { //$NON-NLS-1$ - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { if (ViewerInputUpdate.this.isCanceled()){ return Status.CANCEL_STATUS; } @@ -92,6 +93,7 @@ public class ViewerInputUpdate extends Request implements IViewerInputUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputUpdate#getPresentationContext() */ + @Override public IPresentationContext getPresentationContext() { return fContext; } @@ -99,7 +101,8 @@ public class ViewerInputUpdate extends Request implements IViewerInputUpdate { /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#done() */ - public final void done() { + @Override + public final void done() { synchronized (this) { if (isDone()) { return; @@ -121,6 +124,7 @@ public class ViewerInputUpdate extends Request implements IViewerInputUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputUpdate#getElement() */ + @Override public Object getElement() { return fSource; } @@ -128,6 +132,7 @@ public class ViewerInputUpdate extends Request implements IViewerInputUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElementPath() */ + @Override public TreePath getElementPath() { return TreePath.EMPTY; } @@ -135,6 +140,7 @@ public class ViewerInputUpdate extends Request implements IViewerInputUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputUpdate#setViewerInput(java.lang.Object) */ + @Override public void setInputElement(Object element) { fInputElement = element; } @@ -142,6 +148,7 @@ public class ViewerInputUpdate extends Request implements IViewerInputUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputUpdate#getViewerInput() */ + @Override public Object getInputElement() { return fInputElement; } @@ -149,6 +156,7 @@ public class ViewerInputUpdate extends Request implements IViewerInputUpdate { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getViewerInput() */ + @Override public Object getViewerInput() { return fViewerInput; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerStateTracker.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerStateTracker.java index e69c3dc53..b208e5af4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerStateTracker.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerStateTracker.java @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.viewers.model; @@ -119,7 +120,7 @@ class ViewerStateTracker { /** * LRU cache for viewer states */ - class LRUMap extends LinkedHashMap { + class LRUMap<K, V> extends LinkedHashMap<K, V> { private static final long serialVersionUID = 1L; private int fMaxSize; @@ -129,7 +130,8 @@ class ViewerStateTracker { fMaxSize = maxSize; } - protected boolean removeEldestEntry(Entry eldest) { + @Override + protected boolean removeEldestEntry(Entry<K, V> eldest) { return size() > fMaxSize; } } @@ -146,7 +148,7 @@ class ViewerStateTracker { /** * Map of viewer states keyed by viewer input mementos */ - private Map fViewerStates = new LRUMap(20); + private Map<String, ModelDelta> fViewerStates = new LRUMap<String, ModelDelta>(20); /** * Pending viewer state to be restored @@ -173,7 +175,7 @@ class ViewerStateTracker { /** * Set of IMementoManager's that are currently saving state */ - private Set fPendingStateSaves = new HashSet(); + private Set<IElementMementoCollector> fPendingStateSaves = new HashSet<IElementMementoCollector>(); /** * Used to queue a viewer input for state restore @@ -193,7 +195,8 @@ class ViewerStateTracker { TreePath fPath; IModelDelta fDelta; - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (obj instanceof CompareRequestKey) { CompareRequestKey key = (CompareRequestKey) obj; return key.fDelta.equals(fDelta) && key.fPath.equals(fPath); @@ -201,7 +204,8 @@ class ViewerStateTracker { return false; } - public int hashCode() { + @Override + public int hashCode() { return fDelta.hashCode() + fPath.hashCode(); } } @@ -209,7 +213,7 @@ class ViewerStateTracker { /** * Compare requests that are currently running. */ - private Map fCompareRequestsInProgress = new LinkedHashMap(); + private Map<CompareRequestKey, ElementCompareRequest> fCompareRequestsInProgress = new LinkedHashMap<CompareRequestKey, ElementCompareRequest>(); /** @@ -217,14 +221,12 @@ class ViewerStateTracker { */ void dispose() { Assert.isTrue( fContentProvider.getViewer().getDisplay().getThread() == Thread.currentThread() ); - - for (Iterator itr = fPendingStateSaves.iterator(); itr.hasNext(); ) { - ((IElementMementoCollector)itr.next()).cancel(); + for (IElementMementoCollector emc : fPendingStateSaves) { + emc.cancel(); } fStateUpdateListeners.clear(); - - for (Iterator itr = fCompareRequestsInProgress.values().iterator(); itr.hasNext();) { - ((ElementCompareRequest)itr.next()).cancel(); + for (ElementCompareRequest ecr : fCompareRequestsInProgress.values()) { + ecr.cancel(); } fCompareRequestsInProgress.clear(); @@ -261,8 +263,11 @@ class ViewerStateTracker { * IMementoManager#requestComplete(org.eclipse.debug.internal.ui * .viewers.model.provisional.IElementMementoRequest) */ - public void requestComplete(ElementMementoRequest request) { - if (fContentProvider.isDisposed()) return; + @Override + public void requestComplete(ElementMementoRequest request) { + if (fContentProvider.isDisposed()) { + return; + } notifyStateUpdate(input, TreeModelContentProvider.UPDATE_COMPLETE, request); @@ -272,7 +277,7 @@ class ViewerStateTracker { try { keyMemento.save(writer); final String keyMementoString = writer.toString(); - ModelDelta stateDelta = (ModelDelta) fViewerStates.get(keyMementoString); + ModelDelta stateDelta = fViewerStates.get(keyMementoString); if (stateDelta != null) { if (DebugUIPlugin.DEBUG_STATE_SAVE_RESTORE && DebugUIPlugin.DEBUG_TEST_PRESENTATION_ID(fContentProvider.getPresentationContext())) { DebugUIPlugin.trace("STATE RESTORE INPUT COMARE ENDED : " + fRequest + " - MATCHING STATE FOUND"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -281,9 +286,10 @@ class ViewerStateTracker { // Process start of restore in an async cycle because we may still be inside inputChanged() // call. I.e. the "input.equals(fContentProvider.getViewer().getInput())" test may fail. fContentProvider.getViewer().getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { if (!fContentProvider.isDisposed() && input.equals(fContentProvider.getViewer().getInput())) { - ModelDelta stateDelta2 = (ModelDelta) fViewerStates.remove(keyMementoString); + ModelDelta stateDelta2 = fViewerStates.remove(keyMementoString); if (stateDelta2 != null) { if (DebugUIPlugin.DEBUG_STATE_SAVE_RESTORE && DebugUIPlugin.DEBUG_TEST_PRESENTATION_ID(fContentProvider.getPresentationContext())) { DebugUIPlugin.trace("STATE RESTORE BEGINS"); //$NON-NLS-1$ @@ -321,7 +327,8 @@ class ViewerStateTracker { * org.eclipse.debug.internal.ui.viewers.model.provisional.viewers * .IMementoManager#processReqeusts() */ - public void processReqeusts() { + @Override + public void processReqeusts() { notifyStateUpdate(input, STATE_RESTORE_SEQUENCE_BEGINS, null); if (DebugUIPlugin.DEBUG_STATE_SAVE_RESTORE && DebugUIPlugin.DEBUG_TEST_PRESENTATION_ID(fContentProvider.getPresentationContext())) { DebugUIPlugin.trace("STATE RESTORE INPUT COMARE BEGIN : " + fRequest); //$NON-NLS-1$ @@ -339,11 +346,13 @@ class ViewerStateTracker { * IMementoManager#addRequest(org.eclipse.debug.internal.ui.viewers * .model.provisional.IElementMementoRequest) */ - public void addRequest(ElementMementoRequest req) { + @Override + public void addRequest(ElementMementoRequest req) { fRequest = req; } - public void cancel() { + @Override + public void cancel() { // not used } @@ -364,7 +373,10 @@ class ViewerStateTracker { * @param path Path to subtree to restore. */ void appendToPendingStateDelta(final TreePath path) { - if (fContentProvider.getViewer() == null) return; // Not initialized yet. + if (fContentProvider.getViewer() == null) + { + return; // Not initialized yet. + } if (DebugUIPlugin.DEBUG_STATE_SAVE_RESTORE && DebugUIPlugin.DEBUG_TEST_PRESENTATION_ID(fContentProvider.getPresentationContext())) { DebugUIPlugin.trace("STATE APPEND BEGIN: " + path.getLastSegment()); //$NON-NLS-1$ @@ -391,7 +403,8 @@ class ViewerStateTracker { // markers are used by the restore logic to know when a delta node can // be removed. delta.accept(new IModelDeltaVisitor() { - public boolean visit(IModelDelta d, int depth) { + @Override + public boolean visit(IModelDelta d, int depth) { if ((d.getFlags() & IModelDelta.EXPAND) != 0) { ((ModelDelta) d).setFlags(d.getFlags() | IModelDelta.CONTENT); } @@ -415,7 +428,8 @@ class ViewerStateTracker { // attributes into the pending delta. if (path.getSegmentCount() > 0) { fPendingState.accept( new IModelDeltaVisitor() { - public boolean visit(IModelDelta pendingDeltaNode, int depth) { + @Override + public boolean visit(IModelDelta pendingDeltaNode, int depth) { TreePath pendingDeltaPath = fContentProvider.getViewerTreePath(pendingDeltaNode); if (path.startsWith(pendingDeltaPath, null)) { @@ -432,7 +446,8 @@ class ViewerStateTracker { // Copy the pending state into the new appended state. fPendingState.accept( new IModelDeltaVisitor() { - public boolean visit(IModelDelta pendingDeltaNode, int depth) { + @Override + public boolean visit(IModelDelta pendingDeltaNode, int depth) { // Skip the top element if (pendingDeltaNode.getParentDelta() == null) { return true; @@ -495,8 +510,8 @@ class ViewerStateTracker { * @param input the {@link ModelDelta} input */ protected void saveViewerState(Object input) { - for (Iterator itr = fCompareRequestsInProgress.values().iterator(); itr.hasNext();) { - ((ElementCompareRequest) itr.next()).cancel(); + for (Iterator<ElementCompareRequest> itr = fCompareRequestsInProgress.values().iterator(); itr.hasNext();) { + itr.next().cancel(); itr.remove(); } @@ -548,7 +563,8 @@ class ViewerStateTracker { } IModelDeltaVisitor pendingStateVisitor = new IModelDeltaVisitor() { - public boolean visit(IModelDelta pendingDeltaNode, int depth) { + @Override + public boolean visit(IModelDelta pendingDeltaNode, int depth) { // Ignore the top element. if (pendingDeltaNode.getParentDelta() == null) { return true; @@ -612,7 +628,8 @@ class ViewerStateTracker { private void clearRevealFlag(ModelDelta saveRootDelta) { IModelDeltaVisitor clearDeltaVisitor = new IModelDeltaVisitor() { - public boolean visit(IModelDelta delta, int depth) { + @Override + public boolean visit(IModelDelta delta, int depth) { if ((delta.getFlags() & IModelDelta.REVEAL) != 0) { ((ModelDelta) delta).setFlags(delta.getFlags() & ~IModelDelta.REVEAL); } @@ -624,7 +641,7 @@ class ViewerStateTracker { private ModelDelta findSubDeltaParent(ModelDelta destinationDeltaRoot, IModelDelta subDelta) { // Create a path of elements to the sub-delta. - LinkedList deltaPath = new LinkedList(); + LinkedList<IModelDelta> deltaPath = new LinkedList<IModelDelta>(); IModelDelta delta = subDelta; while (delta.getParentDelta() != null) { delta = delta.getParentDelta(); @@ -633,12 +650,12 @@ class ViewerStateTracker { // For each element in the path of the sub-delta, find the corresponding // element in the destination delta - Iterator itr = deltaPath.iterator(); + Iterator<IModelDelta> itr = deltaPath.iterator(); // Skip the root element itr.next(); ModelDelta saveDelta = destinationDeltaRoot; while (saveDelta != null && itr.hasNext()) { - IModelDelta itrDelta = (IModelDelta) itr.next(); + IModelDelta itrDelta = itr.next(); saveDelta = saveDelta.getChildDelta(itrDelta.getElement(), itrDelta.getIndex()); } return saveDelta; @@ -682,7 +699,7 @@ class ViewerStateTracker { /** * list of memento fRequests */ - private List fRequests = new ArrayList(); + private List<IElementMementoRequest> fRequests = new ArrayList<IElementMementoRequest>(); /** * Flag indicating whether the encoding of delta has been canceled. @@ -698,7 +715,8 @@ class ViewerStateTracker { * #requestComplete(org.eclipse.debug.internal.ui.viewers * .model.provisional.IElementMementoRequest) */ - public void requestComplete(ElementMementoRequest request) { + @Override + public void requestComplete(ElementMementoRequest request) { Assert.isTrue( fContentProvider.getViewer().getDisplay().getThread() == Thread.currentThread() ); notifyStateUpdate(input, TreeModelContentProvider.UPDATE_COMPLETE, request); @@ -731,7 +749,8 @@ class ViewerStateTracker { } } - public void cancel() { + @Override + public void cancel() { Assert.isTrue( fContentProvider.getViewer().getDisplay().getThread() == Thread.currentThread() ); if (fCanceled) { @@ -739,9 +758,7 @@ class ViewerStateTracker { } fCanceled = true; - Iterator iterator = fRequests.iterator(); - while (iterator.hasNext()) { - IElementMementoRequest req = (IElementMementoRequest) iterator.next(); + for (IElementMementoRequest req : fRequests) { req.cancel(); } fRequests.clear(); @@ -758,32 +775,28 @@ class ViewerStateTracker { * org.eclipse.debug.internal.ui.viewers.model.provisional.viewers * .IMementoManager#processReqeusts() */ - public void processReqeusts() { + @Override + public void processReqeusts() { Assert.isTrue( fContentProvider.getViewer().getDisplay().getThread() == Thread.currentThread() ); - Map providers = new HashMap(); - Iterator iterator = fRequests.iterator(); - while (iterator.hasNext()) { - IElementMementoRequest request = (IElementMementoRequest) iterator.next(); + Map<IElementMementoProvider, List<IElementMementoRequest>> providers = new HashMap<IElementMementoProvider, List<IElementMementoRequest>>(); + for (IElementMementoRequest request : fRequests) { notifyStateUpdate(input, TreeModelContentProvider.UPDATE_BEGINS, request); IElementMementoProvider provider = ViewerAdapterService.getMementoProvider(request.getElement()); if (provider == null) { provider = defaultProvider; } - List reqs = (List) providers.get(provider); + List<IElementMementoRequest> reqs = providers.get(provider); if (reqs == null) { - reqs = new ArrayList(); + reqs = new ArrayList<IElementMementoRequest>(); providers.put(provider, reqs); } reqs.add(request); } - iterator = providers.entrySet().iterator(); - while (iterator.hasNext()) { - Entry entry = (Entry) iterator.next(); - IElementMementoProvider provider = (IElementMementoProvider) entry.getKey(); - List reqs = (List) entry.getValue(); - provider.encodeElements((IElementMementoRequest[]) reqs.toArray(new IElementMementoRequest[reqs - .size()])); + for (Entry<IElementMementoProvider, List<IElementMementoRequest>> entry : providers.entrySet()) { + IElementMementoProvider provider = entry.getKey(); + List<IElementMementoRequest> reqs = entry.getValue(); + provider.encodeElements(reqs.toArray(new IElementMementoRequest[reqs.size()])); } } @@ -796,7 +809,8 @@ class ViewerStateTracker { * #addRequest(org.eclipse.debug.internal.ui.viewers. * model.provisional.IElementMementoRequest) */ - public void addRequest(ElementMementoRequest request) { + @Override + public void addRequest(ElementMementoRequest request) { Assert.isTrue( fContentProvider.getViewer().getDisplay().getThread() == Thread.currentThread() ); fRequests.add(request); @@ -804,7 +818,8 @@ class ViewerStateTracker { }; IModelDeltaVisitor visitor = new IModelDeltaVisitor() { - public boolean visit(IModelDelta delta, int depth) { + @Override + public boolean visit(IModelDelta delta, int depth) { // Add the CONTENT flag to all nodes with an EXPAND flag. // During restoring, this flag is used as a marker indicating // whether all the content of a given element has been @@ -918,7 +933,8 @@ class ViewerStateTracker { // If we're canceling select or reveal, cancel it for all of pending deltas final int mask = flags & (IModelDelta.SELECT | IModelDelta.REVEAL); fPendingState.accept(new IModelDeltaVisitor() { - public boolean visit(IModelDelta delta, int depth) { + @Override + public boolean visit(IModelDelta delta, int depth) { int deltaFlags = delta.getFlags(); int newFlags = deltaFlags & ~mask; if (DebugUIPlugin.DEBUG_STATE_SAVE_RESTORE && DebugUIPlugin.DEBUG_TEST_PRESENTATION_ID(fContentProvider.getPresentationContext())) { @@ -935,7 +951,8 @@ class ViewerStateTracker { final int mask = flags & ~(IModelDelta.SELECT | IModelDelta.REVEAL); // For other flags (EXPAND/COLLAPSE), cancel only from the matching path. fPendingState.accept(new IModelDeltaVisitor() { - public boolean visit(IModelDelta delta, int depth) { + @Override + public boolean visit(IModelDelta delta, int depth) { if (depth < path.getSegmentCount()) { // Descend until we reach a matching depth. TreePath deltaPath = fContentProvider.getViewerTreePath(delta); @@ -1002,7 +1019,8 @@ class ViewerStateTracker { } IModelDeltaVisitor visitor = new IModelDeltaVisitor() { - public boolean visit(final IModelDelta delta, int depth) { + @Override + public boolean visit(final IModelDelta delta, int depth) { Object element = delta.getElement(); Object potentialMatch = depth != 0 ? path.getSegment(depth - 1) : fContentProvider.getViewer().getInput(); @@ -1015,7 +1033,7 @@ class ViewerStateTracker { } if (provider != null) { CompareRequestKey key = new CompareRequestKey(path, delta); - ElementCompareRequest existingRequest = (ElementCompareRequest) fCompareRequestsInProgress + ElementCompareRequest existingRequest = fCompareRequestsInProgress .get(key); if (existingRequest != null) { // Check all the running compare updates for a @@ -1085,7 +1103,8 @@ class ViewerStateTracker { * #visit(org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta, * int) */ - public boolean visit(IModelDelta delta, int depth) { + @Override + public boolean visit(IModelDelta delta, int depth) { // Filter out the CONTENT flags from the delta flags, the content // flag is only used as a marker indicating that all the sub-elements // of a given delta have been retrieved. @@ -1121,8 +1140,7 @@ class ViewerStateTracker { } private boolean areMementoUpdatesPending(IModelDelta delta) { - for (Iterator itr = fCompareRequestsInProgress.keySet().iterator(); itr.hasNext();) { - CompareRequestKey key = (CompareRequestKey) itr.next(); + for (CompareRequestKey key : fCompareRequestsInProgress.keySet()) { if (delta.getElement().equals(key.fDelta.getElement())) { return true; } @@ -1136,7 +1154,8 @@ class ViewerStateTracker { } delta.accept(new IModelDeltaVisitor() { - public boolean visit(IModelDelta _visitorDelta, int depth) { + @Override + public boolean visit(IModelDelta _visitorDelta, int depth) { ModelDelta visitorDelta = (ModelDelta) _visitorDelta; visitorDelta.setElement(ELEMENT_REMOVED); visitorDelta.setFlags(IModelDelta.NO_CHANGE); @@ -1315,7 +1334,8 @@ class ViewerStateTracker { private int fCounter = 0; private Object fModelInput = fPendingState.getElement(); - public void viewerUpdatesComplete() { + @Override + public void viewerUpdatesComplete() { Assert.isTrue( fContentProvider.getViewer().getDisplay().getThread() == Thread.currentThread() ); IInternalTreeModelViewer viewer = fContentProvider.getViewer(); @@ -1345,9 +1365,12 @@ class ViewerStateTracker { } } - public void viewerUpdatesBegin() {} - public void updateStarted(IViewerUpdate update) {} - public void updateComplete(IViewerUpdate update) {} + @Override + public void viewerUpdatesBegin() {} + @Override + public void updateStarted(IViewerUpdate update) {} + @Override + public void updateComplete(IViewerUpdate update) {} /** * Returns delta that is used to reveal the item. @@ -1365,7 +1388,9 @@ class ViewerStateTracker { fPendingSetTopItem = null; IInternalTreeModelViewer viewer = fContentProvider.getViewer(); - if (viewer == null) return; + if (viewer == null) { + return; + } // remove myself as viewer update listener viewer.removeViewerUpdateListener(this); @@ -1418,7 +1443,8 @@ class ViewerStateTracker { private ModelDelta markRevealDelta(ModelDelta rootDelta) { final ModelDelta[] revealDelta = new ModelDelta[1]; IModelDeltaVisitor visitor = new IModelDeltaVisitor() { - public boolean visit(IModelDelta delta, int depth) { + @Override + public boolean visit(IModelDelta delta, int depth) { if ( (delta.getFlags() & IModelDelta.REVEAL) != 0) { revealDelta[0] = (ModelDelta)delta; } @@ -1475,10 +1501,10 @@ class ViewerStateTracker { * @param path Path of element to cancel updates for. */ void cancelStateSubtreeUpdates(TreePath path) { - for (Iterator itr = fCompareRequestsInProgress.keySet().iterator(); itr.hasNext();) { - CompareRequestKey key = (CompareRequestKey) itr.next(); + for (Iterator<CompareRequestKey> itr = fCompareRequestsInProgress.keySet().iterator(); itr.hasNext();) { + CompareRequestKey key = itr.next(); if (key.fPath.startsWith(path, null)) { - ElementCompareRequest compareRequest = (ElementCompareRequest) fCompareRequestsInProgress.get(key); + ElementCompareRequest compareRequest = fCompareRequestsInProgress.get(key); compareRequest.cancel(); itr.remove(); } @@ -1525,30 +1551,34 @@ class ViewerStateTracker { for (int i = 0; i < listeners.length; i++) { final IStateUpdateListener listener = (IStateUpdateListener) listeners[i]; SafeRunner.run(new ISafeRunnable() { - public void run() throws Exception { + @Override + public void run() throws Exception { switch (type) { - case STATE_SAVE_SEQUENCE_BEGINS: - listener.stateSaveUpdatesBegin(input); - break; - case STATE_SAVE_SEQUENCE_COMPLETE: - listener.stateSaveUpdatesComplete(input); - break; - case STATE_RESTORE_SEQUENCE_BEGINS: - listener.stateRestoreUpdatesBegin(input); - break; - case STATE_RESTORE_SEQUENCE_COMPLETE: - listener.stateRestoreUpdatesComplete(input); - break; - case TreeModelContentProvider.UPDATE_BEGINS: - listener.stateUpdateStarted(input, update); - break; - case TreeModelContentProvider.UPDATE_COMPLETE: - listener.stateUpdateComplete(input, update); - break; + case STATE_SAVE_SEQUENCE_BEGINS: + listener.stateSaveUpdatesBegin(input); + break; + case STATE_SAVE_SEQUENCE_COMPLETE: + listener.stateSaveUpdatesComplete(input); + break; + case STATE_RESTORE_SEQUENCE_BEGINS: + listener.stateRestoreUpdatesBegin(input); + break; + case STATE_RESTORE_SEQUENCE_COMPLETE: + listener.stateRestoreUpdatesComplete(input); + break; + case TreeModelContentProvider.UPDATE_BEGINS: + listener.stateUpdateStarted(input, update); + break; + case TreeModelContentProvider.UPDATE_COMPLETE: + listener.stateUpdateComplete(input, update); + break; + default: + break; } } - public void handleException(Throwable exception) { + @Override + public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } }); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerUpdateMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerUpdateMonitor.java index d75adc6cf..5058d4a48 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerUpdateMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerUpdateMonitor.java @@ -123,7 +123,8 @@ public abstract class ViewerUpdateMonitor extends Request implements IViewerUpda /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitor#done() */ - public final void done() { + @Override + public final void done() { synchronized (this) { if (isDone()) { return; @@ -155,6 +156,7 @@ public abstract class ViewerUpdateMonitor extends Request implements IViewerUpda /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getPresentationContext() */ + @Override public IPresentationContext getPresentationContext() { return fContext; } @@ -162,6 +164,7 @@ public abstract class ViewerUpdateMonitor extends Request implements IViewerUpda /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElement() */ + @Override public Object getElement() { return fElement; } @@ -169,6 +172,7 @@ public abstract class ViewerUpdateMonitor extends Request implements IViewerUpda /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElementPath() */ + @Override public TreePath getElementPath() { return fElementPath; } @@ -213,6 +217,7 @@ public abstract class ViewerUpdateMonitor extends Request implements IViewerUpda /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getViewerInput() */ + @Override public Object getViewerInput() { return fViewerInput; } @@ -257,6 +262,7 @@ public abstract class ViewerUpdateMonitor extends Request implements IViewerUpda return fIsDelegated; } + @Override public boolean equals(Object obj) { if (obj instanceof ViewerUpdateMonitor) { return doEquals((ViewerUpdateMonitor)obj); @@ -264,6 +270,7 @@ public abstract class ViewerUpdateMonitor extends Request implements IViewerUpda return false; } + @Override public int hashCode() { return doHashCode(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java index afb1eae67..74244bf03 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,7 +15,6 @@ package org.eclipse.debug.internal.ui.viewers.model; import java.lang.reflect.InvocationTargetException; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; @@ -64,24 +63,30 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel VirtualTreeModelViewer fVirtualViewer; IProgressMonitor fProgressMonitor; int fSelectionRootDepth; - Set fItemsToUpdate; + Set<VirtualItem> fItemsToUpdate; - public void labelUpdateStarted(ILabelUpdate update) {} - public void labelUpdateComplete(ILabelUpdate update) { + @Override + public void labelUpdateStarted(ILabelUpdate update) {} + @Override + public void labelUpdateComplete(ILabelUpdate update) { VirtualItem updatedItem = fVirtualViewer.findItem(update.getElementPath()); if (fItemsToUpdate.remove(updatedItem)) { incrementProgress(1); } } - public void labelUpdatesBegin() { + @Override + public void labelUpdatesBegin() { } - public void labelUpdatesComplete() { + @Override + public void labelUpdatesComplete() { } - public void revealed(VirtualItem item) { + @Override + public void revealed(VirtualItem item) { } - public void disposed(VirtualItem item) { + @Override + public void disposed(VirtualItem item) { if (fItemsToUpdate.remove(item)) { incrementProgress(1); } @@ -104,6 +109,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel /** * @see AbstractDebugActionDelegate#initialize(IAction, ISelection) */ + @Override protected boolean initialize(IAction action, ISelection selection) { if (!isInitialized()) { IDebugView adapter= (IDebugView)getView().getAdapter(IDebugView.class); @@ -148,21 +154,22 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel private class ItemsToCopyVirtualItemValidator implements IVirtualItemValidator { - Set fItemsToCopy = Collections.EMPTY_SET; - Set fItemsToValidate = Collections.EMPTY_SET; + Set<VirtualItem> fItemsToCopy = Collections.EMPTY_SET; + Set<VirtualItem> fItemsToValidate = Collections.EMPTY_SET; - public boolean isItemVisible(VirtualItem item) { + @Override + public boolean isItemVisible(VirtualItem item) { return fItemsToValidate.contains(item); } - public void showItem(VirtualItem item) { + @Override + public void showItem(VirtualItem item) { } - void setItemsToCopy(Set itemsToCopy) { + void setItemsToCopy(Set<VirtualItem> itemsToCopy) { fItemsToCopy = itemsToCopy; - fItemsToValidate = new HashSet(); - for (Iterator itr = itemsToCopy.iterator(); itr.hasNext();) { - VirtualItem itemToCopy = (VirtualItem)itr.next(); + fItemsToValidate = new HashSet<VirtualItem>(); + for (VirtualItem itemToCopy : itemsToCopy) { while (itemToCopy != null) { fItemsToValidate.add(itemToCopy); itemToCopy = itemToCopy.getParent(); @@ -194,7 +201,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel // Parse selected items from client viewer and add them to the virtual viewer selection. listener.fSelectionRootDepth = Integer.MAX_VALUE; TreeItem[] selection = getSelectedItems(clientViewer); - Set vSelection = new HashSet(selection.length * 4/3); + Set<VirtualItem> vSelection = new HashSet<VirtualItem>(selection.length * 4 / 3); for (int i = 0; i < selection.length; i++) { TreePath parentPath = fClientViewer.getTreePathFromItem(selection[i].getParentItem()); listener.fSelectionRootDepth = Math.min(parentPath.getSegmentCount() + 1, listener.fSelectionRootDepth); @@ -213,7 +220,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel } } validator.setItemsToCopy(vSelection); - listener.fItemsToUpdate = new HashSet(vSelection); + listener.fItemsToUpdate = new HashSet<VirtualItem>(vSelection); virtualViewer.getTree().validate(); return virtualViewer; } @@ -226,6 +233,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel * Do the specific action using the current selection. * @param action Action that is running. */ + @Override public void run(final IAction action) { if (fClientViewer.getSelection().isEmpty()) { return; @@ -241,6 +249,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel dialog.setCancelable(true); IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(final IProgressMonitor m) throws InvocationTargetException, InterruptedException { synchronized(listener) { listener.fProgressMonitor = m; @@ -273,13 +282,13 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel virtualViewer.dispose(); } - private void copySelectionToClipboard(VirtualTreeModelViewer virtualViewer, Set itemsToCopy, int selectionRootDepth) { + private void copySelectionToClipboard(VirtualTreeModelViewer virtualViewer, Set<VirtualItem> itemsToCopy, int selectionRootDepth) { StringBuffer buffer = new StringBuffer(); writeItemToBuffer (virtualViewer.getTree(), itemsToCopy, buffer, -selectionRootDepth); writeBufferToClipboard(buffer); } - protected void writeItemToBuffer(VirtualItem item, Set itemsToCopy, StringBuffer buffer, int indent) { + protected void writeItemToBuffer(VirtualItem item, Set<VirtualItem> itemsToCopy, StringBuffer buffer, int indent) { if (itemsToCopy.contains(item)) { append(item, buffer, indent); } @@ -292,7 +301,9 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel } protected void writeBufferToClipboard(StringBuffer buffer) { - if (buffer.length() == 0) return; + if (buffer.length() == 0) { + return; + } TextTransfer plainTextTransfer = TextTransfer.getInstance(); Clipboard clipboard= new Clipboard(fClientViewer.getControl().getDisplay()); @@ -322,10 +333,12 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel /** * @see AbstractDebugActionDelegate#doAction(Object) */ + @Override protected void doAction(Object element) { //not used } + @Override protected boolean getEnableStateForSelection(IStructuredSelection selection) { if (selection.isEmpty()) { return true; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java index b7af7180f..0c6208b47 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java @@ -68,28 +68,36 @@ public class VirtualFindAction extends Action implements IUpdate { private IProgressMonitor fProgressMonitor; private int fRemainingUpdatesCount = 0; - public void labelUpdateStarted(ILabelUpdate update) {} - public void labelUpdateComplete(ILabelUpdate update) { + @Override + public void labelUpdateStarted(ILabelUpdate update) {} + @Override + public void labelUpdateComplete(ILabelUpdate update) { incrementProgress(1); } - public void labelUpdatesBegin() { + @Override + public void labelUpdatesBegin() { fLabelUpdatesComplete = false; } - public void labelUpdatesComplete() { + @Override + public void labelUpdatesComplete() { fLabelUpdatesComplete = true; completeProgress(); } - public void updateStarted(IViewerUpdate update) {} - public void updateComplete(IViewerUpdate update) { + @Override + public void updateStarted(IViewerUpdate update) {} + @Override + public void updateComplete(IViewerUpdate update) { if (update instanceof IChildrenUpdate) { incrementProgress(((IChildrenUpdate)update).getLength()); } } - public void viewerUpdatesBegin() { + @Override + public void viewerUpdatesBegin() { fViewerUpdatesComplete = false; } - public void viewerUpdatesComplete() { + @Override + public void viewerUpdatesComplete() { fViewerUpdatesComplete = true; completeProgress(); } @@ -119,21 +127,24 @@ public class VirtualFindAction extends Action implements IUpdate { private static class FindLabelProvider extends LabelProvider { private VirtualTreeModelViewer fVirtualViewer; - private Map fTextCache = new HashMap(); - public FindLabelProvider(VirtualTreeModelViewer viewer, List items) { + private Map<VirtualItem, String> fTextCache = new HashMap<VirtualItem, String>(); + + public FindLabelProvider(VirtualTreeModelViewer viewer, List<VirtualItem> items) { fVirtualViewer = viewer; for (int i = 0; i < items.size(); i++) { - VirtualItem item = (VirtualItem)items.get(i); + VirtualItem item = items.get(i); fTextCache.put(item, fVirtualViewer.getText(item, 0)); } } + @Override public Image getImage(Object element) { return fVirtualViewer.getImage((VirtualItem) element, 0); } + @Override public String getText(Object element) { - return (String)fTextCache.get(element); + return fTextCache.get(element); } } @@ -169,6 +180,7 @@ public class VirtualFindAction extends Action implements IUpdate { return fVirtualViewer; } + @Override public void run() { final VirtualViewerListener listener = new VirtualViewerListener(); VirtualTreeModelViewer virtualViewer = initVirtualViewer(fClientViewer, listener); @@ -181,7 +193,8 @@ public class VirtualFindAction extends Action implements IUpdate { dialog.run( true, true, new IRunnableWithProgress() { - public void run(final IProgressMonitor m) throws InvocationTargetException, InterruptedException { + @Override + public void run(final IProgressMonitor m) throws InvocationTargetException, InterruptedException { synchronized(listener) { listener.fProgressMonitor = m; listener.fProgressMonitor.beginTask(DebugUIPlugin.removeAccelerators(getText()), listener.fRemainingUpdatesCount); @@ -204,7 +217,7 @@ public class VirtualFindAction extends Action implements IUpdate { VirtualItem root = virtualViewer.getTree(); if (!monitor.isCanceled()) { - List list = new ArrayList(); + List<VirtualItem> list = new ArrayList<VirtualItem>(); collectAllChildren(root, list); FindLabelProvider labelProvider = new FindLabelProvider(virtualViewer, list); VirtualItem result = performFind(list, labelProvider); @@ -221,7 +234,8 @@ public class VirtualFindAction extends Action implements IUpdate { private int calcUpdatesCount(IModelDelta stateDelta) { final int[] count = new int[] {0}; stateDelta.accept( new IModelDeltaVisitor() { - public boolean visit(IModelDelta delta, int depth) { + @Override + public boolean visit(IModelDelta delta, int depth) { if ((delta.getFlags() & IModelDelta.EXPAND) != 0) { count[0] += delta.getChildCount(); return true; @@ -234,7 +248,7 @@ public class VirtualFindAction extends Action implements IUpdate { return count[0] * 2; } - private void collectAllChildren(VirtualItem element, List collect) { + private void collectAllChildren(VirtualItem element, List<VirtualItem> collect) { VirtualItem[] children = element.getItems(); if (children != null) { for (int i = 0; i < children.length; i++) { @@ -246,7 +260,7 @@ public class VirtualFindAction extends Action implements IUpdate { } } - protected VirtualItem performFind(List items, FindLabelProvider labelProvider) { + protected VirtualItem performFind(List<VirtualItem> items, FindLabelProvider labelProvider) { FindElementDialog dialog = new FindElementDialog( fClientViewer.getControl().getShell(), labelProvider, @@ -268,7 +282,8 @@ public class VirtualFindAction extends Action implements IUpdate { virtualViewer.saveElementState(TreePath.EMPTY, stateDelta, IModelDelta.SELECT); // Set the force flag to all select delta in order to override model's selection policy. stateDelta.accept(new IModelDeltaVisitor() { - public boolean visit(IModelDelta delta, int depth) { + @Override + public boolean visit(IModelDelta delta, int depth) { if ((delta.getFlags() & IModelDelta.SELECT) != 0) { ((ModelDelta)delta).setFlags(delta.getFlags() | IModelDelta.FORCE); } @@ -285,11 +300,12 @@ public class VirtualFindAction extends Action implements IUpdate { DebugUIPlugin.errorDialog( fClientViewer.getControl().getShell(), ActionMessages.VirtualFindAction_0, - MessageFormat.format(ActionMessages.VirtualFindAction_1, new String[]{ labelProvider.getText(findItem) }), + MessageFormat.format(ActionMessages.VirtualFindAction_1, new Object[] { labelProvider.getText(findItem) }), new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), ActionMessages.VirtualFindAction_1)); } } + @Override public void update() { setEnabled( fClientViewer.getInput() != null && fClientViewer.getChildCount(TreePath.EMPTY) > 0 ); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ITreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ITreeModelViewer.java index 25a04bc4c..270c1203a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ITreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ITreeModelViewer.java @@ -76,7 +76,8 @@ public interface ITreeModelViewer extends ISelectionProvider { * * @return selection object */ - public ISelection getSelection(); + @Override + public ISelection getSelection(); /** * Sets a new selection for this viewer and optionally makes it visible. diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ModelDelta.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ModelDelta.java index 0eca89a05..f40307d4c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ModelDelta.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ModelDelta.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -30,8 +30,9 @@ public class ModelDelta implements IModelDelta { private Object fElement; private int fFlags; private ModelDelta[] fNodes = EMPTY_NODES; - private List fNodesList = null; - private Map fNodesMap; + private List<ModelDelta> fNodesList = null; + // TODO this is not good, we are mixing a delta with an array of deltas + private Map<Object, Object> fNodesMap; private Object fReplacement; private int fIndex = -1; private int fChildCount = -1; @@ -95,13 +96,15 @@ public class ModelDelta implements IModelDelta { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.IModelDelta#getElement() */ - public Object getElement() { + @Override + public Object getElement() { return fElement; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.IModelDelta#getFlags() */ + @Override public int getFlags() { return fFlags; } @@ -172,13 +175,13 @@ public class ModelDelta implements IModelDelta { private void mapNodes() { if (fNodesList == null) { - fNodesMap = new HashMap(1); + fNodesMap = new HashMap<Object, Object>(1); return; } // Create a map with capacity for all child nodes. - fNodesMap = new HashMap(fNodesList.size()*4/3); + fNodesMap = new HashMap<Object, Object>(fNodesList.size() * 4 / 3); for (int i = 0; i < fNodesList.size(); i++) { - mapNode( (ModelDelta)fNodesList.get(i) ); + mapNode( fNodesList.get(i) ); } } @@ -261,6 +264,7 @@ public class ModelDelta implements IModelDelta { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.IModelDelta#getParent() */ + @Override public IModelDelta getParentDelta() { return fParent; } @@ -268,29 +272,34 @@ public class ModelDelta implements IModelDelta { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.IModelDelta#getReplacementElement() */ - public Object getReplacementElement() { + @Override + public Object getReplacementElement() { return fReplacement; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.IModelDelta#getIndex() */ - public int getIndex() { + @Override + public int getIndex() { return fIndex; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.IModelDelta#getNodes() */ + @Override public IModelDelta[] getChildDeltas() { if (fNodes == null) { - fNodes = (ModelDelta[])fNodesList.toArray(new ModelDelta[fNodesList.size()]); + fNodes = fNodesList.toArray(new ModelDelta[fNodesList.size()]); } return fNodes; } private void addDelta(ModelDelta delta) { - if (fNodesList == null) fNodesList = new ArrayList(4); + if (fNodesList == null) { + fNodesList = new ArrayList<ModelDelta>(4); + } fNodesList.add(delta); fNodes = null; if (fNodesMap != null) { @@ -298,6 +307,7 @@ public class ModelDelta implements IModelDelta { } } + @Override public String toString() { StringBuffer buf = new StringBuffer(); buf.append("Model Delta Start\n"); //$NON-NLS-1$ @@ -374,6 +384,7 @@ public class ModelDelta implements IModelDelta { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta#getChildCount() */ + @Override public int getChildCount() { return fChildCount; } @@ -381,6 +392,7 @@ public class ModelDelta implements IModelDelta { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta#accept(org.eclipse.debug.internal.ui.viewers.provisional.IModelDeltaVisitor) */ + @Override public void accept(IModelDeltaVisitor visitor) { doAccept(visitor, 0); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/PresentationContext.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/PresentationContext.java index 574964040..2a92a47c2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/PresentationContext.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/PresentationContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,10 +12,9 @@ package org.eclipse.debug.internal.ui.viewers.model.provisional; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.SafeRunner; @@ -46,7 +45,7 @@ public class PresentationContext implements IPresentationContext { final private String fId; final private ListenerList fListeners = new ListenerList(); - final private Map fProperties = new HashMap(); + final private Map<String, Object> fProperties = new HashMap<String, Object>(); private IWorkbenchWindow fWindow; private IWorkbenchPart fPart; @@ -99,6 +98,7 @@ public class PresentationContext implements IPresentationContext { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext#getColumns() */ + @Override public String[] getColumns() { return (String[]) getProperty(IPresentationContext.PROPERTY_COLUMNS); } @@ -117,6 +117,7 @@ public class PresentationContext implements IPresentationContext { for (int i = 0; i < listeners.length; i++) { final IPropertyChangeListener listener = (IPropertyChangeListener) listeners[i]; SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { listener.propertyChange(event); } @@ -138,6 +139,7 @@ public class PresentationContext implements IPresentationContext { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext#dispose() */ + @Override public void dispose() { fProperties.clear(); setProperty(PROPERTY_DISPOSED, Boolean.TRUE); @@ -150,6 +152,7 @@ public class PresentationContext implements IPresentationContext { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { fListeners.add(listener); } @@ -157,6 +160,7 @@ public class PresentationContext implements IPresentationContext { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { fListeners.remove(listener); } @@ -164,6 +168,7 @@ public class PresentationContext implements IPresentationContext { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext#getId() */ + @Override public String getId() { return fId; } @@ -171,6 +176,7 @@ public class PresentationContext implements IPresentationContext { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext#getProperty(java.lang.String) */ + @Override public Object getProperty(String property) { synchronized (fProperties) { return fProperties.get(property); @@ -180,6 +186,7 @@ public class PresentationContext implements IPresentationContext { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext#setProperty(java.lang.String, java.lang.Object) */ + @Override public void setProperty(String property, Object value) { Object oldValue = null; boolean propertySet = false; @@ -251,23 +258,20 @@ public class PresentationContext implements IPresentationContext { if (fProperties.size() == 0) { return; } - IMemento properties = memento.createChild(PRESENTATION_CONTEXT_PROPERTIES, getId()); - Iterator iterator = fProperties.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = (Entry) iterator.next(); + for (Entry<String, Object> entry : fProperties.entrySet()) { if (entry.getValue() instanceof String) { - IMemento value = properties.createChild(STRING, (String)entry.getKey()); + IMemento value = properties.createChild(STRING, entry.getKey()); value.putString(STRING, (String)entry.getValue()); } else if (entry.getValue() instanceof Integer) { - IMemento value = properties.createChild(INTEGER, (String)entry.getKey()); + IMemento value = properties.createChild(INTEGER, entry.getKey()); value.putInteger(INTEGER, ((Integer)entry.getValue()).intValue()); } else if (entry.getValue() instanceof Boolean) { - IMemento value = properties.createChild(BOOLEAN, (String)entry.getKey()); + IMemento value = properties.createChild(BOOLEAN, entry.getKey()); value.putBoolean(BOOLEAN, ((Boolean)entry.getValue()).booleanValue()); } else if (entry.getValue() instanceof IPersistableElement) { IPersistableElement persistable = (IPersistableElement)entry.getValue(); - IMemento value = properties.createChild(PERSISTABLE, (String)entry.getKey()); + IMemento value = properties.createChild(PERSISTABLE, entry.getKey()); value.putString(PERSISTABLE, persistable.getFactoryId()); persistable.saveState(value); } @@ -284,18 +288,21 @@ public class PresentationContext implements IPresentationContext { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext#getProperties() */ + @Override public String[] getProperties() { synchronized (fProperties) { - Set keys = fProperties.keySet(); - return (String[]) keys.toArray(new String[keys.size()]); + Set<String> keys = fProperties.keySet(); + return keys.toArray(new String[keys.size()]); } } - public IWorkbenchPart getPart() { + @Override + public IWorkbenchPart getPart() { return fPart; } - public IWorkbenchWindow getWindow() { + @Override + public IWorkbenchWindow getWindow() { return fWindow; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/TreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/TreeModelViewer.java index 0c26078f9..5e3d35722 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/TreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/TreeModelViewer.java @@ -44,6 +44,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @return presentation context */ + @Override public IPresentationContext getPresentationContext() { return super.getPresentationContext(); } @@ -53,6 +54,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @param listener model delta listener */ + @Override public void addModelChangedListener(IModelChangedListener listener) { super.addModelChangedListener(listener); } @@ -62,6 +64,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @param listener model delta listener */ + @Override public void removeModelChangedListener(IModelChangedListener listener) { super.removeModelChangedListener(listener); } @@ -71,6 +74,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @param listener listener */ + @Override public void addViewerUpdateListener(IViewerUpdateListener listener) { super.addViewerUpdateListener(listener); } @@ -80,6 +84,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @param listener listener */ + @Override public void removeViewerUpdateListener(IViewerUpdateListener listener) { super.removeViewerUpdateListener(listener); } @@ -90,6 +95,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @return whether columns can be toggled on/off */ + @Override public boolean canToggleColumns() { return super.canToggleColumns(); } @@ -100,6 +106,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @return column presentation or <code>null</code> */ + @Override public IColumnPresentation getColumnPresentation() { return super.getColumnPresentation(); } @@ -110,6 +117,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @return visible columns identifiers or <code>null</code> */ + @Override public String[] getVisibleColumns() { return super.getVisibleColumns(); } @@ -119,6 +127,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @param memento the {@link IMemento} to read from */ + @Override public void initState(IMemento memento) { super.initState(memento); } @@ -128,6 +137,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @param memento the {@link IMemento} to save to */ + @Override public void saveState(IMemento memento) { super.saveState(memento); } @@ -135,6 +145,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { /** * @return Returns true if columns are being displayed currently. */ + @Override public boolean isShowColumns() { return super.isShowColumns(); } @@ -144,6 +155,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @param columnIds array of column identifiers */ + @Override public void resetColumnSizes(String[] columnIds) { super.resetColumnSizes(columnIds); } @@ -154,6 +166,7 @@ public class TreeModelViewer extends InternalTreeModelViewer { * @param show whether to show columns if the current input supports * columns */ + @Override public void setShowColumns(boolean show) { super.setShowColumns(show); } @@ -166,11 +179,13 @@ public class TreeModelViewer extends InternalTreeModelViewer { * * @param ids column identifiers or <code>null</code> */ + @Override public void setVisibleColumns(String[] ids) { super.setVisibleColumns(ids); } - public ViewerLabel getElementLabel(TreePath path, String columnId) { + @Override + public ViewerLabel getElementLabel(TreePath path, String columnId) { return super.getElementLabel(path, columnId); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ViewerInputService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ViewerInputService.java index 0a4e1ac96..d2c0815fe 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ViewerInputService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ViewerInputService.java @@ -31,7 +31,8 @@ public class ViewerInputService { * @since 3.6 */ public final static Object NULL_INPUT = new IViewerInputProvider() { - public void update(IViewerInputUpdate update) { + @Override + public void update(IViewerInputUpdate update) { update.setInputElement(null); update.done(); } @@ -45,6 +46,7 @@ public class ViewerInputService { private ITreeModelViewer fViewer; private IViewerInputRequestor fProxyRequest = new IViewerInputRequestor() { + @Override public void viewerInputComplete(final IViewerInputUpdate update) { synchronized (ViewerInputService.this) { if (fPendingUpdate == update) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java index 764d50272..46aefd80b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java @@ -13,6 +13,7 @@ package org.eclipse.debug.internal.ui.viewers.model.provisional; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import org.eclipse.core.runtime.Assert; @@ -40,18 +41,20 @@ public class VirtualItem { * Index object of a tree item. It allows the indexes to be modified * as items are inserted and removed. */ - public static class Index implements Comparable { + public static class Index implements Comparable<Object> { private Integer fIndexValue; public Index(int index) { fIndexValue = new Integer(index); } - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { return obj instanceof Index && ((Index)obj).fIndexValue.equals(fIndexValue); } - public int hashCode() { + @Override + public int hashCode() { return fIndexValue.hashCode(); } @@ -67,11 +70,13 @@ public class VirtualItem { return fIndexValue.intValue(); } - public int compareTo(Object obj) { + @Override + public int compareTo(Object obj) { return obj instanceof Index ? fIndexValue.compareTo(((Index)obj).fIndexValue) : 0; } - public String toString() { + @Override + public String toString() { return fIndexValue.toString(); } } @@ -92,7 +97,7 @@ public class VirtualItem { * keeps the items sorted while allowing indexes (keys) to be modified as * child items are inserted and removed. */ - private Map fItems = new TreeMap(); + private Map<Index, VirtualItem> fItems = new TreeMap<Index, VirtualItem>(); /** * Flag indicating whether this item has child items. @@ -115,7 +120,7 @@ public class VirtualItem { * The data held by this item. It includes the element as well as the item * display attributes. */ - private Map fData = new HashMap(1); + private Map<String, Object> fData = new HashMap<String, Object>(1); /** * Flag indicating that the item needs to have it's label updated. @@ -153,7 +158,7 @@ public class VirtualItem { * @param index index of item to clear. */ public void clear(Index index) { - VirtualItem item = (VirtualItem)fItems.remove(index); + VirtualItem item = fItems.remove(index); if (item != null) { item.dispose(); } @@ -166,8 +171,8 @@ public class VirtualItem { */ public void clearAll() { fData.clear(); - for (Iterator itr = fItems.values().iterator(); itr.hasNext();) { - ((VirtualItem)itr.next()).dispose(); + for (VirtualItem item : fItems.values()) { + item.dispose(); } fItems.clear(); } @@ -192,11 +197,10 @@ public class VirtualItem { * @return Item if found, <code>null</code> if not. */ public VirtualItem findItem(Object element) { - for (Iterator itr = fItems.values().iterator(); itr.hasNext();) { - VirtualItem next = (VirtualItem)itr.next(); - Object nextData = next.getData(); + for (VirtualItem item : fItems.values()) { + Object nextData = item.getData(); if ( (element != null && element.equals(nextData)) || (element == null && nextData == null) ) { - return next; + return item; } } return null; @@ -334,8 +338,8 @@ public class VirtualItem { // If collapsed, make sure that all the children are collapsed as well. if (!fExpanded) { - for (Iterator itr = fItems.values().iterator(); itr.hasNext();) { - ((VirtualItem)itr.next()).setExpanded(expanded); + for (VirtualItem item : fItems.values()) { + item.setExpanded(expanded); } } } @@ -375,11 +379,11 @@ public class VirtualItem { */ public void setItemCount(int count) { fItemCount = count; - for (Iterator itr = fItems.entrySet().iterator(); itr.hasNext();) { - Map.Entry entry = (Map.Entry)itr.next(); - int index = ((Index)entry.getKey()).intValue(); + for (Iterator<Entry<Index, VirtualItem>> itr = fItems.entrySet().iterator(); itr.hasNext();) { + Entry<Index, VirtualItem> entry = itr.next(); + int index = entry.getKey().intValue(); if (index >= count) { - VirtualItem item = (VirtualItem)entry.getValue(); + VirtualItem item = entry.getValue(); item.dispose(); itr.remove(); } @@ -414,7 +418,7 @@ public class VirtualItem { public VirtualItem getItem(Index index) { ensureItems(); - VirtualItem item = (VirtualItem)fItems.get(index); + VirtualItem item = fItems.get(index); if (item == null) { item = new VirtualItem(this, index); fItems.put(index, item); @@ -432,8 +436,7 @@ public class VirtualItem { if (fItems == null || fItems.size() != fItemCount) { return true; } - for (Iterator itr = fItems.values().iterator(); itr.hasNext();) { - VirtualItem child = (VirtualItem)itr.next(); + for (VirtualItem child : fItems.values()) { if (child.needsDataUpdate()) { return true; } @@ -449,7 +452,7 @@ public class VirtualItem { * @return Child items array. */ public VirtualItem[] getItems() { - return (VirtualItem[]) fItems.values().toArray(new VirtualItem[fItems.size()]); + return fItems.values().toArray(new VirtualItem[fItems.size()]); } /** @@ -468,8 +471,7 @@ public class VirtualItem { // Increment all items with an index higher than the given position. fItemCount++; ensureItems(); - for (Iterator itr = fItems.keySet().iterator(); itr.hasNext();) { - Index childIndex = (Index)itr.next(); + for (Index childIndex : fItems.keySet()) { if (childIndex.intValue() >= position) { childIndex.increment(); } @@ -496,13 +498,13 @@ public class VirtualItem { ensureItems(); VirtualItem removedItem = null; - for (Iterator itr = fItems.entrySet().iterator(); itr.hasNext();) { - Map.Entry entry = (Map.Entry)itr.next(); - Index childIndex = (Index)entry.getKey(); + for (Iterator<Entry<Index, VirtualItem>> itr = fItems.entrySet().iterator(); itr.hasNext();) { + Entry<Index, VirtualItem> entry = itr.next(); + Index childIndex = entry.getKey(); if (childIndex.intValue() > position.intValue()) { childIndex.decrement(); } else if (childIndex.intValue() == position.intValue()) { - removedItem = (VirtualItem)entry.getValue(); + removedItem = entry.getValue(); removedItem.dispose(); itr.remove(); } @@ -511,7 +513,7 @@ public class VirtualItem { private void ensureItems() { if (fItems == null) { - fItems = new HashMap( Math.max(1, Math.min(fItemCount, 16)) ); + fItems = new HashMap<Index, VirtualItem>(Math.max(1, Math.min(fItemCount, 16))); } } @@ -523,7 +525,8 @@ public class VirtualItem { return (VirtualTree)item; } - public String toString() { + @Override + public String toString() { StringBuffer buffer = new StringBuffer(); toStringItem(buffer, IInternalDebugCoreConstants.EMPTY_STRING); return buffer.toString(); @@ -535,7 +538,7 @@ public class VirtualItem { buffer.append("\n"); //$NON-NLS-1$ indent = indent + " "; //$NON-NLS-1$ for (int i = 0; i < fItemCount; i++) { - VirtualItem item = (VirtualItem)fItems.get(new Index(i)); + VirtualItem item = fItems.get(new Index(i)); if (item != null) { item.toStringItem(buffer, indent); } else { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTree.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTree.java index 661a1ea76..41194464d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTree.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTree.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,11 +7,11 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.viewers.model.provisional; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import org.eclipse.swt.SWT; @@ -35,7 +35,8 @@ public class VirtualTree extends VirtualItem { private IVirtualItemValidator fValidator; private class SelectedItemValidator implements IVirtualItemValidator { - public boolean isItemVisible(VirtualItem item) { + @Override + public boolean isItemVisible(VirtualItem item) { // visible items. For now only mark the selected items as visible. for (int i = 0; i < fSelection.length; i++) { VirtualItem selectionItem = fSelection[i]; @@ -49,14 +50,15 @@ public class VirtualTree extends VirtualItem { return false; } - public void showItem(VirtualItem item) { + @Override + public void showItem(VirtualItem item) { } } /** * Set of listeners of the virtual tree. */ - private Set fVirtualItemListeners = new HashSet(1); + private Set<IVirtualItemListener> fVirtualItemListeners = new HashSet<IVirtualItemListener>(1); /** * The currently selected items. This array contains only @@ -85,22 +87,26 @@ public class VirtualTree extends VirtualItem { /** * Disposes the virtual tree. */ - public void dispose() { + @Override + public void dispose() { super.dispose(); fVirtualItemListeners.clear(); } - public void setNeedsCountUpdate() { + @Override + public void setNeedsCountUpdate() { super.setNeedsCountUpdate(); clearNeedsLabelUpdate(); clearNeedsDataUpdate(); } - public void setNeedsLabelUpdate() { + @Override + public void setNeedsLabelUpdate() { // no-op } - public void setData(String key, Object data) { + @Override + public void setData(String key, Object data) { super.setData(key, data); if (data == null) { clearNeedsDataUpdate(); @@ -134,25 +140,27 @@ public class VirtualTree extends VirtualItem { } public void fireItemDisposed(VirtualItem item) { - for (Iterator itr = fVirtualItemListeners.iterator(); itr.hasNext();) { - ((IVirtualItemListener)itr.next()).disposed(item); + for (IVirtualItemListener listener : fVirtualItemListeners) { + listener.disposed(item); } } public void fireItemRevealed(VirtualItem item) { - for (Iterator itr = fVirtualItemListeners.iterator(); itr.hasNext();) { - ((IVirtualItemListener)itr.next()).revealed(item); + for (IVirtualItemListener listener : fVirtualItemListeners) { + listener.revealed(item); } } - public void setData(Object data) { + @Override + public void setData(Object data) { super.setData(data); // The root item always has children as long as the input is non-null, // so that it should be expanded. setHasItems(data != null); } - public void setHasItems(boolean hasChildren) { + @Override + public void setHasItems(boolean hasChildren) { super.setHasItems(hasChildren); // The root item is always expanded as long as it has children. if (hasChildren) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTreeModelViewer.java index 1b57cb020..e376ec92c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTreeModelViewer.java @@ -68,7 +68,8 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @return presentation context */ - public IPresentationContext getPresentationContext() { + @Override + public IPresentationContext getPresentationContext() { return super.getPresentationContext(); } @@ -77,7 +78,8 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @param listener model delta listener */ - public void addModelChangedListener(IModelChangedListener listener) { + @Override + public void addModelChangedListener(IModelChangedListener listener) { super.addModelChangedListener(listener); } @@ -86,7 +88,8 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @param listener model delta listener */ - public void removeModelChangedListener(IModelChangedListener listener) { + @Override + public void removeModelChangedListener(IModelChangedListener listener) { super.removeModelChangedListener(listener); } @@ -95,7 +98,8 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @param listener listener */ - public void addViewerUpdateListener(IViewerUpdateListener listener) { + @Override + public void addViewerUpdateListener(IViewerUpdateListener listener) { super.addViewerUpdateListener(listener); } @@ -104,7 +108,8 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @param listener listener */ - public void removeViewerUpdateListener(IViewerUpdateListener listener) { + @Override + public void removeViewerUpdateListener(IViewerUpdateListener listener) { super.removeViewerUpdateListener(listener); } @@ -114,7 +119,8 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @return whether columns can be toggled on/off */ - public boolean canToggleColumns() { + @Override + public boolean canToggleColumns() { return super.canToggleColumns(); } @@ -124,7 +130,8 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @return column presentation or <code>null</code> */ - public IColumnPresentation getColumnPresentation() { + @Override + public IColumnPresentation getColumnPresentation() { return super.getColumnPresentation(); } @@ -134,7 +141,8 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @return visible columns identifiers or <code>null</code> */ - public String[] getVisibleColumns() { + @Override + public String[] getVisibleColumns() { return super.getVisibleColumns(); } @@ -143,7 +151,8 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @param memento the {@link IMemento} to read from */ - public void initState(IMemento memento) { + @Override + public void initState(IMemento memento) { super.initState(memento); } @@ -152,14 +161,16 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @param memento the {@link IMemento} to save to */ - public void saveState(IMemento memento) { + @Override + public void saveState(IMemento memento) { super.saveState(memento); } /** * @return Returns true if columns are being displayed currently. */ - public boolean isShowColumns() { + @Override + public boolean isShowColumns() { return super.isShowColumns(); } @@ -169,7 +180,8 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * @param show whether to show columns if the current input supports * columns */ - public void setShowColumns(boolean show) { + @Override + public void setShowColumns(boolean show) { super.setShowColumns(show); } @@ -181,23 +193,28 @@ public class VirtualTreeModelViewer extends InternalVirtualTreeModelViewer { * * @param ids column identifiers or <code>null</code> */ - public void setVisibleColumns(String[] ids) { + @Override + public void setVisibleColumns(String[] ids) { super.setVisibleColumns(ids); } - public void updateViewer(IModelDelta delta) { + @Override + public void updateViewer(IModelDelta delta) { super.updateViewer(delta); } - public ViewerLabel getElementLabel(TreePath path, String columnId) { + @Override + public ViewerLabel getElementLabel(TreePath path, String columnId) { return super.getElementLabel(path, columnId); } - public VirtualItem[] findItems(Object elementOrTreePath) { + @Override + public VirtualItem[] findItems(Object elementOrTreePath) { return super.findItems(elementOrTreePath); } - public VirtualItem findItem(TreePath path) { + @Override + public VirtualItem findItem(TreePath path) { return super.findItem(path); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractColumnPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractColumnPresentation.java index ddaf0f54f..4abe81e6b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractColumnPresentation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractColumnPresentation.java @@ -33,6 +33,7 @@ public abstract class AbstractColumnPresentation implements IColumnPresentation2 /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#init(org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override public void init(IPresentationContext context) { fContext = context; } @@ -40,6 +41,7 @@ public abstract class AbstractColumnPresentation implements IColumnPresentation2 /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#dispose() */ + @Override public void dispose() { fContext = null; } @@ -47,6 +49,7 @@ public abstract class AbstractColumnPresentation implements IColumnPresentation2 /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getImageDescriptor(java.lang.String) */ + @Override public ImageDescriptor getImageDescriptor(String id) { return null; } @@ -63,6 +66,7 @@ public abstract class AbstractColumnPresentation implements IColumnPresentation2 /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation2#getInitialColumnWidth(java.lang.String, int, java.lang.String[]) */ + @Override public int getInitialColumnWidth(String id, int treeWidgetWidth, String[] visibleColumnIds) { return -1; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractModelProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractModelProxy.java index ccf1ec15b..1098dc999 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractModelProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractModelProxy.java @@ -52,6 +52,7 @@ public abstract class AbstractModelProxy implements IModelProxy2 { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.IModelProxy#addModelChangedListener(org.eclipse.debug.internal.ui.viewers.IModelChangedListener) */ + @Override public void addModelChangedListener(IModelChangedListener listener) { synchronized (fListeners) { fListeners.add(listener); @@ -61,6 +62,7 @@ public abstract class AbstractModelProxy implements IModelProxy2 { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.IModelProxy#removeModelChangedListener(org.eclipse.debug.internal.ui.viewers.IModelChangedListener) */ + @Override public void removeModelChangedListener(IModelChangedListener listener) { synchronized (fListeners) { fListeners.remove(listener); @@ -82,10 +84,12 @@ public abstract class AbstractModelProxy implements IModelProxy2 { for (int i = 0; i < listeners.length; i++) { final IModelChangedListener listener = (IModelChangedListener) listeners[i]; ISafeRunnable safeRunnable = new ISafeRunnable() { + @Override public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } + @Override public void run() throws Exception { listener.modelChanged(root, AbstractModelProxy.this); } @@ -113,6 +117,7 @@ public abstract class AbstractModelProxy implements IModelProxy2 { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.IModelProxy#dispose() */ + @Override public synchronized void dispose() { if (fInstallJob != null) { fInstallJob.cancel(); @@ -135,6 +140,7 @@ public abstract class AbstractModelProxy implements IModelProxy2 { fDisposed = disposed; } + @Override public void initialize(ITreeModelViewer viewer) { setDisposed(false); @@ -142,7 +148,8 @@ public abstract class AbstractModelProxy implements IModelProxy2 { fViewer = viewer; fContext = viewer.getPresentationContext(); fInstallJob = new Job("Model Proxy installed notification job") {//$NON-NLS-1$ - protected IStatus run(IProgressMonitor monitor) { + @Override + protected IStatus run(IProgressMonitor monitor) { synchronized(this) { fInstallJob = null; } @@ -159,7 +166,8 @@ public abstract class AbstractModelProxy implements IModelProxy2 { * * @see org.eclipse.core.runtime.jobs.Job#shouldRun() */ - public boolean shouldRun() { + @Override + public boolean shouldRun() { return !isDisposed(); } }; @@ -181,6 +189,7 @@ public abstract class AbstractModelProxy implements IModelProxy2 { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.IModelProxy#init(org.eclipse.debug.internal.ui.viewers.IPresentationContext) */ + @Override public void init(IPresentationContext context) { } @@ -190,6 +199,7 @@ public abstract class AbstractModelProxy implements IModelProxy2 { * * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelProxy#installed(org.eclipse.jface.viewers.Viewer) */ + @Override public void installed(Viewer viewer) { } @@ -214,6 +224,7 @@ public abstract class AbstractModelProxy implements IModelProxy2 { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxy#isDisposed() */ + @Override public synchronized boolean isDisposed() { return fDisposed; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AsynchronousContentAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AsynchronousContentAdapter.java index 975955b54..16124acde 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AsynchronousContentAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AsynchronousContentAdapter.java @@ -35,8 +35,10 @@ public abstract class AsynchronousContentAdapter implements IAsynchronousContent * (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousContentAdapter#retrieveChildren(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.provisional.IChildrenRequestMonitor) */ - public void retrieveChildren(final Object parent, final IPresentationContext context, final IChildrenRequestMonitor result) { + @Override + public void retrieveChildren(final Object parent, final IPresentationContext context, final IChildrenRequestMonitor result) { Job job = new Job("Retrieving Children") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { if (!monitor.isCanceled()) { computeChildren(parent, context, result); @@ -65,8 +67,10 @@ public abstract class AsynchronousContentAdapter implements IAsynchronousContent * (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousContentAdapter#isContainer(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.provisional.IContainerRequestMonitor) */ - public void isContainer(final Object element, final IPresentationContext context, final IContainerRequestMonitor result) { + @Override + public void isContainer(final Object element, final IPresentationContext context, final IContainerRequestMonitor result) { Job job = new Job("Computing hasChildren") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { if (!monitor.isCanceled()) { computeIsContainer(element, context, result); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AsynchronousLabelAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AsynchronousLabelAdapter.java index 62c1c2c16..dae6eb4eb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AsynchronousLabelAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AsynchronousLabelAdapter.java @@ -37,10 +37,12 @@ public abstract class AsynchronousLabelAdapter implements IAsynchronousLabelAdap /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.IAsynchronousLabelAdapter#retrieveLabel(java.lang.Object, org.eclipse.debug.ui.viewers.IPresentationContext, org.eclipse.debug.ui.viewers.ILabelRequestMonitor) */ + @Override public void retrieveLabel(final Object element, final IPresentationContext context, final ILabelRequestMonitor result) { Job job = null; if (requiresUIJob(element)) { job = new UIJob("Retrieving labels") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { computeLabels(element, context, result); return Status.OK_STATUS; @@ -48,6 +50,7 @@ public abstract class AsynchronousLabelAdapter implements IAsynchronousLabelAdap }; } else { job = new Job("Retrieving labels") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { computeLabels(element, context, result); return Status.OK_STATUS; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointContainerProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointContainerProxy.java index 2f5113440..cb7432468 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointContainerProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointContainerProxy.java @@ -42,6 +42,7 @@ public class BreakpointContainerProxy extends AbstractModelProxy implements IChe /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.model.provisional.ICheckboxModelProxy#setChecked(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object, org.eclipse.jface.viewers.TreePath, boolean)
*/
+ @Override
public boolean setChecked(IPresentationContext context, Object viewerInput, TreePath path, boolean checked) {
boolean atLeastOne = false;
IBreakpoint[] breakpoints = fContainer.getBreakpoints();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointManagerProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointManagerProxy.java index 639872ca6..4cdf6b506 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointManagerProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointManagerProxy.java @@ -1,5 +1,5 @@ /***************************************************************** - * Copyright (c) 2009, 2010 Texas Instruments and others + * Copyright (c) 2009, 2013 Texas Instruments and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * Patrick Chuong (Texas Instruments) - Initial API and implementation (Bug 238956) * Wind River Systems - ongoing enhancements and bug fixing + * IBM Corporation - bug fixing *****************************************************************/ package org.eclipse.debug.internal.ui.viewers.update; @@ -67,7 +68,7 @@ public class BreakpointManagerProxy extends AbstractModelProxy { /** * List of posted deltas ready to be fired. */ - private List/*<DeltaInfo>*/ fPendingDeltas = new LinkedList(); + private List<DeltaInfo> fPendingDeltas = new LinkedList<DeltaInfo>(); /** @@ -98,6 +99,7 @@ public class BreakpointManagerProxy extends AbstractModelProxy { * (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#installed(org.eclipse.jface.viewers.Viewer) */ + @Override public void installed(Viewer viewer) { super.installed(viewer); if (fProvider != null) { @@ -109,6 +111,7 @@ public class BreakpointManagerProxy extends AbstractModelProxy { * (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#dispose() */ + @Override public void dispose() { fProvider.unregisterModelProxy(fInput, this); synchronized(this) { @@ -148,8 +151,8 @@ public class BreakpointManagerProxy extends AbstractModelProxy { // If we are processing a select delta, remove the previous select delta. if (select) { - for (Iterator itr = fPendingDeltas.iterator(); itr.hasNext(); ) { - if ( ((DeltaInfo)itr.next()).fSelect ) { + for (Iterator<DeltaInfo> itr = fPendingDeltas.iterator(); itr.hasNext();) { + if ( itr.next().fSelect ) { itr.remove(); } } @@ -162,7 +165,8 @@ public class BreakpointManagerProxy extends AbstractModelProxy { setSystem(true); } - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { Object[] deltas; synchronized(BreakpointManagerProxy.this) { deltas = fPendingDeltas.toArray(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointProxy.java index b4308d6c8..f27d14e02 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointProxy.java @@ -41,6 +41,7 @@ public class BreakpointProxy extends AbstractModelProxy implements ICheckboxMode /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.model.provisional.ICheckboxModelProxy#setChecked(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object, org.eclipse.jface.viewers.TreePath, boolean)
*/
+ @Override
public boolean setChecked(IPresentationContext context, Object viewerInput, TreePath path, boolean checked) {
try {
fBreakpoint.setEnabled(checked);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DebugTargetEventHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DebugTargetEventHandler.java index de9cca250..4af6b9ddd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DebugTargetEventHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DebugTargetEventHandler.java @@ -35,10 +35,12 @@ public class DebugTargetEventHandler extends DebugEventHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler#handlesEvent(org.eclipse.debug.core.DebugEvent) */ + @Override protected boolean handlesEvent(DebugEvent event) { return event.getSource() instanceof IDebugTarget; } + @Override protected void handleChange(DebugEvent event) { int flags = IModelDelta.STATE; if (event.getDetail() == DebugEvent.CONTENT) { @@ -47,18 +49,22 @@ public class DebugTargetEventHandler extends DebugEventHandler { fireDelta((IDebugTarget) event.getSource(), flags); } + @Override protected void handleCreate(DebugEvent event) { fireDelta((IDebugTarget) event.getSource(), IModelDelta.EXPAND); } + @Override protected void handleResume(DebugEvent event) { fireDelta((IDebugTarget) event.getSource(), IModelDelta.CONTENT | IModelDelta.STATE | IModelDelta.SELECT); } + @Override protected void handleSuspend(DebugEvent event) { fireDelta((IDebugTarget) event.getSource(), IModelDelta.CONTENT | IModelDelta.STATE); } + @Override protected void handleTerminate(DebugEvent event) { fireDelta((IDebugTarget) event.getSource(), IModelDelta.CONTENT | IModelDelta.STATE | IModelDelta.UNINSTALL); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DebugTargetProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DebugTargetProxy.java index 88c643fee..ba61da8bc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DebugTargetProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DebugTargetProxy.java @@ -40,6 +40,7 @@ public class DebugTargetProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#dispose() */ + @Override public synchronized void dispose() { super.dispose(); fDebugTarget = null; @@ -48,6 +49,7 @@ public class DebugTargetProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#containsEvent(org.eclipse.debug.core.DebugEvent) */ + @Override protected boolean containsEvent(DebugEvent event) { Object source = event.getSource(); if (source instanceof IDebugElement) { @@ -63,7 +65,8 @@ public class DebugTargetProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#createEventHandlers() */ - protected DebugEventHandler[] createEventHandlers() { + @Override + protected DebugEventHandler[] createEventHandlers() { ThreadEventHandler threadEventHandler = new ThreadEventHandler(this); return new DebugEventHandler[] { new DebugTargetEventHandler(this), threadEventHandler, new StackFrameEventHandler(this, threadEventHandler) }; @@ -72,6 +75,7 @@ public class DebugTargetProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelProxy#installed(org.eclipse.jface.viewers.Viewer) */ + @Override public void installed(Viewer viewer) { // select any thread that is already suspended after installation IDebugTarget target = fDebugTarget; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultExpressionModelProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultExpressionModelProxy.java index 8c7105a3f..f0fb0f91c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultExpressionModelProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultExpressionModelProxy.java @@ -29,6 +29,7 @@ public class DefaultExpressionModelProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#dispose() */ + @Override public synchronized void dispose() { super.dispose(); fExpression = null; @@ -37,6 +38,7 @@ public class DefaultExpressionModelProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#createEventHandlers() */ + @Override protected DebugEventHandler[] createEventHandlers() { return new DebugEventHandler[]{new ExpressionEventHandler(this)}; } @@ -44,6 +46,7 @@ public class DefaultExpressionModelProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#containsEvent(org.eclipse.debug.core.DebugEvent) */ + @Override protected boolean containsEvent(DebugEvent event) { // handles change events from expressions and debug targets if (event.getSource().equals(fExpression) || event.getSource().equals(fExpression.getDebugTarget())) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultModelProxyFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultModelProxyFactory.java index 6d00a473f..0856e4663 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultModelProxyFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultModelProxyFactory.java @@ -33,6 +33,7 @@ import org.eclipse.debug.ui.IDebugUIConstants; public class DefaultModelProxyFactory implements IModelProxyFactory { + @Override public IModelProxy createModelProxy(Object element, IPresentationContext context) { String id = context.getId(); if (IDebugUIConstants.ID_DEBUG_VIEW.equals(id)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultModelSelectionPolicyFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultModelSelectionPolicyFactory.java index 6d87308e3..bc98f89d6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultModelSelectionPolicyFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultModelSelectionPolicyFactory.java @@ -24,6 +24,7 @@ import org.eclipse.debug.ui.IDebugUIConstants; */ public class DefaultModelSelectionPolicyFactory implements IModelSelectionPolicyFactory { + @Override public IModelSelectionPolicy createModelSelectionPolicyAdapter(Object element, IPresentationContext context) { if (IDebugUIConstants.ID_DEBUG_VIEW.equals(context.getId())) { if (element instanceof IDebugElement) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultSelectionPolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultSelectionPolicy.java index 655fad9c9..fcefebce4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultSelectionPolicy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultSelectionPolicy.java @@ -44,6 +44,7 @@ public class DefaultSelectionPolicy implements IModelSelectionPolicy { /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.IModelSelectionPolicy#contains(org.eclipse.jface.viewers.ISelection, org.eclipse.debug.ui.viewers.IPresentationContext) */ + @Override public boolean contains(ISelection selection, IPresentationContext context) { if (IDebugUIConstants.ID_DEBUG_VIEW.equals(context.getId())) { if (selection instanceof IStructuredSelection) { @@ -61,6 +62,7 @@ public class DefaultSelectionPolicy implements IModelSelectionPolicy { /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.IModelSelectionPolicy#overrides(org.eclipse.jface.viewers.ISelection, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.ui.viewers.IPresentationContext) */ + @Override public boolean overrides(ISelection existing, ISelection candidate, IPresentationContext context) { if (IDebugUIConstants.ID_DEBUG_VIEW.equals(context.getId())) { if (existing instanceof IStructuredSelection && candidate instanceof IStructuredSelection) { @@ -90,6 +92,7 @@ public class DefaultSelectionPolicy implements IModelSelectionPolicy { /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.IModelSelectionPolicy#isSticky(org.eclipse.jface.viewers.ISelection, org.eclipse.debug.ui.viewers.IPresentationContext) */ + @Override public boolean isSticky(ISelection selection, IPresentationContext context) { if (IDebugUIConstants.ID_DEBUG_VIEW.equals(context.getId())) { if (selection instanceof IStructuredSelection) { @@ -123,7 +126,8 @@ public class DefaultSelectionPolicy implements IModelSelectionPolicy { * * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicy#replaceInvalidSelection(ISelection, ISelection) */ - public ISelection replaceInvalidSelection(ISelection selection, ISelection newSelection) { + @Override + public ISelection replaceInvalidSelection(ISelection selection, ISelection newSelection) { if (selection instanceof ITreeSelection) { TreePath[] paths = ((ITreeSelection)selection).getPaths(); if (paths.length > 0 && paths[0].getSegmentCount() > 1) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultVariableViewModelProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultVariableViewModelProxy.java index dbab964af..e66723808 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultVariableViewModelProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultVariableViewModelProxy.java @@ -37,11 +37,13 @@ public class DefaultVariableViewModelProxy extends EventHandlerModelProxy { fFrame = frame; } + @Override public void dispose() { super.dispose(); fFrame = null; } + @Override protected DebugEventHandler[] createEventHandlers() { return new DebugEventHandler[] { new VariablesViewEventHandler(this, fFrame) }; } @@ -49,6 +51,7 @@ public class DefaultVariableViewModelProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#containsEvent(org.eclipse.debug.core.DebugEvent) */ + @Override protected synchronized boolean containsEvent(DebugEvent event) { if (!isDisposed()) { Object source = event.getSource(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultWatchExpressionModelProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultWatchExpressionModelProxy.java index f09ffc14a..d2beb35d8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultWatchExpressionModelProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultWatchExpressionModelProxy.java @@ -50,9 +50,11 @@ public class DefaultWatchExpressionModelProxy extends DefaultExpressionModelProx /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#installed(org.eclipse.jface.viewers.Viewer) */ + @Override public void installed(final Viewer viewer) { super.installed(viewer); UIJob job = new UIJob("install watch expression model proxy") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (!isDisposed()) { IWorkbenchWindow[] workbenchWindows = PlatformUI.getWorkbench().getWorkbenchWindows(); @@ -86,6 +88,7 @@ public class DefaultWatchExpressionModelProxy extends DefaultExpressionModelProx /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DefaultExpressionModelProxy#dispose() */ + @Override public synchronized void dispose() { super.dispose(); if (fWindow != null) { @@ -97,6 +100,7 @@ public class DefaultWatchExpressionModelProxy extends DefaultExpressionModelProx /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#createEventHandlers() */ + @Override protected DebugEventHandler[] createEventHandlers() { return new DebugEventHandler[]{new ExpressionEventHandler(this)}; } @@ -129,6 +133,7 @@ public class DefaultWatchExpressionModelProxy extends DefaultExpressionModelProx /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextListener#debugContextChanged(org.eclipse.debug.ui.contexts.DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { contextActivated(event.getContext()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/EventHandlerModelProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/EventHandlerModelProxy.java index 8adc0d4ca..4e418ec0c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/EventHandlerModelProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/EventHandlerModelProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,7 +29,7 @@ public abstract class EventHandlerModelProxy extends AbstractModelProxy implemen /** * Map of elements to timer tasks */ - private Map fTimerTasks = new HashMap(); + private Map<Object, PendingSuspendTask> fTimerTasks = new HashMap<Object, PendingSuspendTask>(); /** * Timer for timer tasks @@ -40,7 +40,7 @@ public abstract class EventHandlerModelProxy extends AbstractModelProxy implemen * Map of event source to resume events with a pending suspend that timed * out. */ - private Map fPendingSuspends = new HashMap(); + private Map<Object, DebugEvent> fPendingSuspends = new HashMap<Object, DebugEvent>(); /** * Event handlers for specific elements @@ -73,7 +73,8 @@ public abstract class EventHandlerModelProxy extends AbstractModelProxy implemen * * @see java.util.TimerTask#run() */ - public void run() { + @Override + public void run() { synchronized (fPendingSuspends) { fPendingSuspends.put(fEvent.getSource(), fEvent); } @@ -89,7 +90,8 @@ public abstract class EventHandlerModelProxy extends AbstractModelProxy implemen */ protected abstract DebugEventHandler[] createEventHandlers(); - public synchronized void dispose() { + @Override + public synchronized void dispose() { super.dispose(); fTimer.cancel(); fTimerTasks.clear(); @@ -100,7 +102,8 @@ public abstract class EventHandlerModelProxy extends AbstractModelProxy implemen } } - public void init(IPresentationContext context) { + @Override + public void init(IPresentationContext context) { super.init(context); DebugPlugin.getDefault().addDebugEventListener(this); fHandlers = createEventHandlers(); @@ -111,7 +114,8 @@ public abstract class EventHandlerModelProxy extends AbstractModelProxy implemen * * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ - public final void handleDebugEvents(DebugEvent[] events) { + @Override + public final void handleDebugEvents(DebugEvent[] events) { if (isDisposed()) { return; } @@ -186,14 +190,14 @@ public abstract class EventHandlerModelProxy extends AbstractModelProxy implemen protected void dispatchSuspend(DebugEventHandler handler, DebugEvent event) { // stop timer, if any synchronized (this) { - TimerTask task = (TimerTask) fTimerTasks.remove(event.getSource()); + TimerTask task = fTimerTasks.remove(event.getSource()); if (task != null) { task.cancel(); } } DebugEvent resume = null; synchronized (this) { - resume = (DebugEvent) fPendingSuspends.remove(event.getSource()); + resume = fPendingSuspends.remove(event.getSource()); } if (resume == null) { handler.handleSuspend(event); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ExpressionEventHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ExpressionEventHandler.java index 1b677dfa3..0c926de3d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ExpressionEventHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ExpressionEventHandler.java @@ -32,11 +32,13 @@ public class ExpressionEventHandler extends DebugEventHandler { super(proxy); } - protected boolean handlesEvent(DebugEvent event) { + @Override + protected boolean handlesEvent(DebugEvent event) { return event.getKind() == DebugEvent.CHANGE; } - protected void handleChange(DebugEvent event) { + @Override + protected void handleChange(DebugEvent event) { ModelDelta delta = new ModelDelta(DebugPlugin.getDefault().getExpressionManager(), IModelDelta.NO_CHANGE); IExpression expression = null; if (event.getSource() instanceof IExpression) { @@ -62,7 +64,8 @@ public class ExpressionEventHandler extends DebugEventHandler { } } - protected void refreshRoot(DebugEvent event) { + @Override + protected void refreshRoot(DebugEvent event) { ModelDelta delta = new ModelDelta(DebugPlugin.getDefault().getExpressionManager(), IModelDelta.CONTENT); fireDelta(delta); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ExpressionManagerModelProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ExpressionManagerModelProxy.java index 53527f91a..0b780533d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ExpressionManagerModelProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ExpressionManagerModelProxy.java @@ -35,6 +35,7 @@ public class ExpressionManagerModelProxy extends AbstractModelProxy implements I /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#init(org.eclipse.debug.internal.ui.viewers.IPresentationContext) */ + @Override public void init(IPresentationContext context) { super.init(context); getExpressionManager().addExpressionListener(this); @@ -44,6 +45,7 @@ public class ExpressionManagerModelProxy extends AbstractModelProxy implements I /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#installed(org.eclipse.jface.viewers.Viewer) */ + @Override public void installed(Viewer viewer) { updateExpressions(getExpressionManager().getExpressions(), IModelDelta.INSTALL); } @@ -58,6 +60,7 @@ public class ExpressionManagerModelProxy extends AbstractModelProxy implements I /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#dispose() */ + @Override public synchronized void dispose() { getPresentationContext().removePropertyChangeListener(this); super.dispose(); @@ -67,6 +70,7 @@ public class ExpressionManagerModelProxy extends AbstractModelProxy implements I /* (non-Javadoc) * @see org.eclipse.debug.internal.core.IExpressionsListener2#expressionsMoved(org.eclipse.debug.core.model.IExpression[], int) */ + @Override public void expressionsMoved(IExpression[] expressions, int index){ int count = getElementsCount(); ModelDelta delta = new ModelDelta(getExpressionManager(), -1, IModelDelta.NO_CHANGE, count); @@ -84,6 +88,7 @@ public class ExpressionManagerModelProxy extends AbstractModelProxy implements I /* (non-Javadoc) * @see org.eclipse.debug.internal.core.IExpressionsListener2#expressionsInserted(org.eclipse.debug.core.model.IExpression[], int) */ + @Override public void expressionsInserted(IExpression[] expressions, int index){ int count = getElementsCount(); ModelDelta delta = new ModelDelta(getExpressionManager(), -1, IModelDelta.NO_CHANGE, count); @@ -97,6 +102,7 @@ public class ExpressionManagerModelProxy extends AbstractModelProxy implements I /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionsListener#expressionsAdded(org.eclipse.debug.core.model.IExpression[]) */ + @Override public void expressionsAdded(IExpression[] expressions) { int index = getExpressionManager().getExpressions().length - expressions.length; int count = getElementsCount(); @@ -111,6 +117,7 @@ public class ExpressionManagerModelProxy extends AbstractModelProxy implements I /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionsListener#expressionsRemoved(org.eclipse.debug.core.model.IExpression[]) */ + @Override public void expressionsRemoved(IExpression[] expressions) { updateExpressions(expressions, IModelDelta.REMOVED | IModelDelta.UNINSTALL); } @@ -118,6 +125,7 @@ public class ExpressionManagerModelProxy extends AbstractModelProxy implements I /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionsListener#expressionsChanged(org.eclipse.debug.core.model.IExpression[]) */ + @Override public void expressionsChanged(IExpression[] expressions) { updateExpressions(expressions, IModelDelta.CONTENT | IModelDelta.STATE); } @@ -138,7 +146,8 @@ public class ExpressionManagerModelProxy extends AbstractModelProxy implements I (getPresentationContext().getColumns() != null ? 1 : 0); } - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { // If columns are turned on/off, refresh the view to account for the // "Add new expression" element. if (IPresentationContext.PROPERTY_COLUMNS.equals(event.getProperty())) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchManagerProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchManagerProxy.java index fa014b865..e041ab6b8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchManagerProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchManagerProxy.java @@ -30,6 +30,7 @@ public class LaunchManagerProxy extends AbstractModelProxy implements ILaunchesL /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.AbstractModelProxy#init(org.eclipse.debug.internal.ui.viewers.IPresentationContext) */ + @Override public synchronized void init(IPresentationContext context) { super.init(context); fLaunchManager = DebugPlugin.getDefault().getLaunchManager(); @@ -39,6 +40,7 @@ public class LaunchManagerProxy extends AbstractModelProxy implements ILaunchesL /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#installed(org.eclipse.jface.viewers.Viewer) */ + @Override public void installed(Viewer viewer) { // expand existing launches ILaunch[] launches = fLaunchManager.getLaunches(); @@ -50,6 +52,7 @@ public class LaunchManagerProxy extends AbstractModelProxy implements ILaunchesL /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.AbstractModelProxy#dispose() */ + @Override public synchronized void dispose() { super.dispose(); if (fLaunchManager != null) { @@ -61,12 +64,14 @@ public class LaunchManagerProxy extends AbstractModelProxy implements ILaunchesL /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesTerminated(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesRemoved(ILaunch[] launches) { fireDelta(launches, IModelDelta.REMOVED); } @@ -74,6 +79,7 @@ public class LaunchManagerProxy extends AbstractModelProxy implements ILaunchesL /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesAdded(ILaunch[] launches) { fireDelta(launches, IModelDelta.ADDED | IModelDelta.INSTALL); } @@ -81,6 +87,7 @@ public class LaunchManagerProxy extends AbstractModelProxy implements ILaunchesL /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesChanged(ILaunch[] launches) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchProxy.java index 130e62c87..97ce3f571 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -39,7 +39,7 @@ public class LaunchProxy extends AbstractModelProxy implements ILaunchesListener * Set of launch's previous children. When a child is added, * its model proxy is installed. */ - private Set fPrevChildren = new HashSet(); + private Set<Object> fPrevChildren = new HashSet<Object>(); /** * Constructs a new model proxy for the given launch. @@ -53,6 +53,7 @@ public class LaunchProxy extends AbstractModelProxy implements ILaunchesListener /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.AbstractModelProxy#init(org.eclipse.debug.internal.ui.viewers.IPresentationContext) */ + @Override public void init(IPresentationContext context) { super.init(context); DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this); @@ -61,6 +62,7 @@ public class LaunchProxy extends AbstractModelProxy implements ILaunchesListener /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#installed(org.eclipse.jface.viewers.Viewer) */ + @Override public void installed(Viewer viewer) { // install model proxies for existing children installModelProxies(); @@ -69,6 +71,7 @@ public class LaunchProxy extends AbstractModelProxy implements ILaunchesListener /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.AbstractModelProxy#dispose() */ + @Override public void dispose() { super.dispose(); DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this); @@ -79,6 +82,7 @@ public class LaunchProxy extends AbstractModelProxy implements ILaunchesListener /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesTerminated(ILaunch[] launches) { for (int i = 0; i < launches.length; i++) { if (launches[i] == fLaunch) { @@ -91,6 +95,7 @@ public class LaunchProxy extends AbstractModelProxy implements ILaunchesListener /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesRemoved(ILaunch[] launches) { for (int i = 0; i < launches.length; i++) { if (launches[i] == fLaunch) { @@ -103,12 +108,14 @@ public class LaunchProxy extends AbstractModelProxy implements ILaunchesListener /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesAdded(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesChanged(ILaunch[] launches) { for (int i = 0; i < launches.length; i++) { if (launches[i] == fLaunch) { @@ -139,8 +146,8 @@ public class LaunchProxy extends AbstractModelProxy implements ILaunchesListener launchDelta.addNode(child, indexOf(child, children), IModelDelta.INSTALL, -1); } } - List childrenList = Arrays.asList(children); - for (Iterator itr = fPrevChildren.iterator(); itr.hasNext();) { + List<Object> childrenList = Arrays.asList(children); + for (Iterator<Object> itr = fPrevChildren.iterator(); itr.hasNext();) { Object child = itr.next(); if (!childrenList.contains(child)) { itr.remove(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/MemoryBlockProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/MemoryBlockProxy.java index ea17c98f1..4945f6f32 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/MemoryBlockProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/MemoryBlockProxy.java @@ -24,6 +24,7 @@ public class MemoryBlockProxy extends EventHandlerModelProxy { private IMemoryBlock fMemoryBlock; private DebugEventHandler fDebugEventHandler = new DebugEventHandler(this) { + @Override protected boolean handlesEvent(DebugEvent event) { if (event.getKind() == DebugEvent.CHANGE && event.getSource() == fMemoryBlock) return true; @@ -37,6 +38,7 @@ public class MemoryBlockProxy extends EventHandlerModelProxy { return false; } + @Override protected void handleChange(DebugEvent event) { if (event.getDetail() == DebugEvent.STATE) { @@ -50,11 +52,13 @@ public class MemoryBlockProxy extends EventHandlerModelProxy { } } + @Override protected void handleSuspend(DebugEvent event) { ModelDelta delta = new ModelDelta(fMemoryBlock, IModelDelta.CONTENT); fireModelChanged(delta); } + @Override public synchronized void dispose() { super.dispose(); }}; @@ -64,10 +68,12 @@ public class MemoryBlockProxy extends EventHandlerModelProxy { fMemoryBlock = mb; } + @Override protected DebugEventHandler[] createEventHandlers() { return new DebugEventHandler[]{fDebugEventHandler}; } + @Override public void installed(Viewer viewer) { super.installed(viewer); setInstalled(true); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/MemoryRetrievalProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/MemoryRetrievalProxy.java index c6dba1f6c..8cdfebb6a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/MemoryRetrievalProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/MemoryRetrievalProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,7 @@ * display memory blocks that do not reference IDebugTarget * *******************************************************************************/ - + package org.eclipse.debug.internal.ui.viewers.update; import java.util.Iterator; @@ -39,135 +39,136 @@ import org.eclipse.ui.progress.UIJob; public class MemoryRetrievalProxy extends AbstractModelProxy implements IMemoryBlockListener { private IMemoryBlockRetrieval fRetrieval; - public MemoryRetrievalProxy(IMemoryBlockRetrieval retrieval) - { + public MemoryRetrievalProxy(IMemoryBlockRetrieval retrieval) { fRetrieval = retrieval; - + } - + + @Override public void memoryBlocksAdded(IMemoryBlock[] memory) { IMemoryBlock[] allMB = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(fRetrieval); int lastIndex = allMB.length - memory.length; ModelDelta delta = new ModelDelta(fRetrieval, 0, IModelDelta.NO_CHANGE, allMB.length); - - for (int i=0; i<memory.length; i++){ + + for (int i = 0; i < memory.length; i++) { IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(memory[i]); - - if (retrieval != null) - { - if (retrieval == fRetrieval) - { + + if (retrieval != null) { + if (retrieval == fRetrieval) { // select the newly added memory block - delta.addNode(memory[i], lastIndex+i, IModelDelta.ADDED | IModelDelta.SELECT, 0); + delta.addNode(memory[i], lastIndex + i, IModelDelta.ADDED | IModelDelta.SELECT, 0); } } } - + fireModelChanged(delta); } + @Override public void memoryBlocksRemoved(final IMemoryBlock[] memory) { - - UIJob job = new UIJob("memory blocks removed"){ //$NON-NLS-1$ + UIJob job = new UIJob("memory blocks removed") { //$NON-NLS-1$ + + @Override public IStatus runInUIThread(IProgressMonitor monitor) { ModelDelta delta = new ModelDelta(fRetrieval, IModelDelta.NO_CHANGE); - + // find a memory block to select - - for (int i=0; i<memory.length; i++){ + + for (int i = 0; i < memory.length; i++) { IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(memory[i]); - - if (retrieval != null) - { - if (retrieval == fRetrieval) - { - // do not change selection if the memory block removed is not + + if (retrieval != null) { + if (retrieval == fRetrieval) { + // do not change selection if the memory block + // removed is not // currently selected // #getCurrentSelection must be run on the UI thread - if (isMemoryBlockSelected(getCurrentSelection(), memory[i])) + if (isMemoryBlockSelected(getCurrentSelection(), memory[i])) { addSelectDeltaNode(delta); + } delta.addNode(memory[i], IModelDelta.REMOVED); } } } - + fireModelChanged(delta); return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } + @Override public void init(IPresentationContext context) { super.init(context); DebugPlugin.getDefault().getMemoryBlockManager().addListener(this); } - - public void installed(Viewer viewer) { + + @Override + public void installed(Viewer viewer) { super.installed(viewer); - + // Set the initial selection when the proxy is installed // Otherwise, rendering pane cannot be populated. setInitialSelection(); } /** - * Set the initial memory block selection when the proxy is installed. - * This is done to ensure that when the memory view is opened, there is an initial - * selection. Otherwise, the Rendering Pane will show up as blank. + * Set the initial memory block selection when the proxy is installed. This + * is done to ensure that when the memory view is opened, there is an + * initial selection. Otherwise, the Rendering Pane will show up as blank. + * * @since 3.4 */ protected void setInitialSelection() { IMemoryBlock[] allMB = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(fRetrieval); - if (allMB.length > 0) - { + if (allMB.length > 0) { ModelDelta delta = new ModelDelta(fRetrieval, 0, IModelDelta.NO_CHANGE, allMB.length); delta.addNode(allMB[0], 0, IModelDelta.SELECT, 0); fireModelChanged(delta); } } + @Override public synchronized void dispose() { super.dispose(); DebugPlugin.getDefault().getMemoryBlockManager().removeListener(this); } - private void addSelectDeltaNode(ModelDelta delta) - { + private void addSelectDeltaNode(ModelDelta delta) { IMemoryBlock[] memoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(fRetrieval); - if (memoryBlocks != null && memoryBlocks.length > 0) - { + if (memoryBlocks != null && memoryBlocks.length > 0) { delta.addNode(memoryBlocks[0], IModelDelta.SELECT); } } - + private IStructuredSelection getCurrentSelection() { Viewer viewer = getViewer(); if (viewer instanceof StructuredViewer) { StructuredViewer sv = (StructuredViewer) viewer; ISelection selection = sv.getSelection(); - if (selection instanceof IStructuredSelection) - return (IStructuredSelection)selection; + if (selection instanceof IStructuredSelection) { + return (IStructuredSelection) selection; + } } return StructuredSelection.EMPTY; } - - private boolean isMemoryBlockSelected(IStructuredSelection selection, IMemoryBlock memoryBlock) - { - if (!selection.isEmpty()) - { - Iterator iter = selection.iterator(); - while (iter.hasNext()) - { + + private boolean isMemoryBlockSelected(IStructuredSelection selection, IMemoryBlock memoryBlock) { + if (!selection.isEmpty()) { + Iterator<?> iter = selection.iterator(); + while (iter.hasNext()) { Object sel = iter.next(); - if (sel == memoryBlock) + if (sel == memoryBlock) { return true; - - if (sel instanceof IMemoryRendering) - { - if (((IMemoryRendering)sel).getMemoryBlock() == memoryBlock) + } + + if (sel instanceof IMemoryRendering) { + if (((IMemoryRendering) sel).getMemoryBlock() == memoryBlock) { return true; + } } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ProcessProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ProcessProxy.java index 14cfce57e..7ad095245 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ProcessProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ProcessProxy.java @@ -24,18 +24,22 @@ public class ProcessProxy extends EventHandlerModelProxy { private IProcess fProcess; private DebugEventHandler fProcessEventHandler = new DebugEventHandler(this) { - protected boolean handlesEvent(DebugEvent event) { + @Override + protected boolean handlesEvent(DebugEvent event) { return event.getSource().equals(fProcess); } + @Override protected void handleChange(DebugEvent event) { fireProcessDelta(IModelDelta.STATE); } - protected void handleCreate(DebugEvent event) { + @Override + protected void handleCreate(DebugEvent event) { // do nothing - Launch change notification handles this } + @Override protected void handleTerminate(DebugEvent event) { fireProcessDelta(IModelDelta.STATE | IModelDelta.UNINSTALL); } @@ -61,6 +65,7 @@ public class ProcessProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#dispose() */ + @Override public synchronized void dispose() { super.dispose(); fProcess = null; @@ -70,17 +75,20 @@ public class ProcessProxy extends EventHandlerModelProxy { fProcess = process; } - protected synchronized boolean containsEvent(DebugEvent event) { + @Override + protected synchronized boolean containsEvent(DebugEvent event) { return event.getSource().equals(fProcess); } - protected DebugEventHandler[] createEventHandlers() { + @Override + protected DebugEventHandler[] createEventHandlers() { return new DebugEventHandler[] {fProcessEventHandler}; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.AbstractModelProxy#installed() */ + @Override public void installed(Viewer viewer) { super.installed(viewer); // select process if in run mode diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/StackFrameEventHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/StackFrameEventHandler.java index 39d5c95f3..427a5c459 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/StackFrameEventHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/StackFrameEventHandler.java @@ -36,6 +36,7 @@ public class StackFrameEventHandler extends DebugEventHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler#handlesEvent(org.eclipse.debug.core.DebugEvent) */ + @Override protected boolean handlesEvent(DebugEvent event) { return event.getSource() instanceof IStackFrame; } @@ -43,6 +44,7 @@ public class StackFrameEventHandler extends DebugEventHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler#handleChange(org.eclipse.debug.core.DebugEvent) */ + @Override protected void handleChange(DebugEvent event) { IStackFrame frame = (IStackFrame) event.getSource(); ModelDelta root = fThreadHandler.buildRootDelta(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ThreadEventHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ThreadEventHandler.java index 7ca9f481f..4f8591004 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ThreadEventHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ThreadEventHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -37,12 +37,12 @@ public class ThreadEventHandler extends DebugEventHandler { * to select a thread when another is resumed. Threads * are added in the order they suspend. */ - private Set fThreadQueue = new LinkedHashSet(); + private Set<IThread> fThreadQueue = new LinkedHashSet<IThread>(); /** * Map of previous TOS per thread */ - private Map fLastTopFrame = new HashMap(); + private Map<IThread, IStackFrame> fLastTopFrame = new HashMap<IThread, IStackFrame>(); /** * Constructs and event handler for a threads in the given viewer. * @@ -55,12 +55,14 @@ public class ThreadEventHandler extends DebugEventHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler#dispose() */ + @Override public synchronized void dispose() { fLastTopFrame.clear(); fThreadQueue.clear(); super.dispose(); } + @Override protected void handleSuspend(DebugEvent event) { IThread thread = (IThread) event.getSource(); if (event.isEvaluation()) { @@ -94,6 +96,8 @@ public class ThreadEventHandler extends DebugEventHandler { case DebugEvent.CLIENT_REQUEST: extras = IModelDelta.EXPAND; break; + default: + break; } fireDeltaUpdatingSelectedFrame(thread, IModelDelta.NO_CHANGE | extras, event); } @@ -109,6 +113,7 @@ public class ThreadEventHandler extends DebugEventHandler { return o1.equals(o2); } + @Override protected void handleResume(DebugEvent event) { IThread thread = removeSuspendedThread(event); fireDeltaAndClearTopFrame(thread, IModelDelta.STATE | IModelDelta.CONTENT | IModelDelta.SELECT); @@ -118,10 +123,12 @@ public class ThreadEventHandler extends DebugEventHandler { } } + @Override protected void handleCreate(DebugEvent event) { fireDeltaAndClearTopFrame((IThread) event.getSource(), IModelDelta.ADDED | IModelDelta.STATE); } + @Override protected void handleTerminate(DebugEvent event) { IThread thread = (IThread) event.getSource(); IDebugTarget target = thread.getDebugTarget(); @@ -131,6 +138,7 @@ public class ThreadEventHandler extends DebugEventHandler { } } + @Override protected void handleChange(DebugEvent event) { if (event.getDetail() == DebugEvent.STATE) { fireDeltaUpdatingThread((IThread) event.getSource(), IModelDelta.STATE); @@ -139,6 +147,7 @@ public class ThreadEventHandler extends DebugEventHandler { } } + @Override protected void handleLateSuspend(DebugEvent suspend, DebugEvent resume) { IThread thread = queueSuspendedThread(suspend); if (suspend.isEvaluation() && suspend.getDetail() == DebugEvent.EVALUATION_IMPLICIT) { @@ -159,6 +168,7 @@ public class ThreadEventHandler extends DebugEventHandler { } } + @Override protected void handleSuspendTimeout(DebugEvent event) { IThread thread = removeSuspendedThread(event); // don't collapse thread when waiting for long step or evaluation to complete @@ -213,7 +223,7 @@ public class ThreadEventHandler extends DebugEventHandler { ModelDelta node = addPathToThread(delta, thread); IStackFrame prev = null; synchronized (this) { - prev = (IStackFrame) fLastTopFrame.get(thread); + prev = fLastTopFrame.get(thread); } IStackFrame frame = null; try { @@ -318,6 +328,7 @@ public class ThreadEventHandler extends DebugEventHandler { fireDelta(delta); } + @Override protected boolean handlesEvent(DebugEvent event) { return event.getSource() instanceof IThread; } @@ -349,7 +360,7 @@ public class ThreadEventHandler extends DebugEventHandler { protected synchronized IThread getNextSuspendedThread() { if (!fThreadQueue.isEmpty()) { - return (IThread) fThreadQueue.iterator().next(); + return fThreadQueue.iterator().next(); } return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/VariablesViewEventHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/VariablesViewEventHandler.java index f72a8516b..6a7823fa5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/VariablesViewEventHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/VariablesViewEventHandler.java @@ -30,10 +30,12 @@ public class VariablesViewEventHandler extends DebugEventHandler { fFrame = frame; } + @Override protected boolean handlesEvent(DebugEvent event) { return true; } + @Override protected void refreshRoot(DebugEvent event) { if (event.getDetail() != DebugEvent.EVALUATION_IMPLICIT) { // Don't refresh everytime an implicit evaluation finishes diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java index a5674d048..a12318450 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,7 +29,7 @@ public class ViewContextManager implements IWindowListener { /** * Map of services */ - private Map fWindowToService = new HashMap(); + private Map<IWorkbenchWindow, ViewContextService> fWindowToService = new HashMap<IWorkbenchWindow, ViewContextService>(); // singleton manager private static ViewContextManager fgManager; @@ -60,20 +60,23 @@ public class ViewContextManager implements IWindowListener { /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowActivated(IWorkbenchWindow window) { } /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowDeactivated(IWorkbenchWindow window) { } /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowClosed(IWorkbenchWindow window) { - ViewContextService service = (ViewContextService) fWindowToService.get(window); + ViewContextService service = fWindowToService.get(window); if (service != null) { fWindowToService.remove(window); service.dispose(); @@ -83,8 +86,9 @@ public class ViewContextManager implements IWindowListener { /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowOpened(IWorkbenchWindow window) { - ViewContextService service = (ViewContextService) fWindowToService.get(window); + ViewContextService service = fWindowToService.get(window); if (service == null) { service = new ViewContextService(window); fWindowToService.put(window, service); @@ -98,7 +102,7 @@ public class ViewContextManager implements IWindowListener { * @return view context service or <code>null</code> */ public ViewContextService getService(IWorkbenchWindow window) { - return (ViewContextService) fWindowToService.get(window); + return fWindowToService.get(window); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java index d4bcd72ba..bc2aebb6d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -75,22 +75,22 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi /** * Maps the perspectives in this window to its last activated workbench context */ - private final Map fPerspectiveToActiveContext = new HashMap(); + private final Map<IPerspectiveDescriptor, String> fPerspectiveToActiveContext = new HashMap<IPerspectiveDescriptor, String>(); /** * Map of the perspectives to all workbench contexts activated in that perspective */ - private final Map fPerspectiveToActivatedContexts = new HashMap(); + private final Map<IPerspectiveDescriptor, Set<String>> fPerspectiveToActivatedContexts = new HashMap<IPerspectiveDescriptor, Set<String>>(); /** * Map of context id's to context view bindings */ - private Map fContextIdsToBindings; + private Map<String, DebugContextViewBindings> fContextIdsToBindings; /** * List of perspectives that debugging is allowed in */ - private Set fEnabledPerspectives = new HashSet(); + private Set<String> fEnabledPerspectives = new HashSet<String>(); /** * Whether to ignore perspective change call backs (set to @@ -140,10 +140,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi private static final String XML_VALUE_CLOSED = "closed"; //$NON-NLS-1$ // ids of base debug views in debug perspective that should not be auto-closed - private static Set fgBaseDebugViewIds = null; + private static Set<String> fgBaseDebugViewIds = null; static { - fgBaseDebugViewIds = new HashSet(); + fgBaseDebugViewIds = new HashSet<String>(); fgBaseDebugViewIds.add(IDebugUIConstants.ID_DEBUG_VIEW); fgBaseDebugViewIds.add(IDebugUIConstants.ID_VARIABLE_VIEW); fgBaseDebugViewIds.add(IDebugUIConstants.ID_BREAKPOINT_VIEW); @@ -166,7 +166,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi // all bindings including inherited bindings, top down in activation order private String[] fAllViewBindingIds = null; // associated binding to activate - private final Map fAllViewIdToBindings = new HashMap(); + private final Map<String, ViewBinding> fAllViewIdToBindings = new HashMap<String, ViewBinding>(); // all context id's in this context hierarchy (top down order) private String[] fAllConetxtIds = null; @@ -222,7 +222,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi if (fParentId == null) { return null; } - return (DebugContextViewBindings) fContextIdsToBindings.get(fParentId); + return fContextIdsToBindings.get(fParentId); } /** @@ -232,7 +232,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * @param perspective the perspective description * @param allViewIds that are relevant to the chain activation. */ - public void activateChain(IWorkbenchPage page, IPerspectiveDescriptor perspective, Set allViewIds) { + public void activateChain(IWorkbenchPage page, IPerspectiveDescriptor perspective, Set<String> allViewIds) { initializeChain(); doActivation(page, perspective, allViewIds, fAllConetxtIds); } @@ -251,7 +251,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * @param allViewIds id's of all the views that are relevant in this context activation * @param contextIds associated contexts that are activated */ - private void doActivation(IWorkbenchPage page, IPerspectiveDescriptor perspective, Set allViewIds, String[] contextIds) { + private void doActivation(IWorkbenchPage page, IPerspectiveDescriptor perspective, Set<String> allViewIds, String[] contextIds) { // note activation of all the relevant contexts for (int i = 0; i < contextIds.length; i++) { addActivated(contextIds[i]); @@ -261,7 +261,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi // activate the view bindings and bring most relevant views to top for (int i = 0; i < fAllViewBindingIds.length; i++) { String viewId = fAllViewBindingIds[i]; - ViewBinding binding = (ViewBinding) fAllViewIdToBindings.get(viewId); + ViewBinding binding = fAllViewIdToBindings.get(viewId); binding.activated(page, perspective); binding.checkZOrder(page, allViewIds); } @@ -273,18 +273,16 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi */ private synchronized void initializeChain() { if (fAllViewBindingIds == null) { - List orderedIds = new ArrayList(); - List contexts = new ArrayList(); + List<String> orderedIds = new ArrayList<String>(); + List<DebugContextViewBindings> contexts = new ArrayList<DebugContextViewBindings>(); DebugContextViewBindings context = this; while (context != null) { contexts.add(0, context); context = context.getParentContext(); } - Iterator iterator = contexts.iterator(); fAllConetxtIds = new String[contexts.size()]; int pos = 0; - while (iterator.hasNext()) { - DebugContextViewBindings bindings = (DebugContextViewBindings) iterator.next(); + for (DebugContextViewBindings bindings : contexts) { fAllConetxtIds[pos] = bindings.getId(); pos++; for (int i = 0; i < bindings.fViewBindingIds.length; i++) { @@ -298,7 +296,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi } } } - fAllViewBindingIds = (String[]) orderedIds.toArray(new String[orderedIds.size()]); + fAllViewBindingIds = orderedIds.toArray(new String[orderedIds.size()]); } } @@ -315,7 +313,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi } for (int i = 0; i < fViewBindingIds.length; i++) { String viewId = fViewBindingIds[i]; - ViewBinding binding = (ViewBinding) fAllViewIdToBindings.get(viewId); + ViewBinding binding = fAllViewIdToBindings.get(viewId); binding.deactivated(page, perspective); } } @@ -328,7 +326,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi */ public void setViewOpened(boolean opened, String viewId) { initializeChain(); - ViewBinding binding = (ViewBinding)fAllViewIdToBindings.get(viewId); + ViewBinding binding = fAllViewIdToBindings.get(viewId); if (binding != null) { if (opened) { binding.userOpened(); @@ -340,7 +338,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi public void applyUserSettings(String viewId, Element viewElement) { initializeChain(); - ViewBinding binding = (ViewBinding) fAllViewIdToBindings.get(viewId); + ViewBinding binding = fAllViewIdToBindings.get(viewId); if (binding != null) { binding.applyUserSettings(viewElement); } @@ -353,12 +351,12 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * @param root the root XML element * @param alreadyDone views already done */ - public void saveBindings(Document document, Element root, Set alreadyDone) { + public void saveBindings(Document document, Element root, Set<String> alreadyDone) { for (int i = 0; i < fViewBindingIds.length; i++) { String viewId = fViewBindingIds[i]; if (!alreadyDone.contains(viewId)) { alreadyDone.add(viewId); - ViewBinding binding = (ViewBinding) fAllViewIdToBindings.get(viewId); + ViewBinding binding = fAllViewIdToBindings.get(viewId); binding.saveBindings(document, root); } } @@ -373,15 +371,15 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi /** * Set of perspectives this view was opened in by the user */ - private final Set fUserOpened = new HashSet(); + private final Set<String> fUserOpened = new HashSet<String>(); /** * Set of perspectives this view was closed in by the user */ - private final Set fUserClosed = new HashSet(); + private final Set<String> fUserClosed = new HashSet<String>(); /** * Set of perspectives this view was auto-opened by view management. */ - private final Set fAutoOpened = new HashSet(); + private final Set<String> fAutoOpened = new HashSet<String>(); public ViewBinding(IConfigurationElement element) { fElement = element; @@ -512,7 +510,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * @param page the page to check * @param relevantViews the array of view identifiers */ - public void checkZOrder(IWorkbenchPage page, Set relevantViews) { + public void checkZOrder(IWorkbenchPage page, Set<String> relevantViews) { // see if view is open already IViewPart part = page.findView(getViewId()); if (part != null) { @@ -572,8 +570,8 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi } } - private void appendPerspectives(Document document, Element parent, Set perpectives, String xmlValue) { - String[] ids = (String[]) perpectives.toArray(new String[perpectives.size()]); + private void appendPerspectives(Document document, Element parent, Set<String> perpectives, String xmlValue) { + String[] ids = perpectives.toArray(new String[perpectives.size()]); for (int i = 0; i < ids.length; i++) { String id = ids[i]; Element element = document.createElement(XML_ELEMENT_PERSPECTIVE); @@ -654,7 +652,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * Loads extensions which map context id's to view bindings. */ private void loadContextToViewExtensions() { - fContextIdsToBindings = new HashMap(); + fContextIdsToBindings = new HashMap<String, DebugContextViewBindings>(); IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), ID_CONTEXT_VIEW_BINDINGS); IConfigurationElement[] configurationElements = extensionPoint.getConfigurationElements(); for (int i = 0; i < configurationElements.length; i++) { @@ -666,7 +664,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi continue; } ViewBinding info = new ViewBinding(element); - DebugContextViewBindings bindings = (DebugContextViewBindings) fContextIdsToBindings.get(contextId); + DebugContextViewBindings bindings = fContextIdsToBindings.get(contextId); if (bindings == null) { bindings = new DebugContextViewBindings(contextId); fContextIdsToBindings.put(contextId, bindings); @@ -694,9 +692,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi Element entry = (Element) node; if(entry.getNodeName().equalsIgnoreCase(XML_ELEMENT_VIEW)){ String id = entry.getAttribute(XML_ATTR_ID); - Iterator bindings = fContextIdsToBindings.values().iterator(); - while (bindings.hasNext()) { - DebugContextViewBindings binding = (DebugContextViewBindings) bindings.next(); + for (DebugContextViewBindings binding : fContextIdsToBindings.values()) { binding.applyUserSettings(id, entry); } } @@ -753,8 +749,8 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * * @return list */ - public static Set parseList(String listString) { - Set list = new HashSet(10); + public static Set<String> parseList(String listString) { + Set<String> list = new HashSet<String>(10); StringTokenizer tokenizer = new StringTokenizer(listString, ","); //$NON-NLS-1$ while (tokenizer.hasMoreTokens()) { String token = tokenizer.nextToken(); @@ -771,9 +767,8 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * * @since 3.5 */ - public static Set getDefaultEnabledPerspectives() { - Set perspectives = new HashSet(4); - + public static Set<String> getDefaultEnabledPerspectives() { + Set<String> perspectives = new HashSet<String>(4); IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), ID_CONTEXT_VIEW_BINDINGS); IConfigurationElement[] configurationElements = extensionPoint.getConfigurationElements(); for (int i = 0; i < configurationElements.length; i++) { @@ -793,7 +788,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi if (isEnabledPerspective()) { if (selection instanceof IStructuredSelection && !selection.isEmpty()) { IStructuredSelection ss = (IStructuredSelection) selection; - Iterator iterator = ss.iterator(); + Iterator<?> iterator = ss.iterator(); while (iterator.hasNext()) { Object target = iterator.next(); ILaunch launch = DebugModelContextBindingManager.getLaunch(target); @@ -806,24 +801,24 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi // Include the word '.internal.' so the context is filtered from the key binding pref page (Bug 144019) also see PerspectiveManager.handleBreakpointHit() if (fContextService.getActiveContextIds().contains(type.getIdentifier() + ".internal." + getActivePerspective().getId())) { //$NON-NLS-1$ // get the leaf contexts to be activated - List workbenchContexts = DebugModelContextBindingManager.getDefault().getWorkbenchContextsForDebugContext(target); + List<String> workbenchContexts = DebugModelContextBindingManager.getDefault().getWorkbenchContextsForDebugContext(target); // TODO: do we need to check if contexts are actually enabled in workbench first? if (!workbenchContexts.isEmpty()) { // Quickly check if any contexts need activating boolean needToActivate = false; for (int i = 0; i < workbenchContexts.size(); i++) { - if (!isActivated((String)workbenchContexts.get(i))) { + if (!isActivated(workbenchContexts.get(i))) { needToActivate = true; break; } } if (needToActivate) { - Set allViewIds = getAllContextsViewIDs(workbenchContexts); + Set<String> allViewIds = getAllContextsViewIDs(workbenchContexts); // if all contexts already activate and last context is already active context == done for (int i = 0; i < workbenchContexts.size(); i++) { - String contextId = (String)workbenchContexts.get(i); + String contextId = workbenchContexts.get(i); if (!isActivated(contextId)) { activateChain(contextId, getActivePerspective(), allViewIds); } @@ -850,7 +845,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi private boolean isActiveContext(String contextId) { IPerspectiveDescriptor activePerspective = getActivePerspective(); if (activePerspective != null) { - String activeId = (String) fPerspectiveToActiveContext.get(activePerspective); + String activeId = fPerspectiveToActiveContext.get(activePerspective); return contextId.equals(activeId); } return false; @@ -865,7 +860,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi private boolean isActivated(String contextId) { IPerspectiveDescriptor activePerspective = getActivePerspective(); if (activePerspective != null) { - Set contexts = (Set) fPerspectiveToActivatedContexts.get(activePerspective); + Set<String> contexts = fPerspectiveToActivatedContexts.get(activePerspective); if (contexts != null) { return contexts.contains(contextId); } @@ -876,9 +871,9 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi private void addActivated(String contextId) { IPerspectiveDescriptor activePerspective = getActivePerspective(); if (activePerspective != null) { - Set contexts = (Set) fPerspectiveToActivatedContexts.get(activePerspective); + Set<String> contexts = fPerspectiveToActivatedContexts.get(activePerspective); if (contexts == null) { - contexts = new HashSet(); + contexts = new HashSet<String>(); fPerspectiveToActivatedContexts.put(activePerspective, contexts); } contexts.add(contextId); @@ -888,13 +883,14 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi private void removeActivated(String contextId) { IPerspectiveDescriptor activePerspective = getActivePerspective(); if (activePerspective != null) { - Set contexts = (Set) fPerspectiveToActivatedContexts.get(activePerspective); + Set<String> contexts = fPerspectiveToActivatedContexts.get(activePerspective); if (contexts != null) { contexts.remove(contextId); } } } + @Override public void debugContextChanged(DebugContextEvent event) { if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { contextActivated(event.getContext()); @@ -904,18 +900,21 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener3#perspectiveOpened(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveOpened(IWorkbenchPage page, IPerspectiveDescriptor perspective) { } /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener3#perspectiveClosed(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveClosed(IWorkbenchPage page, IPerspectiveDescriptor perspective) { } /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener3#perspectiveDeactivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveDeactivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { } @@ -925,12 +924,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * @param perspective the perspective descriptor */ private void clean(IPerspectiveDescriptor perspective) { - Set contexts = (Set) fPerspectiveToActivatedContexts.remove(perspective); + Set<String> contexts = fPerspectiveToActivatedContexts.remove(perspective); fPerspectiveToActiveContext.remove(perspective); if (contexts != null) { - Iterator iterator = contexts.iterator(); - while (iterator.hasNext()) { - String id = (String) iterator.next(); + for (String id : contexts) { deactivate(id, perspective); } } @@ -939,23 +936,23 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener3#perspectiveSavedAs(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveSavedAs(IWorkbenchPage page, IPerspectiveDescriptor oldPerspective, IPerspectiveDescriptor newPerspective) { } /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener2#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IWorkbenchPartReference, java.lang.String) */ + @Override public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) { if (!fIgnoreChanges && page.getWorkbenchWindow().equals(fWindow)) { if(partRef != null) { if (IWorkbenchPage.CHANGE_VIEW_SHOW == changeId || IWorkbenchPage.CHANGE_VIEW_HIDE == changeId) { // Update only the contexts which are currently active (Bug 128065) - Set activatedContexts = (Set)fPerspectiveToActivatedContexts.get(perspective); + Set<String> activatedContexts = fPerspectiveToActivatedContexts.get(perspective); if (activatedContexts != null) { - Iterator iterator = activatedContexts.iterator(); - while (iterator.hasNext()) { - DebugContextViewBindings bindings = - (DebugContextViewBindings)fContextIdsToBindings.get(iterator.next()); + for (String id : activatedContexts) { + DebugContextViewBindings bindings = fContextIdsToBindings.get(id); if (bindings != null) { bindings.setViewOpened(IWorkbenchPage.CHANGE_VIEW_SHOW == changeId, partRef.getId()); } @@ -969,6 +966,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { if (page.getWorkbenchWindow().equals(fWindow)) { fActivePerspective = perspective; @@ -982,6 +980,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, java.lang.String) */ + @Override public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) { } @@ -991,30 +990,28 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * @param contextId the identifier of the {@link DebugContextViewBindings} to activate * @param perspective the perspective description */ - private void activateChain(String contextId, IPerspectiveDescriptor perspective, Set allViewIds) { - if (fWindow == null) - { + private void activateChain(String contextId, IPerspectiveDescriptor perspective, Set<String> allViewIds) { + if (fWindow == null) { return; // disposed } IWorkbenchPage page = fWindow.getActivePage(); if (page != null) { - DebugContextViewBindings bindings= (DebugContextViewBindings) fContextIdsToBindings.get(contextId); + DebugContextViewBindings bindings= fContextIdsToBindings.get(contextId); if (bindings != null) { bindings.activateChain(page, perspective, allViewIds); } } } - private Set getAllContextsViewIDs(List contextsIds) { - if (fWindow == null) - { + private Set<String> getAllContextsViewIDs(List<String> contextsIds) { + if (fWindow == null) { return Collections.EMPTY_SET; // disposed } - TreeSet viewIds = new TreeSet(); + TreeSet<String> viewIds = new TreeSet<String>(); for (int i = 0; i < contextsIds.size(); i++) { - DebugContextViewBindings bindings= (DebugContextViewBindings) fContextIdsToBindings.get(contextsIds.get(i)); + DebugContextViewBindings bindings= fContextIdsToBindings.get(contextsIds.get(i)); if (bindings != null) { String[] bindingViewIds = bindings.getAllViewBindingsIds(); for (int j = 0; j < bindingViewIds.length; j++) { @@ -1029,13 +1026,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * Links each debug context view bindings with its parent context bindings */ private void linkParentContexts() { - Iterator iterator = fContextIdsToBindings.entrySet().iterator(); - while (iterator.hasNext()) { - Entry entry = (Entry)iterator.next(); - String contextId = (String) entry.getKey(); - DebugContextViewBindings bindings = (DebugContextViewBindings) entry.getValue(); + for (Entry<String, DebugContextViewBindings> entry : fContextIdsToBindings.entrySet()) { + DebugContextViewBindings bindings = entry.getValue(); if (!bindings.getId().equals(DEBUG_CONTEXT)) { - Context context = fContextService.getContext(contextId); + Context context = fContextService.getContext(entry.getKey()); try { bindings.setParentId(context.getParentId()); } catch (NotDefinedException e) { @@ -1063,13 +1057,12 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi /* (non-Javadoc) * @see org.eclipse.core.commands.contexts.IContextManagerListener#contextManagerChanged(org.eclipse.core.commands.contexts.ContextManagerEvent) */ + @Override public void contextManagerChanged(ContextManagerEvent event) { if (event.isActiveContextsChanged() && getActivePerspective() != null) { - Set disabledContexts = getDisabledContexts(event); + Set<String> disabledContexts = getDisabledContexts(event); if (!disabledContexts.isEmpty()) { - Iterator contexts = disabledContexts.iterator(); - while (contexts.hasNext()) { - String contextId = (String)contexts.next(); + for (String contextId : disabledContexts) { if (isViewContext(contextId)) { if (isActivated(contextId)) { deactivate(contextId, getActivePerspective()); @@ -1090,7 +1083,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi IWorkbenchPage page = fWindow.getActivePage(); if (page != null) { - DebugContextViewBindings bindings = (DebugContextViewBindings) fContextIdsToBindings.get(contextId); + DebugContextViewBindings bindings = fContextIdsToBindings.get(contextId); if (bindings != null) { bindings.deactivate(page, perspective); } @@ -1103,9 +1096,9 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * @param event the event * @return disabled context id's */ - private Set getDisabledContexts(ContextManagerEvent event) { - Set prev = new HashSet(event.getPreviouslyActiveContextIds()); - Set activeContextIds = event.getContextManager().getActiveContextIds(); + private Set<String> getDisabledContexts(ContextManagerEvent event) { + Set<String> prev = new HashSet<String>(event.getPreviouslyActiveContextIds()); + Set<String> activeContextIds = event.getContextManager().getActiveContextIds(); if (activeContextIds != null) { prev.removeAll(activeContextIds); } @@ -1130,10 +1123,8 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi Document document = DebugPlugin.newDocument(); Element root = document.createElement(XML_ELEMENT_VIEW_BINDINGS); document.appendChild(root); - Set done = new HashSet(); - Iterator bindings = fContextIdsToBindings.values().iterator(); - while (bindings.hasNext()) { - DebugContextViewBindings binding = (DebugContextViewBindings) bindings.next(); + Set<String> done = new HashSet<String>(); + for (DebugContextViewBindings binding : fContextIdsToBindings.values()) { binding.saveBindings(document, root, done); } String prefValue = IInternalDebugCoreConstants.EMPTY_STRING; @@ -1156,7 +1147,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * @return the array of perspective identifiers in which debugging is enabled */ public String[] getEnabledPerspectives() { - return (String[]) fEnabledPerspectives.toArray(new String[fEnabledPerspectives.size()]); + return fEnabledPerspectives.toArray(new String[fEnabledPerspectives.size()]); } /** @@ -1189,6 +1180,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener4#perspectivePreDeactivate(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectivePreDeactivate(IWorkbenchPage page, IPerspectiveDescriptor perspective) { if (page.getWorkbenchWindow().equals(fWindow)) { fActivePerspective = null; @@ -1196,6 +1188,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi } } + @Override public void preferenceChange(PreferenceChangeEvent event) { if (!fIgnoreChanges) { if (IDebugUIConstants.PREF_MANAGE_VIEW_PERSPECTIVES.equals(event.getKey())) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java index 4f0116d41..cdd141032 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java @@ -39,12 +39,12 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap /** * Child breakpoints - inserting new element into this collection should use the insertBreakpoint method */ - final private List fBreakpoints = new ArrayList(); + final private List<IBreakpoint> fBreakpoints = new ArrayList<IBreakpoint>(); /** * Child containers - inserting new element into this container should use the insertChildContainer method */ - final private List fChildContainers = new ArrayList(); + final private List<BreakpointContainer> fChildContainers = new ArrayList<BreakpointContainer>(); /** * The category for this container @@ -158,8 +158,9 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap } int index = fBreakpoints.size(); for (; fComparator != null && index > 0; index--) { - if (fComparator.compare(fBreakpoints.get(index-1), breakpoint) < 0) - break; + if (fComparator.compare(fBreakpoints.get(index-1), breakpoint) < 0) { + break; + } } if (index < 0) { index = 0; @@ -177,12 +178,14 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap private int insertChildContainer(BreakpointContainer container) { int index = fChildContainers.size(); for (; fComparator != null && index > 0; index--) { - if (fComparator.compare(fChildContainers.get(index-1), container) < 0) - break; + if (fComparator.compare(fChildContainers.get(index-1), container) < 0) { + break; + } } - if (index < 0) - index = 0; + if (index < 0) { + index = 0; + } fChildContainers.add(index, container); return index; @@ -225,10 +228,9 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap */ private static IAdaptable[] getCategories(IBreakpoint breakpoint, IBreakpointOrganizer organizer) { IAdaptable[] categories = organizer.getCategories(breakpoint); - - if (categories == null || categories.length == 0) - categories = OtherBreakpointCategory.getCategories(organizer); - + if (categories == null || categories.length == 0) { + categories = OtherBreakpointCategory.getCategories(organizer); + } return categories; } @@ -239,21 +241,13 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * @param category the category * @return the breakpoint container, can be <code>null</code>. */ - private static BreakpointContainer findExistingContainer(List containers, IAdaptable category) { - BreakpointContainer container = null; - - Iterator containerIt = containers.iterator(); - while (containerIt.hasNext()) { - container = (BreakpointContainer) containerIt.next(); - IAdaptable containerCategory = container.getCategory(); - - if (category.equals(containerCategory)) - break; - - container = null; + private static BreakpointContainer findExistingContainer(List<BreakpointContainer> containers, IAdaptable category) { + for (BreakpointContainer c : containers) { + if (category.equals(c.getCategory())) { + return c; + } } - - return container; + return null; } // TODO [pchuong]: can be remove if BreakpointsContentProvider no longer uses this class @@ -270,7 +264,9 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap */ public void addBreakpoint(IBreakpoint breakpoint, ModelDelta rootDelta) { final int bpIndex = insertBreakpoint(breakpoint); - if (bpIndex < 0) return; + if (bpIndex < 0) { + return; + } if (hasNesting()) { IBreakpointOrganizer organizer = fNesting[0]; @@ -329,10 +325,9 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap if (removed) { boolean addRemoveBpDelta = getContainers().length == 0; - Iterator it = fChildContainers.iterator(); + Iterator<BreakpointContainer> it = fChildContainers.iterator(); while (it.hasNext()) { - BreakpointContainer container = (BreakpointContainer) it.next(); - + BreakpointContainer container = it.next(); // if the breakpoint contains in the container and it is the only breakpoint, // than remove the container from the collection if (container.contains(breakpoint)) { @@ -344,7 +339,6 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap } else { childDelta = rootDelta.addNode(container, IModelDelta.STATE); } - // remove the breakpoint from the nested containers container.removeBreakpoint(breakpoint, childDelta); } @@ -376,11 +370,12 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * @param breakpoints the breakpoint to update * @param add true if breakpoint should be added to the cache, otherwise remove the breakpoint from the cache */ - private static void updateSelfAndAncestorsBreakpointCache(BreakpointContainer container, List breakpoints, boolean add) { + private static void updateSelfAndAncestorsBreakpointCache(BreakpointContainer container, List<IBreakpoint> breakpoints, boolean add) { if (container != null) { container.fBreakpoints.removeAll(breakpoints); - if (add) - container.fBreakpoints.addAll(breakpoints); + if (add) { + container.fBreakpoints.addAll(breakpoints); + } updateSelfAndAncestorsBreakpointCache(container.getParent(), breakpoints, add); } } @@ -396,7 +391,7 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap int index = destContainer.insertBreakpoint(breakpoint); Assert.isTrue(index >= 0); - List breakpoints = destContainer.fBreakpoints; + List<IBreakpoint> breakpoints = destContainer.fBreakpoints; destContainerDelta.addNode(breakpoint, index/*breakpoints.indexOf(breakpoint)*/, IModelDelta.ADDED|IModelDelta.INSTALL, 0); destContainerDelta.setFlags(destContainerDelta.getFlags() | IModelDelta.EXPAND); @@ -416,7 +411,7 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap sourceContainer.fParent = destContainer; // add the breakpoints to the parent containers. - List breakpoints = Arrays.asList(sourceContainer.getBreakpoints()); + List<IBreakpoint> breakpoints = Arrays.asList(sourceContainer.getBreakpoints()); updateSelfAndAncestorsBreakpointCache(destContainer, breakpoints, true); int index = destContainer.fChildContainers.indexOf(sourceContainer); @@ -457,7 +452,7 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap */ static public void removeBreakpoint(BreakpointContainer container, IBreakpoint breakpoint, ModelDelta containerDelta) { container.removeBreakpoint(breakpoint, containerDelta); - List breakpoints = new ArrayList(); + List<IBreakpoint> breakpoints = new ArrayList<IBreakpoint>(); breakpoints.add(breakpoint); updateSelfAndAncestorsBreakpointCache(container.getParent(), breakpoints, false); } @@ -476,11 +471,10 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap } if (container.fChildContainers.size() == 0) { - List breakpoints = new ArrayList(); - - Iterator iterator = container.fBreakpoints.iterator(); + List<IBreakpoint> breakpoints = new ArrayList<IBreakpoint>(); + Iterator<IBreakpoint> iterator = container.fBreakpoints.iterator(); while (iterator.hasNext()) { - Object obj = iterator.next(); + IBreakpoint obj = iterator.next(); breakpoints.add(obj); delta.addNode(obj, IModelDelta.UNINSTALL|IModelDelta.REMOVED); iterator.remove(); @@ -491,12 +485,11 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap return; } - Iterator iterator = container.fChildContainers.iterator(); + Iterator<BreakpointContainer> iterator = container.fChildContainers.iterator(); while (iterator.hasNext()) { - BreakpointContainer childContainer = (BreakpointContainer) iterator.next(); + BreakpointContainer childContainer = iterator.next(); ModelDelta childDelta = delta.addNode(childContainer, IModelDelta.REMOVED|IModelDelta.UNINSTALL); iterator.remove(); - removeAll(childContainer, childDelta); } } @@ -515,8 +508,9 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * * @return the breakpoints in this container */ - public IBreakpoint[] getBreakpoints() { - return (IBreakpoint[]) fBreakpoints.toArray(new IBreakpoint[fBreakpoints.size()]); + @Override + public IBreakpoint[] getBreakpoints() { + return fBreakpoints.toArray(new IBreakpoint[fBreakpoints.size()]); } /** @@ -524,7 +518,8 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * * @return container category */ - public IAdaptable getCategory() { + @Override + public IAdaptable getCategory() { return fCategory; } @@ -559,7 +554,7 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * @return the containers nested in this container, can be empty. */ public BreakpointContainer[] getContainers() { - return (BreakpointContainer[]) fChildContainers.toArray(new BreakpointContainer[fChildContainers.size()]); + return fChildContainers.toArray(new BreakpointContainer[fChildContainers.size()]); } /** @@ -567,7 +562,8 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * * @return this container's organizer */ - public IBreakpointOrganizer getOrganizer() { + @Override + public IBreakpointOrganizer getOrganizer() { return fOrganizer; } @@ -577,7 +573,8 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * @param breakpoint the breakpoint to check * @return true if this container contains the given breakpoint */ - public boolean contains(IBreakpoint breakpoint) { + @Override + public boolean contains(IBreakpoint breakpoint) { return fBreakpoints.contains(breakpoint); } @@ -593,7 +590,7 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap if (containers.length == 0) { return new BreakpointContainer[]{this}; } - ArrayList list = new ArrayList(); + ArrayList<BreakpointContainer> list = new ArrayList<BreakpointContainer>(); for (int i = 0; i < containers.length; i++) { BreakpointContainer container = containers[i]; BreakpointContainer[] subcontainers = container.getContainers(breakpoint); @@ -603,7 +600,7 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap } } } - return (BreakpointContainer[]) list.toArray(new BreakpointContainer[list.size()]); + return list.toArray(new BreakpointContainer[list.size()]); } return new BreakpointContainer[0]; } @@ -612,18 +609,16 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof BreakpointContainer) { - BreakpointContainer container = (BreakpointContainer) obj; - // With Group by "Advanced" the same category can contain a different subset of breakpoints, // therefore to have the same category is not enough to be equal. if (! (fParent != null && container.fParent != null && fParent.equals(container.fParent) || fParent == null && container.fParent == null) ) { return false; } - if (getCategory() != null && container.getCategory() != null) { return getCategory().equals(container.getCategory()); } else { @@ -632,11 +627,12 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap } return super.equals(obj); } - + /* * (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getChildren().length; } @@ -645,6 +641,7 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return getElements(getChildren(), index, length); } @@ -653,6 +650,7 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return id.equals(IDebugUIConstants.ID_BREAKPOINT_VIEW); } @@ -661,6 +659,7 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap * (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { return Platform.getAdapterManager().getAdapter(this, adapter); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java index a1f3f7e5a..7a0c9dd2e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java @@ -28,7 +28,8 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { // not used return null; } @@ -36,7 +37,8 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ - public ImageDescriptor getImageDescriptor(Object object) { + @Override + public ImageDescriptor getImageDescriptor(Object object) { if (object instanceof IBreakpointContainer) { IBreakpointContainer container = (IBreakpointContainer) object; IAdaptable category = container.getCategory(); @@ -54,7 +56,8 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ - public String getLabel(Object object) { + @Override + public String getLabel(Object object) { if (object instanceof IBreakpointContainer) { IBreakpointContainer container = (IBreakpointContainer) object; IAdaptable category = container.getCategory(); @@ -72,14 +75,16 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ - public Object getParent(Object o) { + @Override + public Object getParent(Object o) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter2#getForeground(java.lang.Object) */ - public RGB getForeground(Object object) { + @Override + public RGB getForeground(Object object) { if (object instanceof IBreakpointContainer) { IBreakpointContainer container = (IBreakpointContainer) object; IAdaptable category = container.getCategory(); @@ -94,7 +99,8 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter2#getBackground(java.lang.Object) */ - public RGB getBackground(Object object) { + @Override + public RGB getBackground(Object object) { if (object instanceof IBreakpointContainer) { IBreakpointContainer container = (IBreakpointContainer) object; IAdaptable category = container.getCategory(); @@ -109,7 +115,8 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter2#getFont(java.lang.Object) */ - public FontData getFont(Object object) { + @Override + public FontData getFont(Object object) { if (object instanceof IBreakpointContainer) { IBreakpointContainer container = (IBreakpointContainer) object; IAdaptable category = container.getCategory(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointFactory.java index 221587fd2..b7a88d77d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointFactory.java @@ -27,7 +27,8 @@ public class BreakpointFactory implements IElementFactory { /* (non-Javadoc) * @see org.eclipse.ui.IElementFactory#createElement(org.eclipse.ui.IMemento) */ - public IAdaptable createElement(IMemento memento) { + @Override + public IAdaptable createElement(IMemento memento) { String longString = memento.getString(BreakpointPersistableElementAdapter.TAG_MARKER_ID); String factoryId = memento.getString(BreakpointPersistableElementAdapter.TAG_RESOURCE_FACTORY_ID); if (factoryId != null && longString != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java index fc1385156..36b064707 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java @@ -47,6 +47,7 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea * * @return image descriptor */ + @Override public ImageDescriptor getImageDescriptor() { if (fDescriptor == null) { fDescriptor = DebugUIPlugin.getImageDescriptor(fElement, ATTR_ICON); @@ -62,6 +63,7 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea * * @return this organizer's label */ + @Override public String getLabel() { return fElement.getAttribute(ATTR_LABEL); } @@ -71,7 +73,8 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea * * @return this organizer's identifier */ - public String getIdentifier() { + @Override + public String getIdentifier() { return fElement.getAttribute(ATTR_ID); } @@ -94,56 +97,64 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint) */ - public IAdaptable[] getCategories(IBreakpoint breakpoint) { + @Override + public IAdaptable[] getCategories(IBreakpoint breakpoint) { return getOrganizer().getCategories(breakpoint); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void addPropertyChangeListener(IPropertyChangeListener listener) { + @Override + public void addPropertyChangeListener(IPropertyChangeListener listener) { getOrganizer().addPropertyChangeListener(listener); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void removePropertyChangeListener(IPropertyChangeListener listener) { + @Override + public void removePropertyChangeListener(IPropertyChangeListener listener) { getOrganizer().removePropertyChangeListener(listener); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#addBreakpoint(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable) */ - public void addBreakpoint(IBreakpoint breakpoint, IAdaptable category) { + @Override + public void addBreakpoint(IBreakpoint breakpoint, IAdaptable category) { getOrganizer().addBreakpoint(breakpoint, category); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#removeBreakpoint(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable) */ - public void removeBreakpoint(IBreakpoint breakpoint, IAdaptable category) { + @Override + public void removeBreakpoint(IBreakpoint breakpoint, IAdaptable category) { getOrganizer().removeBreakpoint(breakpoint, category); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#canAdd(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable) */ - public boolean canAdd(IBreakpoint breakpoint, IAdaptable category) { + @Override + public boolean canAdd(IBreakpoint breakpoint, IAdaptable category) { return getOrganizer().canAdd(breakpoint, category); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#canRemove(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable) */ - public boolean canRemove(IBreakpoint breakpoint, IAdaptable category) { + @Override + public boolean canRemove(IBreakpoint breakpoint, IAdaptable category) { return getOrganizer().canRemove(breakpoint, category); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#dispose() */ - public void dispose() { + @Override + public void dispose() { // don't instantiate the delegate if it has not been used if (fDelegate != null) { fDelegate.dispose(); @@ -153,7 +164,8 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.breakpoints.IBreakpointOrganizer#getOthersLabel() */ - public String getOthersLabel() { + @Override + public String getOthersLabel() { String attribute = fElement.getAttribute(ATTR_OTHERS_LABEL); if (attribute == null) { return DebugUIViewsMessages.OtherBreakpointOrganizer_0; @@ -164,13 +176,15 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories() */ - public IAdaptable[] getCategories() { + @Override + public IAdaptable[] getCategories() { return getOrganizer().getCategories(); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegateExtension#addBreakpoints(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.runtime.IAdaptable) */ + @Override public void addBreakpoints(IBreakpoint[] breakpoints, IAdaptable category) { IBreakpointOrganizerDelegate organizer = getOrganizer(); if (organizer instanceof IBreakpointOrganizerDelegateExtension) { @@ -185,6 +199,7 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegateExtension#removeBreakpoints(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.runtime.IAdaptable) */ + @Override public void removeBreakpoints(IBreakpoint[] breakpoints, IAdaptable category) { IBreakpointOrganizerDelegate organizer = getOrganizer(); if (organizer instanceof IBreakpointOrganizerDelegateExtension) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerManager.java index 4d39bf90e..eb09e90a9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2011 IBM Corporation and others. + * Copyright (c) 2004, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -42,9 +42,9 @@ public class BreakpointOrganizerManager { private static BreakpointOrganizerManager fgManager; // map for lookup by id - private Map fOrganizers = new HashMap(); + private Map<String, IBreakpointOrganizer> fOrganizers = new HashMap<String, IBreakpointOrganizer>(); // cached sorted list by label - private List fSorted = null; + private List<IBreakpointOrganizer> fSorted = null; /** * Returns the singleton instance of the breakpoint container @@ -69,14 +69,15 @@ public class BreakpointOrganizerManager { } /** - * Forces instantiation of orgranizer delegate. + * Forces instantiation of organizer delegate. * * @param organizerId organizer to start */ private void start(String organizerId) { IBreakpointOrganizer organizer = getOrganizer(organizerId); IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { } }; organizer.addPropertyChangeListener(listener); @@ -117,22 +118,19 @@ public class BreakpointOrganizerManager { */ public IBreakpointOrganizer[] getOrganizers() { if (fSorted == null) { - Collection collection = fOrganizers.values(); - fSorted = new ArrayList(); + Collection<IBreakpointOrganizer> collection = fOrganizers.values(); + fSorted = new ArrayList<IBreakpointOrganizer>(); fSorted.addAll(collection); - Collections.sort(fSorted, new Comparator() { + Collections.sort(fSorted, new Comparator<Object>() { + @Override public int compare(Object o1, Object o2) { IBreakpointOrganizer b1 = (IBreakpointOrganizer)o1; IBreakpointOrganizer b2 = (IBreakpointOrganizer)o2; return b1.getLabel().compareTo(b2.getLabel()); } - - public boolean equals(Object obj) { - return this == obj; - } }); } - return (IBreakpointOrganizer[]) fSorted.toArray(new IBreakpointOrganizer[fSorted.size()]); + return fSorted.toArray(new IBreakpointOrganizer[fSorted.size()]); } /** @@ -141,7 +139,7 @@ public class BreakpointOrganizerManager { * @return breakpoint organizer or <code>null</code> */ public IBreakpointOrganizer getOrganizer(String id) { - return (IBreakpointOrganizer) fOrganizers.get(id); + return fOrganizers.get(id); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java index 45c10845b..41af99aa5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java @@ -38,14 +38,16 @@ public class BreakpointPersistableElementAdapter implements IPersistableElement /* (non-Javadoc) * @see org.eclipse.ui.IPersistableElement#getFactoryId() */ - public String getFactoryId() { + @Override + public String getFactoryId() { return "org.eclipse.debug.ui.elementFactory.breakpoints"; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.ui.IPersistableElement#saveState(org.eclipse.ui.IMemento) */ - public void saveState(IMemento memento) { + @Override + public void saveState(IMemento memento) { IMarker marker = fBreakpoint.getMarker(); if (marker != null) { IResource resource = marker.getResource(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java index 1725bd43e..ec22c8ff2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java @@ -13,11 +13,10 @@ package org.eclipse.debug.internal.ui.views.breakpoints; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarkerDelta; @@ -80,8 +79,9 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint) */ + @Override public IAdaptable[] getCategories(IBreakpoint breakpoint) { - List result = new ArrayList(); + List<IAdaptable> result = new ArrayList<IAdaptable>(); IWorkingSet[] workingSets = fWorkingSetManager.getWorkingSets(); for (int i = 0; i < workingSets.length; i++) { IWorkingSet set = workingSets[i]; @@ -96,7 +96,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate } } } - return (IAdaptable[]) result.toArray(new IAdaptable[result.size()]); + return result.toArray(new IAdaptable[result.size()]); } /* @@ -104,6 +104,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#dispose() */ + @Override public void dispose() { fWorkingSetManager.removePropertyChangeListener(this); fWorkingSetManager = null; @@ -117,6 +118,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { String property = event.getProperty(); if (property.equals(IInternalDebugUIConstants.MEMENTO_BREAKPOINT_WORKING_SET_NAME)) { @@ -170,8 +172,9 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[]) */ + @Override public void breakpointsAdded(IBreakpoint[] breakpoints) { - Map setToBreakpoints = new HashMap(); + Map<IWorkingSet, List<IBreakpoint>> setToBreakpoints = new HashMap<IWorkingSet, List<IBreakpoint>>(); for (int i = 0; i < breakpoints.length; i++) { IMarker marker = breakpoints[i].getMarker(); String[] names = getWorkingsetAttributeFromMarker(marker, IInternalDebugUIConstants.WORKING_SET_NAME); @@ -189,19 +192,17 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate } } } - Iterator iterator = setToBreakpoints.entrySet().iterator(); - while (iterator.hasNext()) { - Entry entry = (Entry) iterator.next(); - IWorkingSet set = (IWorkingSet) entry.getKey(); - List list = (List) entry.getValue(); - addBreakpointsToSet((IBreakpoint[]) list.toArray(new IBreakpoint[list.size()]), set); + for (Entry<IWorkingSet, List<IBreakpoint>> entry : setToBreakpoints.entrySet()) { + IWorkingSet set = entry.getKey(); + List<IBreakpoint> list = entry.getValue(); + addBreakpointsToSet(list.toArray(new IBreakpoint[list.size()]), set); } } - private void queueToSet(IBreakpoint breakpoint, IWorkingSet set, Map queue) { - List list = (List) queue.get(set); + private void queueToSet(IBreakpoint breakpoint, IWorkingSet set, Map<IWorkingSet, List<IBreakpoint>> queue) { + List<IBreakpoint> list = queue.get(set); if (list == null) { - list = new ArrayList(); + list = new ArrayList<IBreakpoint>(); queue.put(set, list); } list.add(breakpoint); @@ -217,8 +218,8 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate private void addBreakpointsToSet(IBreakpoint[] breakpoints, IWorkingSet set) { if (set != null) { IAdaptable[] elements = set.getElements(); - Set collection = new HashSet(elements.length); - List list = new ArrayList(elements.length + breakpoints.length); + Set<IAdaptable> collection = new HashSet<IAdaptable>(elements.length); + List<IAdaptable> list = new ArrayList<IAdaptable>(elements.length + breakpoints.length); for(int i = 0; i < elements.length; i++) { collection.add(elements[i]); list.add(elements[i]); @@ -231,7 +232,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate fCache.flushMarkerCache(breakpoint.getMarker()); } } - set.setElements((IAdaptable[]) list.toArray(new IAdaptable[list.size()])); + set.setElements(list.toArray(new IAdaptable[list.size()])); } } @@ -241,6 +242,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[], * org.eclipse.core.resources.IMarkerDelta[]) */ + @Override public void breakpointsRemoved(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { IWorkingSet[] workingSets = fWorkingSetManager.getWorkingSets(); @@ -274,14 +276,14 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate } } if (update) { - List newElements = new ArrayList(elements.length); + List<IAdaptable> newElements = new ArrayList<IAdaptable>(elements.length); for (int i = 0; i < elements.length; i++) { IAdaptable adaptable = elements[i]; if (adaptable != null) { newElements.add(adaptable); } } - workingSet.setElements((IAdaptable[]) newElements.toArray(new IAdaptable[newElements.size()])); + workingSet.setElements(newElements.toArray(new IAdaptable[newElements.size()])); } } @@ -291,6 +293,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[], * org.eclipse.core.resources.IMarkerDelta[]) */ + @Override public void breakpointsChanged(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) { } @@ -342,6 +345,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#canRemove(org.eclipse.debug.core.model.IBreakpoint, * org.eclipse.core.runtime.IAdaptable) */ + @Override public boolean canRemove(IBreakpoint breakpoint, IAdaptable category) { if (category instanceof WorkingSetCategory) { WorkingSetCategory wsc = (WorkingSetCategory) category; @@ -356,6 +360,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#canAdd(org.eclipse.debug.core.model.IBreakpoint, * org.eclipse.core.runtime.IAdaptable) */ + @Override public boolean canAdd(IBreakpoint breakpoint, IAdaptable category) { if (category instanceof WorkingSetCategory) { WorkingSetCategory wsc = (WorkingSetCategory) category; @@ -370,6 +375,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#addBreakpoint(org.eclipse.debug.core.model.IBreakpoint, * org.eclipse.core.runtime.IAdaptable) */ + @Override public void addBreakpoint(IBreakpoint breakpoint, IAdaptable category) { addBreakpoints(new IBreakpoint[]{breakpoint}, category); } @@ -400,11 +406,12 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#removeBreakpoint(org.eclipse.debug.core.model.IBreakpoint, * org.eclipse.core.runtime.IAdaptable) */ + @Override public void removeBreakpoint(IBreakpoint breakpoint, IAdaptable category) { if (category instanceof WorkingSetCategory) { IWorkingSet set = ((WorkingSetCategory) category).getWorkingSet(); IAdaptable[] elements = set.getElements(); - List list = new ArrayList(); + List<IAdaptable> list = new ArrayList<IAdaptable>(); for (int i = 0; i < elements.length; i++) { IAdaptable adaptable = elements[i]; if (!adaptable.equals(breakpoint)) { @@ -413,7 +420,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate } fCache.removeMappedEntry(breakpoint.getMarker(), set.getName()); fCache.flushMarkerCache(breakpoint.getMarker()); - set.setElements((IAdaptable[]) list.toArray(new IAdaptable[list.size()])); + set.setElements(list.toArray(new IAdaptable[list.size()])); } } @@ -422,9 +429,10 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories() */ + @Override public IAdaptable[] getCategories() { IWorkingSet[] workingSets = fWorkingSetManager.getWorkingSets(); - List all = new ArrayList(); + List<IAdaptable> all = new ArrayList<IAdaptable>(); for (int i = 0; i < workingSets.length; i++) { IWorkingSet set = workingSets[i]; if (IDebugUIConstants.BREAKPOINT_WORKINGSET_ID.equals(set @@ -432,12 +440,13 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate all.add(new WorkingSetCategory(set)); } } - return (IAdaptable[]) all.toArray(new IAdaptable[all.size()]); + return all.toArray(new IAdaptable[all.size()]); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegateExtension#addBreakpoints(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.runtime.IAdaptable) */ + @Override public void addBreakpoints(IBreakpoint[] breakpoints, IAdaptable category) { if (category instanceof WorkingSetCategory) { IWorkingSet set = ((WorkingSetCategory) category).getWorkingSet(); @@ -448,11 +457,12 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegateExtension#removeBreakpoints(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.runtime.IAdaptable) */ + @Override public void removeBreakpoints(IBreakpoint[] breakpoints, IAdaptable category) { if (category instanceof WorkingSetCategory) { IWorkingSet set = ((WorkingSetCategory) category).getWorkingSet(); IAdaptable[] elements = set.getElements(); - List list = new ArrayList(elements.length); + List<IAdaptable> list = new ArrayList<IAdaptable>(elements.length); for (int i = 0; i < elements.length; i++) { list.add(elements[i]); } @@ -462,7 +472,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate fCache.flushMarkerCache(breakpoint.getMarker()); list.remove(breakpoint); } - set.setElements((IAdaptable[]) list.toArray(new IAdaptable[list.size()])); + set.setElements(list.toArray(new IAdaptable[list.size()])); } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java index 613072513..2f419f2df 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,19 +27,20 @@ import org.eclipse.debug.ui.IBreakpointTypeCategory; */ public class BreakpointTypeOrganizer extends AbstractBreakpointOrganizerDelegate { - private Map fTypes = new HashMap(); + private Map<String, IAdaptable[]> fTypes = new HashMap<String, IAdaptable[]>(); /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint) */ - public IAdaptable[] getCategories(IBreakpoint breakpoint) { + @Override + public IAdaptable[] getCategories(IBreakpoint breakpoint) { IBreakpointTypeCategory category = (IBreakpointTypeCategory) breakpoint.getAdapter(IBreakpointTypeCategory.class); if (category != null) { return new IAdaptable[]{category}; } String name = DebugPlugin.getDefault().getBreakpointManager().getTypeName(breakpoint); if (name != null) { - IAdaptable[] categories = (IAdaptable[]) fTypes.get(name); + IAdaptable[] categories = fTypes.get(name); if (categories == null) { categories = new IAdaptable[]{new BreakpointTypeCategory(name)}; fTypes.put(name, categories); @@ -52,8 +53,8 @@ public class BreakpointTypeOrganizer extends AbstractBreakpointOrganizerDelegate /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#dispose() */ - public void dispose() { + @Override + public void dispose() { fTypes.clear(); } - } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetCache.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetCache.java index bb8f51073..6d843d2b4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetCache.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetCache.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,10 +24,9 @@ import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.PlatformUI; /** - * Class to cache the breakpoint to workingset information in its underlying - * marker as breakpoints are moved between breakpoint working sets. - * It resolves the need for constant attribute lookup and parsing to - * fix bug 103731 + * Class to cache the breakpoint to working set information in its underlying + * marker as breakpoints are moved between breakpoint working sets. It resolves + * the need for constant attribute lookup and parsing to fix bug 103731 * * @since 3.2 */ @@ -38,13 +37,13 @@ public class BreakpointWorkingSetCache { * key: marker * value: vector of working sets the marker belongs to */ - HashMap fCache = null; + HashMap<IMarker, Vector<Object>> fCache = null; /** * Default constructor */ public BreakpointWorkingSetCache() { - fCache = new HashMap(15); + fCache = new HashMap<IMarker, Vector<Object>>(15); } /** @@ -53,9 +52,9 @@ public class BreakpointWorkingSetCache { * @param entry the entry to add to the cache */ public void addEntry(IMarker marker, Object entry) { - Vector list = (Vector)fCache.get(marker); + Vector<Object> list = fCache.get(marker); if (list == null) { - list = new Vector(); + list = new Vector<Object>(); list.addElement(entry); fCache.put(marker, list); } @@ -72,7 +71,7 @@ public class BreakpointWorkingSetCache { * @param entry the entry to remove */ public void removeMappedEntry(IMarker marker, Object entry) { - Vector list = (Vector)fCache.get(marker); + Vector<Object> list = fCache.get(marker); if(list != null) { list.remove(entry); } @@ -84,7 +83,7 @@ public class BreakpointWorkingSetCache { */ public void flushMarkerCache(IMarker marker) { IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager(); - Vector list = (Vector)fCache.get(marker); + Vector<Object> list = fCache.get(marker); if(list != null) { String names = IImportExportConstants.DELIMITER; String ids = IImportExportConstants.DELIMITER; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetElementAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetElementAdapter.java index 1bb0901f4..b82c79975 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetElementAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetElementAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -31,6 +31,7 @@ public class BreakpointWorkingSetElementAdapter implements IWorkingSetElementAda /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetElementAdapter#adaptElements(org.eclipse.ui.IWorkingSet, org.eclipse.core.runtime.IAdaptable[]) */ + @Override public IAdaptable[] adaptElements(IWorkingSet ws, IAdaptable[] elements) { for (int i = 0; i < elements.length; i++) { IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(elements[i], IBreakpoint.class); @@ -42,19 +43,20 @@ public class BreakpointWorkingSetElementAdapter implements IWorkingSetElementAda } private IAdaptable[] selectBreakpoints(IAdaptable[] elements) { - List breakpoints = new ArrayList(elements.length); + List<IBreakpoint> breakpoints = new ArrayList<IBreakpoint>(elements.length); for (int i = 0; i < elements.length; i++) { IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(elements[i], IBreakpoint.class); if (breakpoint != null) { breakpoints.add(breakpoint); } } - return (IAdaptable[]) breakpoints.toArray(new IAdaptable[breakpoints.size()]); + return breakpoints.toArray(new IAdaptable[breakpoints.size()]); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetElementAdapter#dispose() */ + @Override public void dispose() { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java index 19879e841..f141d634e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -72,6 +72,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP /* * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { initializeDialogUnits(parent); Composite composite= new Composite(parent, SWT.NONE); @@ -86,6 +87,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP fWorkingSetName.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL)); fWorkingSetName.addModifyListener( new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { validateInput(); } @@ -111,6 +113,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP Button selectAllButton = SWTFactory.createPushButton(buttonComposite, DebugUIViewsMessages.BreakpointWorkingSetPage_selectAll_label, null); selectAllButton.setToolTipText(DebugUIViewsMessages.BreakpointWorkingSetPage_selectAll_toolTip); selectAllButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { BreakpointsViewer viewer = fTViewer.getViewer(); viewer.getTree().selectAll(); @@ -123,14 +126,16 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP Button deselectAllButton = SWTFactory.createPushButton(buttonComposite, DebugUIViewsMessages.BreakpointWorkingSetPage_deselectAll_label, null); deselectAllButton.setToolTipText(DebugUIViewsMessages.BreakpointWorkingSetPage_deselectAll_toolTip); deselectAllButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { BreakpointsViewer viewer = fTViewer.getViewer(); viewer.setCheckedElements(new Object[] {}); validateInput(); } }); - if (fWorkingSet != null) + if (fWorkingSet != null) { fWorkingSetName.setText(fWorkingSet.getName()); + } validateInput(); Dialog.applyDialogFont(composite); } @@ -138,6 +143,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP /* * Implements method from IWorkingSetPage */ + @Override public IWorkingSet getSelection() { return fWorkingSet; } @@ -145,6 +151,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP /* * Implements method from IWorkingSetPage */ + @Override public void setSelection(IWorkingSet workingSet) { Assert.isNotNull(workingSet, "Working set must not be null"); //$NON-NLS-1$ fWorkingSet= workingSet; @@ -158,10 +165,11 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP /* * Implements method from IWorkingSetPage */ + @Override public void finish() { String workingSetName = fWorkingSetName.getText(); Object[] adaptable = fTViewer.getCheckedElements().toArray(); - ArrayList elements = new ArrayList(); + ArrayList<IBreakpoint> elements = new ArrayList<IBreakpoint>(); //weed out non-breakpoint elements since 3.2 for(int i = 0; i < adaptable.length; i++) { IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(adaptable[i], IBreakpoint.class); @@ -171,10 +179,10 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP }//end for if (fWorkingSet == null) { IWorkingSetManager workingSetManager= PlatformUI.getWorkbench().getWorkingSetManager(); - fWorkingSet = workingSetManager.createWorkingSet(workingSetName, (IAdaptable[])elements.toArray(new IAdaptable[elements.size()])); + fWorkingSet = workingSetManager.createWorkingSet(workingSetName, elements.toArray(new IAdaptable[elements.size()])); } else { fWorkingSet.setName(workingSetName); - fWorkingSet.setElements((IAdaptable[])elements.toArray(new IAdaptable[elements.size()])); + fWorkingSet.setElements(elements.toArray(new IAdaptable[elements.size()])); } } @@ -185,8 +193,9 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP String errorMessage= null; String newText= fWorkingSetName.getText(); - if (newText.equals(newText.trim()) == false) - errorMessage = DebugUIViewsMessages.BreakpointWorkingSetPage_4; + if (newText.equals(newText.trim()) == false) { + errorMessage = DebugUIViewsMessages.BreakpointWorkingSetPage_4; + } if (newText.equals(IInternalDebugCoreConstants.EMPTY_STRING)) { if (fFirstCheck) { setPageComplete(false); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java index 6fe092e01..6d087385e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java @@ -34,6 +34,7 @@ public class BreakpointsComparator extends ViewerComparator { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerComparator#isSorterProperty(java.lang.Object, java.lang.String) */ + @Override public boolean isSorterProperty(Object element,String propertyId) { return propertyId.equals(IBasicPropertyConstants.P_TEXT); } @@ -56,6 +57,7 @@ public class BreakpointsComparator extends ViewerComparator { * equal to the second element; and a positive number if the first * element is greater than the second element */ + @Override public int compare(Viewer viewer, Object e1, Object e2) { if (!(e1 instanceof IBreakpoint)) { return super.compare(viewer, e1, e2); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsContentProvider.java index a49b1a505..72c065a97 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -40,7 +40,8 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ - public Object[] getChildren(Object parentElement) { + @Override + public Object[] getChildren(Object parentElement) { if (parentElement.equals(DebugPlugin.getDefault().getBreakpointManager())) { return fElements; } else if (parentElement instanceof BreakpointContainer) { @@ -52,28 +53,32 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ - public Object getParent(Object element) { + @Override + public Object getParent(Object element) { return null; } /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ - public boolean hasChildren(Object element) { + @Override + public boolean hasChildren(Object element) { return getChildren(element).length > 0; } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ - public Object[] getElements(Object inputElement) { + @Override + public Object[] getElements(Object inputElement) { return getChildren(inputElement); } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { fDisposed = true; fElements = null; setOrganizers(null); @@ -82,7 +87,8 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { fViewer = (BreakpointsViewer)viewer; if (newInput != null) { reorganize(); @@ -97,16 +103,16 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper * if none */ public void setOrganizers(IBreakpointOrganizer[] organizers) { - if (organizers != null && organizers.length == 0) { - organizers = null; - } // remove previous listeners if (fOrganizers != null) { for (int i = 0; i < fOrganizers.length; i++) { fOrganizers[i].removePropertyChangeListener(this); } } - fOrganizers = organizers; + fOrganizers = organizers; + if (organizers != null && organizers.length == 0) { + fOrganizers = null; + } // add listeners if (fOrganizers != null) { for (int i = 0; i < fOrganizers.length; i++) { @@ -148,14 +154,14 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper */ public BreakpointContainer[] getRoots(IBreakpoint breakpoint) { if (isShowingGroups()) { - List list = new ArrayList(); + List<BreakpointContainer> list = new ArrayList<BreakpointContainer>(); for (int i = 0; i < fElements.length; i++) { BreakpointContainer container = (BreakpointContainer) fElements[i]; if (container.contains(breakpoint)) { list.add(container); } } - return (BreakpointContainer[]) list.toArray(new BreakpointContainer[list.size()]); + return list.toArray(new BreakpointContainer[list.size()]); } return null; } @@ -180,7 +186,7 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper fElements = breakpoints; } else { IBreakpointOrganizer organizer = fOrganizers[0]; - Map categoriesToContainers = new HashMap(); + Map<IAdaptable, BreakpointContainer> categoriesToContainers = new HashMap<IAdaptable, BreakpointContainer>(); for (int i = 0; i < breakpoints.length; i++) { IBreakpoint breakpoint = breakpoints[i]; IAdaptable[] categories = organizer.getCategories(breakpoint); @@ -189,7 +195,7 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper } for (int j = 0; j < categories.length; j++) { IAdaptable category = categories[j]; - BreakpointContainer container = (BreakpointContainer) categoriesToContainers.get(category); + BreakpointContainer container = categoriesToContainers.get(category); if (container == null) { IBreakpointOrganizer[] nesting = null; if (fOrganizers.length > 1) { @@ -207,7 +213,7 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper if (emptyCategories != null) { for (int i = 0; i < emptyCategories.length; i++) { IAdaptable category = emptyCategories[i]; - BreakpointContainer container = (BreakpointContainer) categoriesToContainers.get(category); + BreakpointContainer container = categoriesToContainers.get(category); if (container == null) { container = new BreakpointContainer(category, organizer, null); categoriesToContainers.put(category, container); @@ -224,6 +230,7 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(IBreakpointOrganizerDelegate.P_CATEGORY_CHANGED)) { // TODO: only re-organize if showing the changed category diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDragAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDragAdapter.java index 60093f275..ef2443bd9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDragAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDragAdapter.java @@ -55,14 +55,16 @@ public class BreakpointsDragAdapter extends DragSourceAdapter implements Transfe /* (non-Javadoc) * @see org.eclipse.jface.util.TransferDragSourceListener#getTransfer() */ - public Transfer getTransfer() { + @Override + public Transfer getTransfer() { return LocalSelectionTransfer.getTransfer(); } /* non Java-doc * @see org.eclipse.swt.dnd.DragSourceListener#dragStart */ - public void dragStart(DragSourceEvent event) { + @Override + public void dragStart(DragSourceEvent event) { ISelection selection = fViewer.getSelection(); LocalSelectionTransfer.getTransfer().setSelection(selection); LocalSelectionTransfer.getTransfer().setSelectionSetTime(event.time & 0xFFFFFFFFL); @@ -83,7 +85,8 @@ public class BreakpointsDragAdapter extends DragSourceAdapter implements Transfe /* non Java-doc * @see org.eclipse.swt.dnd.DragSourceListener#dragSetData */ - public void dragSetData(DragSourceEvent event) { + @Override + public void dragSetData(DragSourceEvent event) { // For consistency set the data to the selection even though // the selection is provided by the LocalSelectionTransfer // to the drop target adapter. @@ -93,7 +96,8 @@ public class BreakpointsDragAdapter extends DragSourceAdapter implements Transfe /* non Java-doc * @see org.eclipse.swt.dnd.DragSourceListener#dragFinished */ - public void dragFinished(DragSourceEvent event) { + @Override + public void dragFinished(DragSourceEvent event) { if (event.detail == DND.DROP_MOVE) { // remove from source on move operation if (fViewer instanceof BreakpointsViewer) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDropAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDropAdapter.java index 2ba3c310a..5f2276fde 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDropAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDropAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -52,7 +52,8 @@ public class BreakpointsDropAdapter extends ViewerDropAdapter { /** * @see org.eclipse.jface.viewers.ViewerDropAdapter#performDrop(java.lang.Object) */ - public boolean performDrop(Object data) { + @Override + public boolean performDrop(Object data) { // This is temporary if (getViewer() instanceof BreakpointsViewer) { return ((BreakpointsViewer)getViewer()).performDrop(fTarget, (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection()); @@ -70,10 +71,11 @@ public class BreakpointsDropAdapter extends ViewerDropAdapter { /** * @see org.eclipse.jface.viewers.ViewerDropAdapter#determineTarget(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override protected Object determineTarget(DropTargetEvent event) { fTarget = (Item) event.item; if (fTarget instanceof TreeItem) { - List list = new ArrayList(); + List<Object> list = new ArrayList<Object>(); TreeItem item = (TreeItem)fTarget; while (item != null) { list.add(item.getData()); @@ -89,7 +91,8 @@ public class BreakpointsDropAdapter extends ViewerDropAdapter { /** * @see org.eclipse.jface.viewers.ViewerDropAdapter#validateDrop(java.lang.Object, int, org.eclipse.swt.dnd.TransferData) */ - public boolean validateDrop(Object target, int operation, TransferData transferType) { + @Override + public boolean validateDrop(Object target, int operation, TransferData transferType) { // This is temporary if (getViewer() instanceof BreakpointsViewer) { return ((BreakpointsViewer)getViewer()).canDrop(fTarget, (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsLabelProvider.java index b7e557000..63b875639 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsLabelProvider.java @@ -41,7 +41,8 @@ public class BreakpointsLabelProvider extends LabelProvider implements IFontProv /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { fWorkbenchLabelProvider.dispose(); fPresentation.dispose(); super.dispose(); @@ -50,7 +51,8 @@ public class BreakpointsLabelProvider extends LabelProvider implements IFontProv /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ - public Image getImage(Object element) { + @Override + public Image getImage(Object element) { if (element instanceof IBreakpoint) { return fPresentation.getImage(element); } @@ -80,7 +82,8 @@ public class BreakpointsLabelProvider extends LabelProvider implements IFontProv /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ - public String getText(Object element) { + @Override + public String getText(Object element) { if (element instanceof IBreakpoint) { return fPresentation.getText(element); } @@ -90,7 +93,8 @@ public class BreakpointsLabelProvider extends LabelProvider implements IFontProv /* (non-Javadoc) * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object) */ - public Font getFont(Object element) { + @Override + public Font getFont(Object element) { if (element instanceof IBreakpoint) { return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java index 123e35197..490ed9d29 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java @@ -107,9 +107,11 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager private RedoActionHandler fRedoAction; + @Override public void dispose() { - if (fClipboard != null) - fClipboard.dispose(); + if (fClipboard != null) { + fClipboard.dispose(); + } DebugPlugin.getDefault().getBreakpointManager().removeBreakpointManagerListener(this); fUndoAction.dispose(); @@ -122,6 +124,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getDetailPanePreferenceKey() */ + @Override protected String getDetailPanePreferenceKey() { return IDebugPreferenceConstants.BREAKPOINTS_DETAIL_PANE_ORIENTATION; } @@ -130,6 +133,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.BREAKPOINT_VIEW; } @@ -138,6 +142,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getViewerStyle() */ + @Override protected int getViewerStyle() { return SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.VIRTUAL | SWT.FULL_SELECTION | SWT.CHECK; } @@ -146,6 +151,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#createViewer(org.eclipse.swt.widgets.Composite) */ + @Override public Viewer createViewer(Composite parent) { TreeModelViewer viewer = (TreeModelViewer) super.createViewer(parent); @@ -162,12 +168,14 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getModelPresentation() */ + @Override protected IDebugModelPresentation getModelPresentation() { if (fModelPresentation == null) { fModelPresentation = new VariablesViewModelPresentation() { /** * Undo double slashes. */ + @Override public String getText(Object element) { IDebugModelPresentation lp= getConfiguredPresentation(element); if (lp != null) { @@ -192,6 +200,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#configureToolBar(org.eclipse.jface.action.IToolBarManager) */ + @Override protected void configureToolBar(IToolBarManager tbm) { tbm.add(new Separator(IDebugUIConstants.BREAKPOINT_GROUP)); tbm.add(getAction(ACTION_SHOW_MODEL_BREAKPOINT)); @@ -204,6 +213,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override protected void fillContextMenu(IMenuManager menu) { updateObjects(); menu.add(new Separator(IDebugUIConstants.EMPTY_NAVIGATION_GROUP)); @@ -230,6 +240,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#createActions() */ + @Override protected void createActions() { IAction action = new OpenBreakpointMarkerAction(getViewer()); setAction(ACTION_GOTO_MARKER, action); @@ -269,6 +280,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * * @seeorg.eclipse.debug.internal.ui.views.variables.VariablesView#getToggleActionLabel() */ + @Override protected String getToggleActionLabel() { return DebugUIViewsMessages.BreakpointsView_12; } @@ -278,6 +290,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getPresentationContextId() */ + @Override protected String getPresentationContextId() { return IDebugUIConstants.ID_BREAKPOINT_VIEW; } @@ -287,6 +300,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#contextActivated(org.eclipse.jface.viewers.ISelection) */ + @Override protected void contextActivated(ISelection selection) { IPresentationContext presentationContext = getTreeModelViewer().getPresentationContext(); @@ -306,6 +320,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#setViewerInput(java.lang.Object) */ + @Override protected void setViewerInput(Object context) { Object current = getViewer().getInput(); if (current == null && context == null) { @@ -330,6 +345,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#viewerInputUpdateComplete(org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputUpdate) */ + @Override protected void viewerInputUpdateComplete(IViewerInputUpdate update) { // handles non-standard debug model IStatus status = update.getStatus(); @@ -384,17 +400,18 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager if (value != null) { String[] ids = value.split(","); //$NON-NLS-1$ BreakpointOrganizerManager manager = BreakpointOrganizerManager.getDefault(); - List organziers= new ArrayList(); + List<IBreakpointOrganizer> organziers = new ArrayList<IBreakpointOrganizer>(); for (int i = 0; i < ids.length; i++) { IBreakpointOrganizer organizer = manager.getOrganizer(ids[i]); if (organizer != null) { organziers.add(organizer); } } - fOrganizers = (IBreakpointOrganizer[]) organziers.toArray(new IBreakpointOrganizer[organziers.size()]); + fOrganizers = organziers.toArray(new IBreakpointOrganizer[organziers.size()]); - for (int i = 0; i < fOrganizers.length; i++) - fOrganizers[i].addPropertyChangeListener(this); + for (int i = 0; i < fOrganizers.length; i++) { + fOrganizers[i].addPropertyChangeListener(this); + } } } } @@ -404,6 +421,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * Initializes drag and drop for the breakpoints viewer * @param viewer the viewer to add drag and drop support to */ + @Override protected void initDragAndDrop(TreeModelViewer viewer) { int ops = DND.DROP_MOVE | DND.DROP_COPY; // drop @@ -416,6 +434,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#saveViewerState(org.eclipse.ui.IMemento) */ + @Override public void saveViewerState(IMemento memento) { StringBuffer buffer = new StringBuffer(); if (fOrganizers != null) { @@ -502,8 +521,10 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointManagerListener#breakpointManagerEnablementChanged(boolean) */ + @Override public void breakpointManagerEnablementChanged(boolean enabled) { DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() { + @Override public void run() { IAction action = getAction(ACTION_SKIP_BREAKPOINTS); if (action != null) { @@ -524,7 +545,8 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager virtualViewer.setAutoExpandLevel(-1); virtualViewer.addViewerUpdateListener(new IViewerUpdateListener() { - public void viewerUpdatesComplete() { + @Override + public void viewerUpdatesComplete() { ModelDelta stateDelta = new ModelDelta(virtualViewer.getInput(), IModelDelta.NO_CHANGE); virtualViewer.saveElementState(TreePath.EMPTY, stateDelta, IModelDelta.EXPAND); ITreeModelViewer treeModelViewer = ((ITreeModelViewer) getViewer()); @@ -533,9 +555,12 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager } virtualViewer.dispose(); } - public void viewerUpdatesBegin() {} - public void updateStarted(IViewerUpdate update) {} - public void updateComplete(IViewerUpdate update) {} + @Override + public void viewerUpdatesBegin() {} + @Override + public void updateStarted(IViewerUpdate update) {} + @Override + public void updateComplete(IViewerUpdate update) {} }); virtualViewer.setInput(getViewer().getInput()); } @@ -576,7 +601,7 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager } IStructuredSelection ss = (IStructuredSelection) selection; IBreakpointContainer container = (IBreakpointContainer) target; - for(Iterator iter = ss.iterator(); iter.hasNext();) { + for (Iterator<?> iter = ss.iterator(); iter.hasNext();) { IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(iter.next(), IBreakpoint.class); if (breakpoint == null || container.contains(breakpoint) || !container.getOrganizer().canAdd(breakpoint, container.getCategory())) { return false; @@ -728,29 +753,26 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager if (paths == null) { return; } - - Map containersToBreakpoints = new HashMap(); + Map<IBreakpointContainer, List<IBreakpoint>> containersToBreakpoints = new HashMap<IBreakpointContainer, List<IBreakpoint>>(); for (int i = 0; i < paths.length; i++) { IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(paths[i].getLastSegment(), IBreakpoint.class); if (breakpoint != null) { IBreakpointContainer container = getRemovableContainer(paths[i]); if(container != null) { - List list = (List) containersToBreakpoints.get(container); + List<IBreakpoint> list = containersToBreakpoints.get(container); if (list == null) { - list = new ArrayList(); + list = new ArrayList<IBreakpoint>(); containersToBreakpoints.put(container, list); } list.add(breakpoint); } } } - Iterator iterator = containersToBreakpoints.entrySet().iterator(); - while (iterator.hasNext()) { - Entry entry = (Entry) iterator.next(); - IBreakpointContainer container = (IBreakpointContainer) entry.getKey(); - List list = (List) entry.getValue(); + for (Entry<IBreakpointContainer, List<IBreakpoint>> entry : containersToBreakpoints.entrySet()) { + IBreakpointContainer container = entry.getKey(); + List<IBreakpoint> list = entry.getValue(); IBreakpointOrganizer organizer = container.getOrganizer(); - IBreakpoint[] breakpoints = (IBreakpoint[]) list.toArray(new IBreakpoint[list.size()]); + IBreakpoint[] breakpoints = list.toArray(new IBreakpoint[list.size()]); if (organizer instanceof IBreakpointOrganizerDelegateExtension) { IBreakpointOrganizerDelegateExtension extension = (IBreakpointOrganizerDelegateExtension) organizer; extension.removeBreakpoints(breakpoints, container.getCategory()); @@ -779,8 +801,8 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager } IBreakpointOrganizer organizer = container.getOrganizer(); - List breakpoints = new ArrayList(selection.size()); - for (Iterator iter = selection.iterator(); iter.hasNext();) { + List<IBreakpoint> breakpoints = new ArrayList<IBreakpoint>(selection.size()); + for (Iterator<?> iter = selection.iterator(); iter.hasNext();) { IBreakpoint breakpoint = (IBreakpoint) DebugPlugin.getAdapter(iter.next(), IBreakpoint.class); if (breakpoint != null) { breakpoints.add(breakpoint); @@ -789,15 +811,14 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager if (organizer instanceof IBreakpointOrganizerDelegateExtension) { IBreakpointOrganizerDelegateExtension extension = (IBreakpointOrganizerDelegateExtension) organizer; extension.addBreakpoints( - (IBreakpoint[])breakpoints.toArray(new IBreakpoint[breakpoints.size()]), + breakpoints.toArray(new IBreakpoint[breakpoints.size()]), container.getCategory()); } else { for (int i = 0; i < breakpoints.size(); i++) { - organizer.addBreakpoint((IBreakpoint)breakpoints.get(i), container.getCategory()); + organizer.addBreakpoint(breakpoints.get(i), container.getCategory()); } } // TODO expandToLevel(target.getData(), ALL_LEVELS); - return true; } @@ -819,9 +840,8 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager if (selection == null || target == null) { return false; } - for(Iterator iter = selection.iterator(); iter.hasNext();) { + for (Iterator<?> iter = selection.iterator(); iter.hasNext();) { IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(iter.next(), IBreakpoint.class); - if (breakpoint == null || !checkAddableParentContainers(target, breakpoint)){ return false; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsViewer.java index 3635107a6..4ffb30c12 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -85,14 +85,14 @@ public class BreakpointsViewer extends CheckboxTreeViewer { public IBreakpoint[] getVisibleBreakpoints() { IBreakpointManager manager= DebugPlugin.getDefault().getBreakpointManager(); Object[] elements= ((ITreeContentProvider)getContentProvider()).getElements(manager); - List list = new ArrayList(); + List<IBreakpoint> list = new ArrayList<IBreakpoint>(); for (int i = 0; i < elements.length; i++) { TreeItem item = (TreeItem) searchItem(elements[i]); if (item != null) { collectExpandedBreakpoints(item, list); } } - return (IBreakpoint[]) list.toArray(new IBreakpoint[list.size()]); + return list.toArray(new IBreakpoint[list.size()]); } /** @@ -102,10 +102,10 @@ public class BreakpointsViewer extends CheckboxTreeViewer { * @param item the item to get breakpoints from * @param list collection of visible breakpoints */ - private void collectExpandedBreakpoints(TreeItem item, List list) { + private void collectExpandedBreakpoints(TreeItem item, List<IBreakpoint> list) { Object data = item.getData(); if (data instanceof IBreakpoint) { - list.add(data); + list.add((IBreakpoint) data); return; } if (item.getExpanded()) { @@ -213,7 +213,7 @@ public class BreakpointsViewer extends CheckboxTreeViewer { if(items == null) { return; } - Map containersToBreakpoints = new HashMap(); + Map<IBreakpointContainer, List<IBreakpoint>> containersToBreakpoints = new HashMap<IBreakpointContainer, List<IBreakpoint>>(); IBreakpointContainer container = null; IBreakpoint breakpoint = null; for(int i = 0; i < items.length; i++) { @@ -221,22 +221,20 @@ public class BreakpointsViewer extends CheckboxTreeViewer { breakpoint = (IBreakpoint)items[i].getData(); container = getRemovableContainer(items[i]); if(container != null) { - List list = (List) containersToBreakpoints.get(container); + List<IBreakpoint> list = containersToBreakpoints.get(container); if (list == null) { - list = new ArrayList(); + list = new ArrayList<IBreakpoint>(); containersToBreakpoints.put(container, list); } list.add(breakpoint); } } } - Iterator iterator = containersToBreakpoints.entrySet().iterator(); - while (iterator.hasNext()) { - Entry entry = (Entry) iterator.next(); - container = (IBreakpointContainer) entry.getKey(); - List list = (List) entry.getValue(); + for (Entry<IBreakpointContainer, List<IBreakpoint>> entry : containersToBreakpoints.entrySet()) { + container = entry.getKey(); + List<IBreakpoint> list = entry.getValue(); IBreakpointOrganizer organizer = container.getOrganizer(); - IBreakpoint[] breakpoints = (IBreakpoint[]) list.toArray(new IBreakpoint[list.size()]); + IBreakpoint[] breakpoints = list.toArray(new IBreakpoint[list.size()]); if (organizer instanceof IBreakpointOrganizerDelegateExtension) { IBreakpointOrganizerDelegateExtension extension = (IBreakpointOrganizerDelegateExtension) organizer; extension.removeBreakpoints(breakpoints, container.getCategory()); @@ -266,7 +264,7 @@ public class BreakpointsViewer extends CheckboxTreeViewer { if(selection == null || target == null) { return false; } - for(Iterator iter = selection.iterator(); iter.hasNext();) { + for (Iterator<?> iter = selection.iterator(); iter.hasNext();) { Object currentObject = iter.next(); if (!(currentObject instanceof IBreakpoint) || !checkAddableParentContainers(target, (IBreakpoint)currentObject)){ return false; @@ -328,7 +326,7 @@ public class BreakpointsViewer extends CheckboxTreeViewer { System.arraycopy(array, 0, breakpoints, 0, array.length); extension.addBreakpoints(breakpoints, container.getCategory()); } else { - for(Iterator iter = selection.iterator(); iter.hasNext();) { + for (Iterator<?> iter = selection.iterator(); iter.hasNext();) { breakpoint = (IBreakpoint) iter.next(); organizer.addBreakpoint(breakpoint, container.getCategory()); } @@ -340,6 +338,7 @@ public class BreakpointsViewer extends CheckboxTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.Viewer#refresh() */ + @Override public void refresh() { super.refresh(); initializeCheckedState(); @@ -376,12 +375,12 @@ public class BreakpointsViewer extends CheckboxTreeViewer { * @return a list of widget occurrences to update or an empty list */ private Widget[] searchItems(Object element) { - ArrayList list = new ArrayList(); + ArrayList<TreeItem> list = new ArrayList<TreeItem>(); TreeItem[] items = getTree().getItems(); for (int i = 0; i < items.length; i++) { findAllOccurrences(items[i], element, list); } - return (Widget[]) list.toArray(new Widget[0]); + return list.toArray(new Widget[0]); } /** @@ -390,9 +389,9 @@ public class BreakpointsViewer extends CheckboxTreeViewer { * @param item the item in the tree * @param element the element to compare */ - private void findAllOccurrences(TreeItem item, Object element, ArrayList list) { + private void findAllOccurrences(TreeItem item, Object element, ArrayList<TreeItem> list) { if (element.equals(item.getData())) { - list.add(item); + list.add(item); } TreeItem[] items = item.getItems(); for (int i = 0; i < items.length; i++) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ElementComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ElementComparator.java index 20d10f06e..ab81f41b1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ElementComparator.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ElementComparator.java @@ -1,5 +1,5 @@ /***************************************************************** - * Copyright (c) 2009, 2010 Texas Instruments and others + * Copyright (c) 2009, 2013 Texas Instruments and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * Patrick Chuong (Texas Instruments) - Initial API and implementation (Bug 238956) * Pawel Piech (Windriver) - Ongoing bug fixes and enhancements (Bug 311457) + * IBM Corporation - bug fixing *****************************************************************/ package org.eclipse.debug.internal.ui.views.breakpoints; @@ -30,27 +31,29 @@ import org.eclipse.debug.internal.ui.views.DebugModelPresentationContext; * * @since 3.6 */ -public class ElementComparator implements Comparator { +public class ElementComparator implements Comparator<Object> { final private static String SPACE = " "; //$NON-NLS-1$ protected DebugModelPresentationContext fContext; public ElementComparator(IPresentationContext context) { - if (context instanceof DebugModelPresentationContext) + if (context instanceof DebugModelPresentationContext) { fContext = (DebugModelPresentationContext) context; + } } /* (non-Javadoc) * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ + @Override public int compare(Object arg0, Object arg1) { IBreakpoint bp0 = (IBreakpoint)DebugPlugin.getAdapter(arg0, IBreakpoint.class); IBreakpoint bp1 = (IBreakpoint)DebugPlugin.getAdapter(arg1, IBreakpoint.class); if (bp0 != null && bp1 != null) { - return compare(bp0, bp1); + return doCompare(bp0, bp1); } else if (arg0 instanceof IBreakpointContainer && arg1 instanceof IBreakpointContainer) { - return compare((IBreakpointContainer) arg0, (IBreakpointContainer) arg1); + return doCompare((IBreakpointContainer) arg0, (IBreakpointContainer) arg1); } else { return -1; // just return -1 if the two objects are not IBreakpoint type } @@ -63,7 +66,7 @@ public class ElementComparator implements Comparator { * @param c2 * @return */ - private int compare(IBreakpointContainer c1, IBreakpointContainer c2) { + private int doCompare(IBreakpointContainer c1, IBreakpointContainer c2) { // The "Other" breakpoint category should be listed last. // (Bug 311457). if (c1.getCategory() instanceof OtherBreakpointCategory) { @@ -93,7 +96,7 @@ public class ElementComparator implements Comparator { * @param b2 * @return */ - private int compare(IBreakpoint b1, IBreakpoint b2) { + private int doCompare(IBreakpoint b1, IBreakpoint b2) { String text1 = IInternalDebugCoreConstants.EMPTY_STRING; String text2 = IInternalDebugCoreConstants.EMPTY_STRING; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/FileBreakpointOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/FileBreakpointOrganizer.java index bf2a4b316..656899ba0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/FileBreakpointOrganizer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/FileBreakpointOrganizer.java @@ -27,7 +27,8 @@ public class FileBreakpointOrganizer extends AbstractBreakpointOrganizerDelegate /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint) */ - public IAdaptable[] getCategories(IBreakpoint breakpoint) { + @Override + public IAdaptable[] getCategories(IBreakpoint breakpoint) { IMarker marker = breakpoint.getMarker(); if (marker != null) { IResource resource = marker.getResource(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ProjectBreakpointOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ProjectBreakpointOrganizer.java index 03d8ebdda..5aaef21e4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ProjectBreakpointOrganizer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ProjectBreakpointOrganizer.java @@ -26,7 +26,8 @@ public class ProjectBreakpointOrganizer extends AbstractBreakpointOrganizerDeleg /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint) */ - public IAdaptable[] getCategories(IBreakpoint breakpoint) { + @Override + public IAdaptable[] getCategories(IBreakpoint breakpoint) { IMarker marker = breakpoint.getMarker(); if (marker != null) { IProject project = marker.getResource().getProject(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java index 14125fcd2..bce1bbffe 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -44,9 +44,10 @@ public class WorkingSetBreakpointOrganizer extends AbstractBreakpointOrganizerDe /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint) */ - public IAdaptable[] getCategories(IBreakpoint breakpoint) { - List result = new ArrayList(); - List parents = new ArrayList(); + @Override + public IAdaptable[] getCategories(IBreakpoint breakpoint) { + List<IAdaptable> result = new ArrayList<IAdaptable>(); + List<IResource> parents = new ArrayList<IResource>(); IResource res = breakpoint.getMarker().getResource(); parents.add(res); while (res != null) { @@ -70,13 +71,14 @@ public class WorkingSetBreakpointOrganizer extends AbstractBreakpointOrganizerDe } } } - return (IAdaptable[]) result.toArray(new IAdaptable[result.size()]); + return result.toArray(new IAdaptable[result.size()]); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#dispose() */ - public void dispose() { + @Override + public void dispose() { fWorkingSetManager.removePropertyChangeListener(this); fWorkingSetManager = null; super.dispose(); @@ -85,7 +87,8 @@ public class WorkingSetBreakpointOrganizer extends AbstractBreakpointOrganizerDe /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { IWorkingSet set = null; if (event.getNewValue() instanceof IWorkingSet) { set = (IWorkingSet) event.getNewValue(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java index 79519b1b5..7dd94a277 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java @@ -40,21 +40,24 @@ public class WorkingSetCategory extends PlatformObject implements IWorkbenchAdap /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ - public ImageDescriptor getImageDescriptor(Object object) { + @Override + public ImageDescriptor getImageDescriptor(Object object) { return fWorkingSet.getImageDescriptor(); } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ - public String getLabel(Object o) { + @Override + public String getLabel(Object o) { StringBuffer name = new StringBuffer(fWorkingSet.getName()); if (isDefault()) { name.append(DebugUIViewsMessages.WorkingSetCategory_0); @@ -65,7 +68,8 @@ public class WorkingSetCategory extends PlatformObject implements IWorkbenchAdap /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ - public Object getParent(Object o) { + @Override + public Object getParent(Object o) { return null; } @@ -81,7 +85,8 @@ public class WorkingSetCategory extends PlatformObject implements IWorkbenchAdap /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (obj instanceof WorkingSetCategory) { WorkingSetCategory category = (WorkingSetCategory) obj; return category.getWorkingSet().equals(fWorkingSet); @@ -92,28 +97,32 @@ public class WorkingSetCategory extends PlatformObject implements IWorkbenchAdap /* (non-Javadoc) * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { return fWorkingSet.hashCode(); } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter2#getForeground(java.lang.Object) */ - public RGB getForeground(Object element) { + @Override + public RGB getForeground(Object element) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter2#getBackground(java.lang.Object) */ - public RGB getBackground(Object element) { + @Override + public RGB getBackground(Object element) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter2#getFont(java.lang.Object) */ - public FontData getFont(Object element) { + @Override + public FontData getFont(Object element) { if (isDefault()) { FontData[] fontData = JFaceResources.getDefaultFont().getFontData(); if (fontData != null && fontData.length > 0) { @@ -134,7 +143,8 @@ public class WorkingSetCategory extends PlatformObject implements IWorkbenchAdap return fWorkingSet.equals(BreakpointSetOrganizer.getDefaultWorkingSet()); } - public String toString() { + @Override + public String toString() { return fWorkingSet.getName(); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java index b623b26e3..d00a40569 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,7 +36,7 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan /** * Console listeners */ - private List fListeners = new ArrayList(2); + private List<IConsoleLineTracker> fListeners = new ArrayList<IConsoleLineTracker>(2); /** * The console this notifier is tracking @@ -46,6 +46,7 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan /* (non-Javadoc) * @see org.eclipse.ui.console.IPatternMatchListenerDelegate#connect(org.eclipse.ui.console.TextConsole) */ + @Override public void connect(TextConsole console) { if (console instanceof ProcessConsole) { fConsole = (ProcessConsole)console; @@ -63,6 +64,7 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan /* (non-Javadoc) * @see org.eclipse.ui.console.IPatternMatchListener#disconnect() */ + @Override public synchronized void disconnect() { try { IDocument document = fConsole.getDocument(); @@ -83,7 +85,7 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan public synchronized void consoleClosed() { int size = fListeners.size(); for (int i = 0; i < size; i++) { - IConsoleLineTracker tracker = (IConsoleLineTracker) fListeners.get(i); + IConsoleLineTracker tracker = fListeners.get(i); if (tracker instanceof IConsoleLineTrackerExtension) { ((IConsoleLineTrackerExtension) tracker).consoleClosed(); } @@ -101,14 +103,16 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan * @param listener the listener to add */ public void addConsoleListener(IConsoleLineTracker listener) { - if (!fListeners.contains(listener)) - fListeners.add(listener); + if (!fListeners.contains(listener)) { + fListeners.add(listener); + } } /* (non-Javadoc) * @see org.eclipse.ui.console.IPatternMatchListener#matchFound(org.eclipse.ui.console.PatternMatchEvent) */ - public void matchFound(PatternMatchEvent event) { + @Override + public void matchFound(PatternMatchEvent event) { try { IDocument document = fConsole.getDocument(); int lineOfOffset = document.getLineOfOffset(event.getOffset()); @@ -122,7 +126,7 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan public void lineAppended(IRegion region) { int size = fListeners.size(); for (int i=0; i<size; i++) { - IConsoleLineTracker tracker = (IConsoleLineTracker) fListeners.get(i); + IConsoleLineTracker tracker = fListeners.get(i); tracker.lineAppended(region); } } @@ -130,7 +134,8 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { if(event.getProperty().equals(IConsoleConstants.P_CONSOLE_OUTPUT_COMPLETE)) { fConsole.removePropertyChangeListener(this); consoleClosed(); @@ -140,21 +145,24 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan /* (non-Javadoc) * @see org.eclipse.ui.console.IPatternMatchListener#getPattern() */ - public String getPattern() { + @Override + public String getPattern() { return ".*\\r(\\n?)|.*\\n"; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.ui.console.IPatternMatchListener#getCompilerFlags() */ - public int getCompilerFlags() { + @Override + public int getCompilerFlags() { return 0; } /* (non-Javadoc) * @see org.eclipse.ui.console.IPatternMatchListener#getLineQualifier() */ - public String getLineQualifier() { + @Override + public String getLineQualifier() { return "\\n|\\r"; //$NON-NLS-1$ } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java index 9d3a049bc..794264c51 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java @@ -34,6 +34,7 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate, /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IUpdate#update() */ + @Override public void update() { ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches(); for (int i = 0; i < launches.length; i++) { @@ -50,6 +51,7 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate, /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches(); RemoveAllTerminatedAction.removeTerminatedLaunches(launches); @@ -69,7 +71,8 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate, /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ - public void launchesRemoved(ILaunch[] launches) { + @Override + public void launchesRemoved(ILaunch[] launches) { if (isEnabled()) { update(); } @@ -78,18 +81,21 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate, /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ - public void launchesAdded(ILaunch[] launches) { + @Override + public void launchesAdded(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ - public void launchesChanged(ILaunch[] launches) { + @Override + public void launchesChanged(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesTerminated(ILaunch[] launches) { update(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java index dcd6847c0..aa4a60c92 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java @@ -70,7 +70,8 @@ public class ConsoleRemoveLaunchAction extends Action implements IViewActionDele } } - public synchronized void run() { + @Override + public synchronized void run() { ILaunch launch = getLaunch(); if (launch != null) { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); @@ -78,30 +79,36 @@ public class ConsoleRemoveLaunchAction extends Action implements IViewActionDele } } - public void init(IViewPart view) { + @Override + public void init(IViewPart view) { if (view instanceof IConsoleView) { fConsoleView = (IConsoleView) view; } update(); } - public void run(IAction action) { + @Override + public void run(IAction action) { run(); } - public void selectionChanged(IAction action, ISelection selection) { + @Override + public void selectionChanged(IAction action, ISelection selection) { } - public void consolesAdded(IConsole[] consoles) { + @Override + public void consolesAdded(IConsole[] consoles) { } - public void consolesRemoved(IConsole[] consoles) { + @Override + public void consolesRemoved(IConsole[] consoles) { update(); } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesTerminated(ILaunch[] launches) { update(); } @@ -109,18 +116,21 @@ public class ConsoleRemoveLaunchAction extends Action implements IViewActionDele /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesRemoved(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesAdded(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesChanged(ILaunch[] launches) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java index 7ff97a24d..4d2babb25 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java @@ -29,14 +29,16 @@ public class ConsoleShowPreferencesAction extends Action implements IViewActionD * * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ - public void init(IViewPart view) {} + @Override + public void init(IViewPart view) {} /* * (non-Javadoc) * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ - public void run(IAction action) { + @Override + public void run(IAction action) { SWTFactory.showPreferencePage("org.eclipse.debug.ui.ConsolePreferencePage"); //$NON-NLS-1$ } @@ -46,7 +48,8 @@ public class ConsoleShowPreferencesAction extends Action implements IViewActionD * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, * org.eclipse.jface.viewers.ISelection) */ - public void selectionChanged(IAction action, ISelection selection) { + @Override + public void selectionChanged(IAction action, ISelection selection) { // do nothing } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java index cdb9707b3..61d975135 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,6 +19,7 @@ import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.core.commands.ITerminateHandler; import org.eclipse.debug.core.model.IDebugTarget; import org.eclipse.debug.core.model.IProcess; +import org.eclipse.debug.core.model.ITerminate; import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; @@ -57,6 +58,7 @@ public class ConsoleTerminateAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IUpdate#update() */ + @Override public void update() { IProcess process = fConsole.getProcess(); setEnabled(process.canTerminate()); @@ -65,9 +67,10 @@ public class ConsoleTerminateAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { IProcess process = fConsole.getProcess(); - List targets = collectTargets(process); + List<ITerminate> targets = collectTargets(process); targets.add(process); DebugCommandService service = DebugCommandService.getService(fWindow); service.executeCommand(ITerminateHandler.class, targets.toArray(), null); @@ -79,10 +82,10 @@ public class ConsoleTerminateAction extends Action implements IUpdate { * @param process the process to collect {@link IDebugTarget}s for * @return associated targets */ - private List collectTargets(IProcess process) { + private List<ITerminate> collectTargets(IProcess process) { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); ILaunch[] launches = launchManager.getLaunches(); - List targets = new ArrayList(); + List<ITerminate> targets = new ArrayList<ITerminate>(); for (int i = 0; i < launches.length; i++) { ILaunch launch = launches[i]; IProcess[] processes = launch.getProcesses(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java index 88cf70b0c..abffd38da 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java @@ -16,7 +16,6 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.core.resources.IFile; @@ -89,10 +88,11 @@ import com.ibm.icu.text.MessageFormat; * * @since 3.0 */ +@SuppressWarnings("deprecation") public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSetListener, IPropertyChangeListener { private IProcess fProcess = null; - private List fStreamListeners = new ArrayList(); + private List<StreamListener> fStreamListeners = new ArrayList<StreamListener>(); private IConsoleColorProvider fColorProvider; @@ -160,10 +160,10 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe fFileOutputStream = new FileOutputStream(outputFile, append); fileLoc = outputFile.getAbsolutePath(); - message = MessageFormat.format(ConsoleMessages.ProcessConsole_1, new String[] {fileLoc}); + message = MessageFormat.format(ConsoleMessages.ProcessConsole_1, new Object[] { fileLoc }); addPatternMatchListener(new ConsoleLogFilePatternMatcher(fileLoc)); } catch (FileNotFoundException e) { - message = MessageFormat.format(ConsoleMessages.ProcessConsole_2, new String[] {file}); + message = MessageFormat.format(ConsoleMessages.ProcessConsole_2, new Object[] { file }); } catch (CoreException e) { DebugUIPlugin.log(e); } @@ -254,7 +254,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } if (process.isTerminated()) { - return MessageFormat.format(ConsoleMessages.ProcessConsole_0, new String[] { label }); + return MessageFormat.format(ConsoleMessages.ProcessConsole_0, new Object[] { label }); } return label; } @@ -262,7 +262,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent evt) { + @Override + public void propertyChange(PropertyChangeEvent evt) { String property = evt.getProperty(); IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore(); if (property.equals(IDebugPreferenceConstants.CONSOLE_WRAP) || property.equals(IDebugPreferenceConstants.CONSOLE_WIDTH)) { @@ -289,23 +290,27 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe setTabWidth(tabWidth); } else if (property.equals(IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT)) { boolean activateOnOut = store.getBoolean(IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT); - IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM); + @SuppressWarnings("resource") + IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM); if (stream != null) { stream.setActivateOnWrite(activateOnOut); } } else if (property.equals(IDebugPreferenceConstants.CONSOLE_OPEN_ON_ERR)) { boolean activateOnErr = store.getBoolean(IDebugPreferenceConstants.CONSOLE_OPEN_ON_ERR); - IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_ERROR_STREAM); + @SuppressWarnings("resource") + IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_ERROR_STREAM); if (stream != null) { stream.setActivateOnWrite(activateOnErr); } } else if (property.equals(IDebugPreferenceConstants.CONSOLE_SYS_OUT_COLOR)) { - IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM); + @SuppressWarnings("resource") + IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM); if (stream != null) { stream.setColor(fColorProvider.getColor(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM)); } } else if (property.equals(IDebugPreferenceConstants.CONSOLE_SYS_ERR_COLOR)) { - IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_ERROR_STREAM); + @SuppressWarnings("resource") + IOConsoleOutputStream stream = getStream(IDebugUIConstants.ID_STANDARD_ERROR_STREAM); if (stream != null) { stream.setColor(fColorProvider.getColor(IDebugUIConstants.ID_STANDARD_ERROR_STREAM)); } @@ -323,9 +328,9 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * @see org.eclipse.debug.ui.console.IConsole#getStream(java.lang.String) */ - public IOConsoleOutputStream getStream(String streamIdentifier) { - for (Iterator i = fStreamListeners.iterator(); i.hasNext();) { - StreamListener listener = (StreamListener) i.next(); + @Override + public IOConsoleOutputStream getStream(String streamIdentifier) { + for (StreamListener listener : fStreamListeners) { if (listener.fStreamId.equals(streamIdentifier)) { return listener.fStream; } @@ -336,14 +341,16 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * @see org.eclipse.debug.ui.console.IConsole#getProcess() */ - public IProcess getProcess() { + @Override + public IProcess getProcess() { return fProcess; } /** * @see org.eclipse.ui.console.IOConsole#dispose() */ - protected void dispose() { + @Override + protected void dispose() { super.dispose(); fColorProvider.disconnect(); closeStreams(); @@ -354,14 +361,13 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } /** - * cleanup method to clsoe all of the open stream to this console - */ + * cleanup method to close all of the open stream to this console + */ private synchronized void closeStreams() { if (fStreamsClosed) { return; } - for (Iterator i = fStreamListeners.iterator(); i.hasNext();) { - StreamListener listener = (StreamListener) i.next(); + for (StreamListener listener : fStreamListeners) { listener.closeStream(); } if (fFileOutputStream != null) { @@ -381,11 +387,11 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } /** - * disposes ofthe listeners for each of the stream associated with this console - */ + * disposes the listeners for each of the stream associated with this + * console + */ private synchronized void disposeStreams() { - for (Iterator i = fStreamListeners.iterator(); i.hasNext();) { - StreamListener listener = (StreamListener) i.next(); + for (StreamListener listener : fStreamListeners) { listener.dispose(); } fFileOutputStream = null; @@ -395,7 +401,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * @see org.eclipse.ui.console.AbstractConsole#init() */ - protected void init() { + @Override + protected void init() { super.init(); if (fProcess.isTerminated()) { closeStreams(); @@ -418,7 +425,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { setFont(JFaceResources.getFont(IDebugUIConstants.PREF_CONSOLE_FONT)); setBackground(DebugUIPlugin.getPreferenceColor(IDebugPreferenceConstants.CONSOLE_BAKGROUND_COLOR)); } @@ -430,7 +438,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe * * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ - public void handleDebugEvents(DebugEvent[] events) { + @Override + public void handleDebugEvents(DebugEvent[] events) { for (int i = 0; i < events.length; i++) { DebugEvent event = events[i]; if (event.getSource().equals(getProcess())) { @@ -453,6 +462,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe String name = getName(); if (!name.equals(newName)) { UIJob job = new UIJob("Update console title") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { ProcessConsole.this.setName(newName); warnOfContentChange(); @@ -474,7 +484,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * @see org.eclipse.debug.ui.console.IConsole#connect(org.eclipse.debug.core.model.IStreamsProxy) */ - public void connect(IStreamsProxy streamsProxy) { + @Override + public void connect(IStreamsProxy streamsProxy) { IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore(); IStreamMonitor streamMonitor = streamsProxy.getErrorStreamMonitor(); if (streamMonitor != null) { @@ -494,7 +505,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * @see org.eclipse.debug.ui.console.IConsole#connect(org.eclipse.debug.core.model.IStreamMonitor, java.lang.String) */ - public void connect(IStreamMonitor streamMonitor, String streamIdentifier) { + @Override + public void connect(IStreamMonitor streamMonitor, String streamIdentifier) { connect(streamMonitor, streamIdentifier, false); } @@ -505,7 +517,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe * @param streamIdentifier stream identifier * @param activateOnWrite whether the stream should displayed when written to */ - private void connect(IStreamMonitor streamMonitor, String streamIdentifier, boolean activateOnWrite) { + @SuppressWarnings("resource") + private void connect(IStreamMonitor streamMonitor, String streamIdentifier, boolean activateOnWrite) { IOConsoleOutputStream stream = null; if (fAllocateConsole) { stream = newOutputStream(); @@ -522,7 +535,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * @see org.eclipse.debug.ui.console.IConsole#addLink(org.eclipse.debug.ui.console.IConsoleHyperlink, int, int) */ - public void addLink(IConsoleHyperlink link, int offset, int length) { + @Override + public void addLink(IConsoleHyperlink link, int offset, int length) { try { addHyperlink(link, offset, length); } catch (BadLocationException e) { @@ -533,7 +547,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * @see org.eclipse.debug.ui.console.IConsole#addLink(org.eclipse.ui.console.IHyperlink, int, int) */ - public void addLink(IHyperlink link, int offset, int length) { + @Override + public void addLink(IHyperlink link, int offset, int length) { try { addHyperlink(link, offset, length); } catch (BadLocationException e) { @@ -544,7 +559,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * @see org.eclipse.debug.ui.console.IConsole#getRegion(org.eclipse.debug.ui.console.IConsoleHyperlink) */ - public IRegion getRegion(IConsoleHyperlink link) { + @Override + public IRegion getRegion(IConsoleHyperlink link) { return super.getRegion(link); } @@ -578,22 +594,25 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe * @see org.eclipse.debug.core.IStreamListener#streamAppended(java.lang.String, * org.eclipse.debug.core.model.IStreamMonitor) */ - public void streamAppended(String text, IStreamMonitor monitor) { + @Override + public void streamAppended(String text, IStreamMonitor monitor) { String encoding = getEncoding(); if (fFlushed) { try { if (fStream != null) { - if (encoding == null) - fStream.write(text); - else - fStream.write(text.getBytes(encoding)); + if (encoding == null) { + fStream.write(text); + } else { + fStream.write(text.getBytes(encoding)); + } } if (fFileOutputStream != null) { synchronized (fFileOutputStream) { - if (encoding == null) - fFileOutputStream.write(text.getBytes()); - else - fFileOutputStream.write(text.getBytes(encoding)); + if (encoding == null) { + fFileOutputStream.write(text.getBytes()); + } else { + fFileOutputStream.write(text.getBytes(encoding)); + } } } } catch (IOException e) { @@ -671,7 +690,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe * * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ - protected IStatus run(IProgressMonitor monitor) { + @Override + protected IStatus run(IProgressMonitor monitor) { String encoding = getEncoding(); try { byte[] b = new byte[1024]; @@ -680,10 +700,11 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe read = fInput.read(b); if (read > 0) { String s; - if (encoding != null) - s = new String(b, 0, read, encoding); - else - s = new String(b, 0, read); + if (encoding != null) { + s = new String(b, 0, read, encoding); + } else { + s = new String(b, 0, read); + } streamsProxy.write(s); } } @@ -699,7 +720,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe * * @see org.eclipse.ui.console.IConsole#getImageDescriptor() */ - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { if (super.getImageDescriptor() == null) { setImageDescriptor(computeImageDescriptor()); } @@ -723,11 +745,13 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe return buffer.toString(); } - public String getPattern() { + @Override + public String getPattern() { return fFilePath; } - public void matchFound(PatternMatchEvent event) { + @Override + public void matchFound(PatternMatchEvent event) { try { addHyperlink(new ConsoleLogFileHyperlink(fFilePath), event.getOffset(), event.getLength()); removePatternMatchListener(this); @@ -735,18 +759,22 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } } - public int getCompilerFlags() { + @Override + public int getCompilerFlags() { return 0; } - public String getLineQualifier() { + @Override + public String getLineQualifier() { return null; } - public void connect(TextConsole console) { + @Override + public void connect(TextConsole console) { } - public void disconnect() { + @Override + public void disconnect() { } } @@ -756,7 +784,8 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe fFilePath = filePath; } - public void linkActivated() { + @Override + public void linkActivated() { IEditorInput input; Path path = new Path(fFilePath); IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); @@ -776,9 +805,11 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } catch (PartInitException e) { } } - public void linkEntered() { + @Override + public void linkEntered() { } - public void linkExited() { + @Override + public void linkExited() { } } @@ -791,36 +822,44 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe fFile = file; } - public IStorage getStorage() { + @Override + public IStorage getStorage() { return fStorage; } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return null; } - public String getName() { + @Override + public String getName() { return getStorage().getName(); } - public IPersistableElement getPersistable() { + @Override + public IPersistableElement getPersistable() { return null; } - public String getToolTipText() { + @Override + public String getToolTipText() { return getStorage().getFullPath().toOSString(); } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { return object instanceof StorageEditorInput && getStorage().equals(((StorageEditorInput)object).getStorage()); } - public int hashCode() { + @Override + public int hashCode() { return getStorage().hashCode(); } - public boolean exists() { + @Override + public boolean exists() { return fFile.exists(); } } @@ -828,6 +867,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /* (non-Javadoc) * @see org.eclipse.ui.console.AbstractConsole#getHelpContextId() */ + @Override public String getHelpContextId() { return IDebugHelpContextIds.PROCESS_CONSOLE; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java index df8479fe7..e4669a68d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.debug.internal.ui.views.console; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -47,7 +46,7 @@ public class ProcessConsoleManager implements ILaunchListener { /** * Console document content provider extensions, keyed by extension id */ - private Map fColorProviders; + private Map<String, IConfigurationElement> fColorProviders; /** * The default color provider. Used if no color provider is contributed @@ -58,19 +57,18 @@ public class ProcessConsoleManager implements ILaunchListener { /** * Console line trackers; keyed by process type to list of trackers (1:N) */ - private Map fLineTrackers; + private Map<String, List<IConfigurationElement>> fLineTrackers; /** * Map of processes for a launch to compute removed processes */ - private Map fProcesses; - - + private Map<ILaunch, IProcess[]> fProcesses; /** * @see ILaunchListener#launchRemoved(ILaunch) */ - public void launchRemoved(ILaunch launch) { + @Override + public void launchRemoved(ILaunch launch) { removeLaunch(launch); } @@ -123,14 +121,16 @@ public class ProcessConsoleManager implements ILaunchListener { /** * @see ILaunchListener#launchAdded(ILaunch) */ - public void launchAdded(ILaunch launch) { + @Override + public void launchAdded(ILaunch launch) { launchChanged(launch); } /** * @see ILaunchListener#launchChanged(ILaunch) */ - public void launchChanged(final ILaunch launch) { + @Override + public void launchChanged(final ILaunch launch) { IProcess[] processes= launch.getProcesses(); for (int i= 0; i < processes.length; i++) { if (getConsoleDocument(processes[i]) == null) { @@ -149,11 +149,9 @@ public class ProcessConsoleManager implements ILaunchListener { ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[]{pc}); } } - List removed = getRemovedProcesses(launch); + List<IProcess> removed = getRemovedProcesses(launch); if (removed != null) { - Iterator iterator = removed.iterator(); - while (iterator.hasNext()) { - IProcess p = (IProcess) iterator.next(); + for (IProcess p : removed) { removeProcess(p); } } @@ -212,7 +210,7 @@ public class ProcessConsoleManager implements ILaunchListener { */ public IConsoleColorProvider getColorProvider(String type) { if (fColorProviders == null) { - fColorProviders = new HashMap(); + fColorProviders = new HashMap<String, IConfigurationElement>(); IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_CONSOLE_COLOR_PROVIDERS); IConfigurationElement[] elements = extensionPoint.getConfigurationElements(); for (int i = 0; i < elements.length; i++) { @@ -220,7 +218,7 @@ public class ProcessConsoleManager implements ILaunchListener { fColorProviders.put(extension.getAttribute("processType"), extension); //$NON-NLS-1$ } } - IConfigurationElement extension = (IConfigurationElement)fColorProviders.get(type); + IConfigurationElement extension = fColorProviders.get(type); if (extension != null) { try { Object colorProvider = extension.createExecutableExtension("class"); //$NON-NLS-1$ @@ -229,7 +227,7 @@ public class ProcessConsoleManager implements ILaunchListener { } DebugUIPlugin.logErrorMessage(MessageFormat.format( "Extension {0} must specify an instanceof IConsoleColorProvider for class attribute.", //$NON-NLS-1$ - new String[]{extension.getDeclaringExtension().getUniqueIdentifier()})); + new Object[] { extension.getDeclaringExtension().getUniqueIdentifier() })); } catch (CoreException e) { DebugUIPlugin.log(e); } @@ -250,36 +248,35 @@ public class ProcessConsoleManager implements ILaunchListener { String type = process.getAttribute(IProcess.ATTR_PROCESS_TYPE); if (fLineTrackers == null) { - fLineTrackers = new HashMap(); + fLineTrackers = new HashMap<String, List<IConfigurationElement>>(); IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_CONSOLE_LINE_TRACKERS); IConfigurationElement[] elements = extensionPoint.getConfigurationElements(); for (int i = 0; i < elements.length; i++) { IConfigurationElement extension = elements[i]; String processType = extension.getAttribute("processType"); //$NON-NLS-1$ - List list = (List)fLineTrackers.get(processType); + List<IConfigurationElement> list = fLineTrackers.get(processType); if (list == null) { - list = new ArrayList(); + list = new ArrayList<IConfigurationElement>(); fLineTrackers.put(processType, list); } list.add(extension); } } - ArrayList trackers = new ArrayList(); + ArrayList<IConsoleLineTracker> trackers = new ArrayList<IConsoleLineTracker>(); if (type != null) { - List lineTrackerExtensions = (List) fLineTrackers.get(type); + List<IConfigurationElement> lineTrackerExtensions = fLineTrackers.get(type); if(lineTrackerExtensions != null) { - for(Iterator i = lineTrackerExtensions.iterator(); i.hasNext(); ) { - IConfigurationElement element = (IConfigurationElement) i.next(); + for (IConfigurationElement element : lineTrackerExtensions) { try { - trackers.add(element.createExecutableExtension("class")); //$NON-NLS-1$ + trackers.add((IConsoleLineTracker) element.createExecutableExtension("class")); //$NON-NLS-1$ } catch (CoreException e) { DebugUIPlugin.log(e); } } } } - return (IConsoleLineTracker[]) trackers.toArray(new IConsoleLineTracker[0]); + return trackers.toArray(new IConsoleLineTracker[0]); } /** @@ -289,19 +286,19 @@ public class ProcessConsoleManager implements ILaunchListener { * @param launch launch that has changed * @return removed processes or <code>null</code> */ - private List getRemovedProcesses(ILaunch launch) { - List removed = null; + private List<IProcess> getRemovedProcesses(ILaunch launch) { + List<IProcess> removed = null; if (fProcesses == null) { - fProcesses = new HashMap(); + fProcesses = new HashMap<ILaunch, IProcess[]>(); } - IProcess[] old = (IProcess[]) fProcesses.get(launch); + IProcess[] old = fProcesses.get(launch); IProcess[] curr = launch.getProcesses(); if (old != null) { for (int i = 0; i < old.length; i++) { IProcess process = old[i]; if (!contains(curr, process)) { if (removed == null) { - removed = new ArrayList(); + removed = new ArrayList<IProcess>(); } removed.add(process); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java index 6fa8fdc03..4462e299e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java @@ -75,7 +75,8 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I * Handler to send EOF */ private class EOFHandler extends AbstractHandler { - public Object execute(ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException { + @Override + public Object execute(ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException { IStreamsProxy proxy = getProcess().getStreamsProxy(); if (proxy instanceof IStreamsProxy2) { IStreamsProxy2 proxy2 = (IStreamsProxy2) proxy; @@ -92,7 +93,8 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I /* (non-Javadoc) * @see org.eclipse.ui.console.IConsolePageParticipant#init(IPageBookViewPage, IConsole) */ - public void init(IPageBookViewPage page, IConsole console) { + @Override + public void init(IPageBookViewPage page, IConsole console) { fPage = page; fConsole = (ProcessConsole) console; @@ -118,7 +120,8 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I /* (non-Javadoc) * @see org.eclipse.ui.console.IConsolePageParticipant#dispose() */ - public void dispose() { + @Override + public void dispose() { DebugUITools.getDebugContextManager().getContextService(fPage.getSite().getWorkbenchWindow()).removeDebugContextListener(this); DebugPlugin.getDefault().removeDebugEventListener(this); if (fRemoveTerminated != null) { @@ -158,7 +161,8 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class required) { + @Override + public Object getAdapter(Class required) { if (IShowInSource.class.equals(required)) { return this; } @@ -179,7 +183,8 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I /* (non-Javadoc) * @see org.eclipse.ui.part.IShowInSource#getShowInContext() */ - public ShowInContext getShowInContext() { + @Override + public ShowInContext getShowInContext() { IProcess process = getProcess(); if (process == null) { return null; @@ -203,19 +208,22 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I /* (non-Javadoc) * @see org.eclipse.ui.part.IShowInTargetList#getShowInTargetIds() */ - public String[] getShowInTargetIds() { + @Override + public String[] getShowInTargetIds() { return new String[] {IDebugUIConstants.ID_DEBUG_VIEW}; } /* (non-Javadoc) * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ - public void handleDebugEvents(DebugEvent[] events) { + @Override + public void handleDebugEvents(DebugEvent[] events) { for (int i = 0; i < events.length; i++) { DebugEvent event = events[i]; if (event.getSource().equals(getProcess())) { Runnable r = new Runnable() { - public void run() { + @Override + public void run() { if (fTerminate != null) { fTerminate.update(); } @@ -234,7 +242,8 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I /* (non-Javadoc) * @see org.eclipse.ui.console.IConsolePageParticipant#activated() */ - public void activated() { + @Override + public void activated() { // add EOF submissions IPageSite site = fPage.getSite(); if(fActivatedContext == null && fActivatedHandler == null) { @@ -248,7 +257,8 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I /* (non-Javadoc) * @see org.eclipse.ui.console.IConsolePageParticipant#deactivated() */ - public void deactivated() { + @Override + public void deactivated() { // remove EOF submissions IPageSite site = fPage.getSite(); IHandlerService handlerService = (IHandlerService)site.getService(IHandlerService.class); @@ -262,6 +272,7 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener#contextEvent(org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { if (fView != null && getProcess().equals(DebugUITools.getCurrentProcess())) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java index a525977d0..478cc0eae 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java @@ -25,7 +25,8 @@ public class ProcessTypePropertyTester extends PropertyTester { /* (non-Javadoc) * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) */ - public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { + @Override + public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { if (receiver instanceof TextConsole) { TextConsole console = (TextConsole) receiver; IProcess process = (IProcess) console.getAttribute(IDebugUIConstants.ATTR_CONSOLE_PROCESS); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardErrorAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardErrorAction.java index ff2f6a064..a13a0cfe4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardErrorAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardErrorAction.java @@ -35,6 +35,7 @@ public class ShowStandardErrorAction extends ShowWhenContentChangesAction { setImageDescriptor(DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STANDARD_ERR)); } + @Override protected String getKey() { return IDebugPreferenceConstants.CONSOLE_OPEN_ON_ERR; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardOutAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardOutAction.java index 0bd2b96dd..71fd9fd12 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardOutAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardOutAction.java @@ -35,6 +35,7 @@ public class ShowStandardOutAction extends ShowWhenContentChangesAction { setImageDescriptor(DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STANDARD_OUT)); } + @Override protected String getKey() { return IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java index bfe1825b7..fca78ddb6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java @@ -38,6 +38,7 @@ public abstract class ShowWhenContentChangesAction extends Action implements IPr /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { String property = event.getProperty(); if (property.equals(getKey())) { @@ -68,6 +69,7 @@ public abstract class ShowWhenContentChangesAction extends Action implements IPr /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { IPreferenceStore store = getPreferenceStore(); boolean show = isChecked(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java index b63b1c8b1..874c04be6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -80,7 +80,8 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerDropAdapter#dragEnter(org.eclipse.swt.dnd.DropTargetEvent) */ - public void dragEnter(DropTargetEvent event) { + @Override + public void dragEnter(DropTargetEvent event) { fDropType = DROP_TYPE_DEFAULT; event.detail = DND.DROP_NONE; @@ -118,7 +119,7 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { */ private boolean isExpressionDrop() { IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection(); - Iterator iterator = selection.iterator(); + Iterator<?> iterator = selection.iterator(); while (iterator.hasNext()) { Object element = iterator.next(); if (getTargetExpression(element) == null){ @@ -133,7 +134,7 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { */ private boolean isVariableDrop() { IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection(); - Iterator iterator = selection.iterator(); + Iterator<?> iterator = selection.iterator(); while (iterator.hasNext()) { Object element = iterator.next(); if (!(element instanceof IVariable)){ @@ -149,7 +150,7 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { */ private boolean isWatchAdaptableElementDrop() { IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection(); - Iterator iterator = selection.iterator(); + Iterator<?> iterator = selection.iterator(); while (iterator.hasNext()) { Object element = iterator.next(); if (!(element instanceof IAdaptable && @@ -164,6 +165,7 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerDropAdapter#dragOver(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void dragOver(DropTargetEvent event) { super.dragOver(event); // Allow scrolling (but not expansion) @@ -173,7 +175,8 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerDropAdapter#validateDrop(java.lang.Object, int, org.eclipse.swt.dnd.TransferData) */ - public boolean validateDrop(Object target, int operation, TransferData transferType) { + @Override + public boolean validateDrop(Object target, int operation, TransferData transferType) { if (LocalSelectionTransfer.getTransfer().isSupportedType(transferType)) { if (fDropType == DROP_TYPE_EXPRESSION){ return validateExpressionDrop(target); @@ -226,7 +229,7 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { if (selection != null) { size = selection.size(); IExpressionManager manager = DebugPlugin.getDefault().getExpressionManager(); - Iterator iterator = selection.iterator(); + Iterator<?> iterator = selection.iterator(); while (iterator.hasNext()) { Object element = iterator.next(); if (element instanceof IVariable){ @@ -261,7 +264,7 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { int size = -1; if (selection != null) { size = selection.size(); - Iterator iterator = selection.iterator(); + Iterator<?> iterator = selection.iterator(); while (iterator.hasNext()) { Object element = iterator.next(); if (isFactory2Enabled(element)) { @@ -317,6 +320,7 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerDropAdapter#drop(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void drop(DropTargetEvent event) { fCurrentTransferType = event.currentDataType; // Unless insert after is explicitly set, insert before @@ -327,7 +331,8 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerDropAdapter#performDrop(java.lang.Object) */ - public boolean performDrop(Object data) { + @Override + public boolean performDrop(Object data) { if (LocalSelectionTransfer.getTransfer().isSupportedType(fCurrentTransferType)) { IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection(); if (fDropType == DROP_TYPE_EXPRESSION){ @@ -379,8 +384,8 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { * @return whether the drop was successful */ private boolean performVariableOrWatchAdaptableDrop(IStructuredSelection selection) { - List expressions = new ArrayList(selection.size()); - for (Iterator itr = selection.iterator(); itr.hasNext(); ) { + List<IExpression> expressions = new ArrayList<IExpression>(selection.size()); + for (Iterator<?> itr = selection.iterator(); itr.hasNext();) { Object element = itr.next(); String expressionText = createExpressionString(element); if (expressionText != null){ @@ -400,9 +405,9 @@ public class ExpressionDropAdapter extends ViewerDropAdapter { if (manager instanceof ExpressionManager){ IExpression targetExpression = getTargetExpression(getCurrentTarget()); if (targetExpression != null){ - ((ExpressionManager)manager).insertExpressions((IExpression[])expressions.toArray(new IExpression[expressions.size()]), targetExpression, fInsertBefore); + ((ExpressionManager)manager).insertExpressions(expressions.toArray(new IExpression[expressions.size()]), targetExpression, fInsertBefore); } else { - ((ExpressionManager)manager).addExpressions((IExpression[])expressions.toArray(new IExpression[expressions.size()])); + ((ExpressionManager)manager).addExpressions(expressions.toArray(new IExpression[expressions.size()])); } return true; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java index 54f3d965d..d7e811e5d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java @@ -64,6 +64,7 @@ public class ExpressionView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.EXPRESSION_VIEW; } @@ -71,6 +72,7 @@ public class ExpressionView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#configureToolBar(org.eclipse.jface.action.IToolBarManager) */ + @Override protected void configureToolBar(IToolBarManager tbm) { super.configureToolBar(tbm); tbm.add(new Separator(IDebugUIConstants.EMPTY_EXPRESSION_GROUP)); @@ -80,6 +82,7 @@ public class ExpressionView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override protected void fillContextMenu(IMenuManager menu) { menu.add(new Separator(IDebugUIConstants.EMPTY_EXPRESSION_GROUP)); menu.add(new Separator(IDebugUIConstants.EXPRESSION_GROUP)); @@ -104,6 +107,7 @@ public class ExpressionView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#contextActivated(org.eclipse.jface.viewers.ISelection) */ + @Override protected void contextActivated(ISelection selection) { if (!isAvailable() || !isVisible()) { return; @@ -121,6 +125,7 @@ public class ExpressionView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#viewerInputUpdateComplete(IViewerInputUpdate) */ + @Override protected void viewerInputUpdateComplete(IViewerInputUpdate update) { IStatus status = update.getStatus(); if ( (status == null || status.isOK()) && update.getElement() != null) { @@ -134,6 +139,7 @@ public class ExpressionView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getDetailPanePreferenceKey() */ + @Override protected String getDetailPanePreferenceKey() { return IDebugPreferenceConstants.EXPRESSIONS_DETAIL_PANE_ORIENTATION; } @@ -141,6 +147,7 @@ public class ExpressionView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getToggleActionLabel() */ + @Override protected String getToggleActionLabel() { return VariablesViewMessages.ExpressionView_4; } @@ -148,6 +155,7 @@ public class ExpressionView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getPresentationContextId() */ + @Override protected String getPresentationContextId() { return IDebugUIConstants.ID_EXPRESSION_VIEW; } @@ -155,7 +163,8 @@ public class ExpressionView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#initDragAndDrop(org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer) */ - protected void initDragAndDrop(TreeModelViewer viewer) { + @Override + protected void initDragAndDrop(TreeModelViewer viewer) { viewer.addDragSupport(DND.DROP_MOVE, new Transfer[] {LocalSelectionTransfer.getTransfer()}, new SelectionDragAdapter(viewer)); viewer.addDropSupport(DND.DROP_MOVE|DND.DROP_COPY, new Transfer[] {LocalSelectionTransfer.getTransfer(), TextTransfer.getInstance()}, new ExpressionDropAdapter(getSite(), viewer)); } @@ -163,7 +172,8 @@ public class ExpressionView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#createActions() */ - protected void createActions() { + @Override + protected void createActions() { super.createActions(); fPasteAction = new PasteWatchExpressionsAction(this); configure(fPasteAction, IWorkbenchCommandConstants.EDIT_PASTE, PASTE_ACTION, ISharedImages.IMG_TOOL_PASTE); @@ -171,7 +181,8 @@ public class ExpressionView extends VariablesView { configure(fEditInPlaceAction, IWorkbenchCommandConstants.FILE_RENAME, ActionFactory.RENAME.getId(), null); } - public void dispose() { + @Override + public void dispose() { fEditInPlaceAction.dispose(); super.dispose(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java index f24b49546..39825b009 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java @@ -46,6 +46,7 @@ class BreadcrumbDropDownAutoExpandAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { fLaunchView.setBreadcrumbDropDownAutoExpand(isChecked()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java index 1b458ec5c..f75f7a5cb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java @@ -29,14 +29,16 @@ class BreadcrumbWorkbenchPart implements IWorkbenchPart { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { return (obj instanceof BreadcrumbWorkbenchPart); } /* (non-Javadoc) * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { return getClass().hashCode(); } @@ -52,65 +54,75 @@ class BreadcrumbWorkbenchPart implements IWorkbenchPart { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#addPropertyListener(org.eclipse.ui.IPropertyListener) */ - public void addPropertyListener(IPropertyListener listener) { + @Override + public void addPropertyListener(IPropertyListener listener) { } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ - public void createPartControl(Composite parent) { + @Override + public void createPartControl(Composite parent) { } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#dispose() */ - public void dispose() { + @Override + public void dispose() { } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#getSite() */ - public IWorkbenchPartSite getSite() { + @Override + public IWorkbenchPartSite getSite() { return fSite; } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#getTitle() */ - public String getTitle() { + @Override + public String getTitle() { return ""; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#getTitleImage() */ - public Image getTitleImage() { + @Override + public Image getTitleImage() { return null; } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#getTitleToolTip() */ - public String getTitleToolTip() { + @Override + public String getTitleToolTip() { return ""; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#removePropertyListener(org.eclipse.ui.IPropertyListener) */ - public void removePropertyListener(IPropertyListener listener) { + @Override + public void removePropertyListener(IPropertyListener listener) { } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#setFocus() */ - public void setFocus() { + @Override + public void setFocus() { } /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { return null; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java index 1754e348e..dd5f094f2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java @@ -146,7 +146,8 @@ public class DebugElementAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ - public Object getAdapter(Object adaptableObject, Class adapterType) { + @Override + public Object getAdapter(Object adaptableObject, Class adapterType) { if (adapterType.isInstance(adaptableObject)) { return adaptableObject; } @@ -322,7 +323,8 @@ public class DebugElementAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ - public Class[] getAdapterList() { + @Override + public Class[] getAdapterList() { return new Class[] { IAsynchronousLabelAdapter.class, IAsynchronousContentAdapter.class, diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementHelper.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementHelper.java index efafa7b7c..04acbd126 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementHelper.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementHelper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -26,204 +26,201 @@ import org.eclipse.swt.graphics.RGB; /** * Translates images, colors, and fonts into image descriptors, RGBs, and font - * datas for workbench adapaters. Also provides labels. + * data for workbench adapters. Also provides labels. * * @since 3.1 */ public class DebugElementHelper { - - // a model presentation that can provide images & labels for debug elements - private static DelegatingModelPresentation fgPresenetation; - - // map of images to image descriptors - private static Map fgImages = new HashMap(); - - /** - * Disposes this adapater - */ - public static void dispose() { - fgImages.clear(); - if (fgPresenetation != null) { - fgPresenetation.dispose(); - fgPresenetation = null; - } - } - - /** - * Returns an image descriptor for the given debug element. - * - * @param object object for which an image descriptor is required - */ - public static ImageDescriptor getImageDescriptor(Object object) { - Image image = getPresentation().getImage(object); - return getImageDescriptor(image); - } - - /** - * Returns an image descriptor for the given debug element. - * - * @param presentation presentation to obtain image from - * @param object object for which an image descriptor is required - * @since 3.3 - */ - public static ImageDescriptor getImageDescriptor(Object object, IDebugModelPresentation presentation) { - Image image = presentation.getImage(object); - return getImageDescriptor(image); - } - - public static ImageDescriptor getImageDescriptor(Image image) - { - if (image != null) { - ImageDescriptor descriptor = (ImageDescriptor) fgImages.get(image); - if (descriptor == null) { - descriptor = new ImageImageDescriptor(image); - fgImages.put(image, descriptor); - } - return descriptor; - } - return null; - } - - /** - * Returns a label for the given debug element. - * - * @param o object for which a label is required - */ - public static String getLabel(Object o) { - return getPresentation().getText(o); - } - - /** - * Returns a model presentation to use to retrieve lables & images. - * - * @return a model presentation to use to retrieve lables & images - */ - public static DelegatingModelPresentation getPresentation() { - if (fgPresenetation == null) { - fgPresenetation = new DelegatingModelPresentation(); - } - return fgPresenetation; - } - - /** - * Returns the RGB of the foreground color for the given element, or - * <code>null</code> if none. - * - * @param element object for which a foreground color is required - * @return the RGB of the foreground color for the given element, or - * <code>null</code> if none - */ - public static RGB getForeground(Object element) { - Color color = getPresentation().getForeground(element); - if (color != null) { - return color.getRGB(); - } - return null; - } - - /** - * Returns the RGB of the foreground color for the given element, or - * <code>null</code> if none. - * - * @param element object for which a foreground color is required - * @param presentation presentation to obtain color from - * @return the RGB of the foreground color for the given element, or - * <code>null</code> if none - * @since 3.3 - */ - public static RGB getForeground(Object element, IDebugModelPresentation presentation) { - Color color = null; - if (presentation instanceof IColorProvider) { + + // a model presentation that can provide images & labels for debug elements + private static DelegatingModelPresentation fgPresenetation; + + // map of images to image descriptors + private static Map<Image, ImageDescriptor> fgImages = new HashMap<Image, ImageDescriptor>(); + + /** + * Disposes this adapter + */ + public static void dispose() { + fgImages.clear(); + if (fgPresenetation != null) { + fgPresenetation.dispose(); + fgPresenetation = null; + } + } + + /** + * Returns an image descriptor for the given debug element. + * + * @param object object for which an image descriptor is required + */ + public static ImageDescriptor getImageDescriptor(Object object) { + Image image = getPresentation().getImage(object); + return getImageDescriptor(image); + } + + /** + * Returns an image descriptor for the given debug element. + * + * @param presentation presentation to obtain image from + * @param object object for which an image descriptor is required + * @since 3.3 + */ + public static ImageDescriptor getImageDescriptor(Object object, IDebugModelPresentation presentation) { + Image image = presentation.getImage(object); + return getImageDescriptor(image); + } + + public static ImageDescriptor getImageDescriptor(Image image) { + if (image != null) { + ImageDescriptor descriptor = fgImages.get(image); + if (descriptor == null) { + descriptor = new ImageImageDescriptor(image); + fgImages.put(image, descriptor); + } + return descriptor; + } + return null; + } + + /** + * Returns a label for the given debug element. + * + * @param o object for which a label is required + */ + public static String getLabel(Object o) { + return getPresentation().getText(o); + } + + /** + * Returns a model presentation to use to retrieve lables & images. + * + * @return a model presentation to use to retrieve lables & images + */ + public static DelegatingModelPresentation getPresentation() { + if (fgPresenetation == null) { + fgPresenetation = new DelegatingModelPresentation(); + } + return fgPresenetation; + } + + /** + * Returns the RGB of the foreground color for the given element, or + * <code>null</code> if none. + * + * @param element object for which a foreground color is required + * @return the RGB of the foreground color for the given element, or + * <code>null</code> if none + */ + public static RGB getForeground(Object element) { + Color color = getPresentation().getForeground(element); + if (color != null) { + return color.getRGB(); + } + return null; + } + + /** + * Returns the RGB of the foreground color for the given element, or + * <code>null</code> if none. + * + * @param element object for which a foreground color is required + * @param presentation presentation to obtain color from + * @return the RGB of the foreground color for the given element, or + * <code>null</code> if none + * @since 3.3 + */ + public static RGB getForeground(Object element, IDebugModelPresentation presentation) { + Color color = null; + if (presentation instanceof IColorProvider) { IColorProvider colorProvider = (IColorProvider) presentation; color = colorProvider.getForeground(element); } else { color = getPresentation().getForeground(element); } - if (color != null) { - return color.getRGB(); - } - return null; - } - - /** - * Returns the RGB of the background color for the given element, or - * <code>null</code> if none. - * - * @param element object for which a background color is required - * @return the RGB of the background color for the given element, or - * <code>null</code> if none - */ - public static RGB getBackground(Object element) { - Color color = getPresentation().getBackground(element); - if (color != null) { - return color.getRGB(); - } - return null; - } - - /** - * Returns the RGB of the background color for the given element, or - * <code>null</code> if none. - * - * @param element object for which a background color is required - * @param presentation presentation to use to retrieve color - * @return the RGB of the background color for the given element, or - * <code>null</code> if none - * @since 3.3 - */ - public static RGB getBackground(Object element, IDebugModelPresentation presentation) { - Color color = null; - if (presentation instanceof IColorProvider) { + if (color != null) { + return color.getRGB(); + } + return null; + } + + /** + * Returns the RGB of the background color for the given element, or + * <code>null</code> if none. + * + * @param element object for which a background color is required + * @return the RGB of the background color for the given element, or + * <code>null</code> if none + */ + public static RGB getBackground(Object element) { + Color color = getPresentation().getBackground(element); + if (color != null) { + return color.getRGB(); + } + return null; + } + + /** + * Returns the RGB of the background color for the given element, or + * <code>null</code> if none. + * + * @param element object for which a background color is required + * @param presentation presentation to use to retrieve color + * @return the RGB of the background color for the given element, or + * <code>null</code> if none + * @since 3.3 + */ + public static RGB getBackground(Object element, IDebugModelPresentation presentation) { + Color color = null; + if (presentation instanceof IColorProvider) { IColorProvider colorProvider = (IColorProvider) presentation; color = colorProvider.getBackground(element); } else { color = getPresentation().getBackground(element); } - if (color != null) { - return color.getRGB(); - } - return null; - } - - /** - * Returns the font data for the given element, or - * <code>null</code> if none. - * - * @param element object for which font data is required - * @return the font data for the given element, or - * <code>null</code> if none - */ - public static FontData getFont(Object element) { - Font font = getPresentation().getFont(element); - if (font != null) { - return font.getFontData()[0]; - } - return null; - } - - /** - * Returns the font data for the given element, or - * <code>null</code> if none. - * - * @param element object for which font data is required - * @param presentation presentation to obtain font from - * @return the font data for the given element, or - * <code>null</code> if none - * @since 3.3 - */ - public static FontData getFont(Object element, IDebugModelPresentation presentation) { - Font font = null; - if (presentation instanceof IFontProvider) { - IFontProvider provider = (IFontProvider) presentation; - font = provider.getFont(element); - } else { - font = getPresentation().getFont(element); - } - if (font != null) { - return font.getFontData()[0]; - } - return null; - } + if (color != null) { + return color.getRGB(); + } + return null; + } + + /** + * Returns the font data for the given element, or <code>null</code> if + * none. + * + * @param element object for which font data is required + * @return the font data for the given element, or <code>null</code> if none + */ + public static FontData getFont(Object element) { + Font font = getPresentation().getFont(element); + if (font != null) { + return font.getFontData()[0]; + } + return null; + } + + /** + * Returns the font data for the given element, or <code>null</code> if + * none. + * + * @param element object for which font data is required + * @param presentation presentation to obtain font from + * @return the font data for the given element, or <code>null</code> if none + * @since 3.3 + */ + public static FontData getFont(Object element, IDebugModelPresentation presentation) { + Font font = null; + if (presentation instanceof IFontProvider) { + IFontProvider provider = (IFontProvider) presentation; + font = provider.getFont(element); + } else { + font = getPresentation().getFont(element); + } + if (font != null) { + return font.getFontData()[0]; + } + return null; + } /** * Returns whether the UI thread is required for computing the label for the @@ -235,5 +232,5 @@ public class DebugElementHelper { public static boolean requiresUIThread(Object object) { DelegatingModelPresentation presentation = getPresentation(); return presentation.requiresUIThread(object); - } + } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java index d47929d13..38f9c6900 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java @@ -46,6 +46,7 @@ class DebugToolBarAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { fLaunchView.setDebugToolbarInView(isChecked()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java index 3c690ffd2..712f05126 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java @@ -73,6 +73,7 @@ class DebugViewModeAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { fLaunchView.setViewMode(fMode, fParent); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DecorationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DecorationManager.java index 49938fd68..d44ec65a5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DecorationManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DecorationManager.java @@ -25,71 +25,68 @@ import org.eclipse.debug.core.model.IThread; */ public class DecorationManager { - // map of targets to lists of active decorations - private static Map fDecorations = new HashMap(10); + // map of targets to lists of active decorations + private static Map<IDebugTarget, List<Decoration>> fDecorations = new HashMap<IDebugTarget, List<Decoration>>(10); - /** - * Adds the given decoration for the given stack frame. - * - * @param decoration - * @param frame - */ - public static void addDecoration(Decoration decoration) { - synchronized (fDecorations) { - IDebugTarget target = decoration.getThread().getDebugTarget(); - List list = (List) fDecorations.get(target); - if (list == null) { - list = new ArrayList(); - fDecorations.put(target, list); - } - list.add(decoration); - } - } + /** + * Adds the given decoration for the given stack frame. + * + * @param decoration + * @param frame + */ + public static void addDecoration(Decoration decoration) { + synchronized (fDecorations) { + IDebugTarget target = decoration.getThread().getDebugTarget(); + List<Decoration> list = fDecorations.get(target); + if (list == null) { + list = new ArrayList<Decoration>(); + fDecorations.put(target, list); + } + list.add(decoration); + } + } - /** - * Removes any decorations for the given debug target. - * - * @param target - * to remove editor decorations for - */ - public static void removeDecorations(IDebugTarget target) { - doRemoveDecorations(target, null); - } - - /** - * Removes any decorations for the given thread - * - * @param thread - * thread to remove decorations for - */ - public static void removeDecorations(IThread thread) { - doRemoveDecorations(thread.getDebugTarget(), thread); - } + /** + * Removes any decorations for the given debug target. + * + * @param target to remove editor decorations for + */ + public static void removeDecorations(IDebugTarget target) { + doRemoveDecorations(target, null); + } + + /** + * Removes any decorations for the given thread + * + * @param thread thread to remove decorations for + */ + public static void removeDecorations(IThread thread) { + doRemoveDecorations(thread.getDebugTarget(), thread); + } private static void doRemoveDecorations(IDebugTarget target, IThread thread) { - ArrayList decorationsToRemove = new ArrayList(); - synchronized (fDecorations) { - List list = (List) fDecorations.get(target); - if (list != null) { - ListIterator iterator = list.listIterator(); - while (iterator.hasNext()) { - Decoration decoration = (Decoration) iterator.next(); - if (thread == null || thread.equals(decoration.getThread())) { - decorationsToRemove.add(decoration); - iterator.remove(); - } - } - if (list.isEmpty()) { - fDecorations.remove(target); - } - } - } - Iterator iter = decorationsToRemove.iterator(); - while (iter.hasNext()) - { - Decoration decoration = (Decoration)iter.next(); - decoration.remove(); - } + ArrayList<Decoration> decorationsToRemove = new ArrayList<Decoration>(); + synchronized (fDecorations) { + List<Decoration> list = fDecorations.get(target); + if (list != null) { + ListIterator<Decoration> iterator = list.listIterator(); + while (iterator.hasNext()) { + Decoration decoration = iterator.next(); + if (thread == null || thread.equals(decoration.getThread())) { + decorationsToRemove.add(decoration); + iterator.remove(); + } + } + if (list.isEmpty()) { + fDecorations.remove(target); + } + } + } + Iterator<Decoration> iter = decorationsToRemove.iterator(); + while (iter.hasNext()) { + Decoration decoration = iter.next(); + decoration.remove(); + } } - + } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java index 57f8fb646..0caeab28c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java @@ -31,6 +31,7 @@ public class ImageImageDescriptor extends ImageDescriptor { /* (non-Javadoc) * @see ImageDescriptor#getImageData() */ + @Override public ImageData getImageData() { return fImage.getImageData(); } @@ -38,6 +39,7 @@ public class ImageImageDescriptor extends ImageDescriptor { /* (non-Javadoc) * @see Object#equals(Object) */ + @Override public boolean equals(Object obj) { return (obj != null) && getClass().equals(obj.getClass()) && fImage.equals(((ImageImageDescriptor)obj).fImage); } @@ -45,6 +47,7 @@ public class ImageImageDescriptor extends ImageDescriptor { /* (non-Javadoc) * @see Object#hashCode() */ + @Override public int hashCode() { return fImage.hashCode(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java index 3a21e0146..34b7d1f5e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -253,11 +253,11 @@ public class LaunchView extends AbstractDebugView * * @since 3.6 */ - private Map fHandlers = new HashMap(); + private Map<String, IHandler2> fHandlers = new HashMap<String, IHandler2>(); private boolean fDebugToolbarInView = true; - private Set fDebugToolbarPerspectives = new TreeSet(); + private Set<String> fDebugToolbarPerspectives = new TreeSet<String>(); /** * Page-book page for the breadcrumb viewer. This page is activated in @@ -270,21 +270,25 @@ public class LaunchView extends AbstractDebugView LaunchViewBreadcrumb fCrumb; Control fControl; - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { fCrumb = new LaunchViewBreadcrumb(LaunchView.this, (TreeModelViewer)getViewer(), fTreeViewerDebugContextProvider); fControl = fCrumb.createContent(parent); } - public void init(IPageSite pageSite) { + @Override + public void init(IPageSite pageSite) { super.init(pageSite); pageSite.setSelectionProvider(fCrumb.getSelectionProvider()); } - public Control getControl() { + @Override + public Control getControl() { return fControl; } - public void setFocus() { + @Override + public void setFocus() { fCrumb.activate(); } @@ -296,7 +300,8 @@ public class LaunchView extends AbstractDebugView return fCrumb.getHeight(); } - public void dispose() { + @Override + public void dispose() { fCrumb.dispose(); } } @@ -310,6 +315,7 @@ public class LaunchView extends AbstractDebugView private Visitor fVisitor = new Visitor(); class Visitor implements IModelDeltaVisitor { + @Override public boolean visit(IModelDelta delta, int depth) { if ((delta.getFlags() & (IModelDelta.STATE | IModelDelta.CONTENT)) > 0) { // state and/or content change @@ -336,7 +342,7 @@ public class LaunchView extends AbstractDebugView * @return corresponding tree path */ private TreePath getViewerTreePath(IModelDelta node) { - ArrayList list = new ArrayList(); + ArrayList<Object> list = new ArrayList<Object>(); IModelDelta parentDelta = node.getParentDelta(); while (parentDelta != null) { list.add(0, node.getElement()); @@ -360,6 +366,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextProvider#getActiveContext() */ + @Override public synchronized ISelection getActiveContext() { return fContext; } @@ -398,6 +405,7 @@ public class LaunchView extends AbstractDebugView } else { final DebugContextEvent finalEvent = event; Job job = new UIJob("context change") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { // verify selection is still the same context since job was scheduled synchronized (TreeViewerContextProvider.this) { @@ -421,6 +429,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelChangedListener#modelChanged(org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta) */ + @Override public void modelChanged(IModelDelta delta, IModelProxy proxy) { delta.accept(fVisitor); } @@ -464,7 +473,8 @@ public class LaunchView extends AbstractDebugView private PageRec fDefaultPageRec = null; private ISelectionChangedListener fTreeViewerSelectionChangedListener = new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { fTreeViewerDebugContextProvider.activate(event.getSelection()); } }; @@ -493,7 +503,8 @@ public class LaunchView extends AbstractDebugView } } - public ISelection getActiveContext() { + @Override + public ISelection getActiveContext() { ISelection activeContext = fActiveProvider.getActiveContext(); if (activeContext != null) { return activeContext; @@ -501,7 +512,8 @@ public class LaunchView extends AbstractDebugView return TreeSelection.EMPTY; } - public void debugContextChanged(DebugContextEvent event) { + @Override + public void debugContextChanged(DebugContextEvent event) { if (event.getSource().equals(fActiveProvider)) { fire(new DebugContextEvent(this, event.getContext(), event.getFlags())); } @@ -521,6 +533,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.DEBUG_VIEW; } @@ -528,6 +541,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#createActions() */ + @Override protected void createActions() { setAction("Properties", new PropertyDialogAction(getSite(), getSite().getSelectionProvider())); //$NON-NLS-1$ fEditConfigAction = new EditLaunchConfigurationAction(); @@ -572,7 +586,7 @@ public class LaunchView extends AbstractDebugView * @return handler or <code>null</code> */ public IHandler2 getHandler(String id) { - return (IHandler2) fHandlers.get(id); + return fHandlers.get(id); } /** @@ -602,6 +616,7 @@ public class LaunchView extends AbstractDebugView * @since 3.5 * @see #fDefaultPageRec */ + @Override public void createPartControl(final Composite parent) { super.createPartControl(parent); @@ -637,9 +652,11 @@ public class LaunchView extends AbstractDebugView // Add a resize listener for the view to activate breadcrumb as needed. parent.addControlListener(new ControlListener() { - public void controlMoved(ControlEvent e) { + @Override + public void controlMoved(ControlEvent e) { } - public void controlResized(ControlEvent e) { + @Override + public void controlResized(ControlEvent e) { if (parent.isDisposed()) { return; } @@ -677,6 +694,7 @@ public class LaunchView extends AbstractDebugView * @since 3.5 * @see #fDefaultPageRec */ + @Override protected PageRec doCreatePage(IWorkbenchPart part) { if (part instanceof BreadcrumbWorkbenchPart) { fBreadcrumbPage = new BreadcrumbPage(); @@ -694,6 +712,7 @@ public class LaunchView extends AbstractDebugView * @since 3.5 * @see #fDefaultPageRec */ + @Override protected boolean isImportant(IWorkbenchPart part) { return part instanceof BreadcrumbWorkbenchPart; } @@ -705,6 +724,7 @@ public class LaunchView extends AbstractDebugView * @since 3.5 * @see #fDefaultPageRec */ + @Override protected void showPageRec(PageRec pageRec) { if (pageRec.page == getDefaultPage()) { fDefaultPageRec = pageRec; @@ -740,7 +760,8 @@ public class LaunchView extends AbstractDebugView viewMenu.add(modeSubmenu); modeSubmenu.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager manager) { + @Override + public void menuAboutToShow(IMenuManager manager) { modeSubmenu.add(fDebugViewModeActions[0]); modeSubmenu.add(fDebugViewModeActions[1]); modeSubmenu.add(fDebugViewModeActions[2]); @@ -855,6 +876,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#createViewer(org.eclipse.swt.widgets.Composite) */ + @Override protected Viewer createViewer(Composite parent) { fPresentation = new DelegatingModelPresentation(); fPresentationContext = new DebugModelPresentationContext(IDebugUIConstants.ID_DEBUG_VIEW, this, fPresentation); @@ -918,6 +940,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite) */ + @Override public void init(IViewSite site) throws PartInitException { super.init(site); commonInit(site); @@ -928,6 +951,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite, org.eclipse.ui.IMemento) */ + @Override public void init(IViewSite site, IMemento memento) throws PartInitException { super.init(site, memento); commonInit(site); @@ -938,7 +962,8 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.part.PageBookView#partDeactivated(org.eclipse.ui.IWorkbenchPart) */ - public void partDeactivated(IWorkbenchPart part) { + @Override + public void partDeactivated(IWorkbenchPart part) { String id = part.getSite().getId(); if (id.equals(getSite().getId())) { ByteArrayOutputStream bout = new ByteArrayOutputStream(); @@ -963,7 +988,7 @@ public class LaunchView extends AbstractDebugView } StringBuffer buffer= new StringBuffer(); - for (Iterator itr = fDebugToolbarPerspectives.iterator(); itr.hasNext();) { + for (Iterator<String> itr = fDebugToolbarPerspectives.iterator(); itr.hasNext();) { buffer.append(itr.next()).append(','); } getPreferenceStore().setValue(IDebugPreferenceConstants.DEBUG_VIEW_TOOLBAR_HIDDEN_PERSPECTIVES, buffer.toString()); @@ -982,6 +1007,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager) */ + @Override protected void configureToolBar(IToolBarManager tbm) { tbm.add(new Separator(IDebugUIConstants.THREAD_GROUP)); tbm.add(new Separator(IDebugUIConstants.STEP_GROUP)); @@ -1072,6 +1098,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#dispose() */ + @Override public void dispose() { fContextService.removeContextManagerListener(this); getSite().getSelectionProvider().removeSelectionChangedListener(this); @@ -1093,10 +1120,8 @@ public class LaunchView extends AbstractDebugView IWorkbenchWindow window = getSite().getWorkbenchWindow(); window.removePerspectiveListener(this); window.removePageListener(this); - Iterator iterator = fHandlers.values().iterator(); - while (iterator.hasNext()) { - IHandler2 hander = (IHandler2) iterator.next(); - hander.dispose(); + for (IHandler2 handler : fHandlers.values()) { + handler.dispose(); } fHandlers.clear(); super.dispose(); @@ -1127,6 +1152,7 @@ public class LaunchView extends AbstractDebugView * * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { updateObjects(); } @@ -1134,6 +1160,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent) */ + @Override public void doubleClick(DoubleClickEvent event) { ISelection selection= event.getSelection(); if (!(selection instanceof IStructuredSelection)) { @@ -1151,6 +1178,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { setActive(page.findView(getSite().getId()) != null); updateObjects(); @@ -1161,6 +1189,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, java.lang.String) */ + @Override public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) { setActive(page.findView(getSite().getId()) != null); } @@ -1168,12 +1197,14 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener2#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IWorkbenchPartReference, java.lang.String) */ + @Override public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) { } /* (non-Javadoc) * @see org.eclipse.ui.IPageListener#pageActivated(org.eclipse.ui.IWorkbenchPage) */ + @Override public void pageActivated(IWorkbenchPage page) { if (getSite().getPage().equals(page)) { setActive(true); @@ -1184,18 +1215,21 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.IPageListener#pageClosed(org.eclipse.ui.IWorkbenchPage) */ + @Override public void pageClosed(IWorkbenchPage page) { } /* (non-Javadoc) * @see org.eclipse.ui.IPageListener#pageOpened(org.eclipse.ui.IWorkbenchPage) */ + @Override public void pageOpened(IWorkbenchPage page) { } /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugView#getPresentation(java.lang.String) */ + @Override public IDebugModelPresentation getPresentation(String id) { return ((DelegatingModelPresentation)fPresentation).getPresentation(id); } @@ -1203,6 +1237,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override protected void fillContextMenu(IMenuManager menu) { TreeSelection sel = (TreeSelection) fTreeViewerDebugContextProvider.getActiveContext(); Object element = sel != null && sel.size() > 0 ? sel.getFirstElement() : null; @@ -1257,10 +1292,11 @@ public class LaunchView extends AbstractDebugView menu.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS)); } + @Override public void contextManagerChanged(ContextManagerEvent event) { if (event.isActiveContextsChanged()) { - Set oldContexts = event.getPreviouslyActiveContextIds(); - Set newContexts = event.getContextManager().getActiveContextIds(); + Set<?> oldContexts = event.getPreviouslyActiveContextIds(); + Set<?> newContexts = event.getContextManager().getActiveContextIds(); if (oldContexts.contains(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET) != newContexts.contains(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET)) { @@ -1315,6 +1351,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.part.IShowInTarget#show(org.eclipse.ui.part.ShowInContext) */ + @Override public boolean show(ShowInContext context) { ISelection selection = context.getSelection(); if (selection != null) { @@ -1341,6 +1378,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.part.IShowInSource#getShowInContext() */ + @Override public ShowInContext getShowInContext() { if (isActive()) { IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection(); @@ -1361,6 +1399,7 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.part.IShowInTargetList#getShowInTargetIds() */ + @Override public String[] getShowInTargetIds() { if (isActive()) { IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection(); @@ -1381,12 +1420,14 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partClosed(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partVisible(IWorkbenchPartReference partRef) { IWorkbenchPart part = partRef.getPart(false); if (part == this) { @@ -1405,12 +1446,14 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partOpened(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partActivated(IWorkbenchPartReference partRef) { // Ensure that the system property matches the debug toolbar state. // Bug 385400 @@ -1421,30 +1464,35 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partDeactivated(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partHidden(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partInputChanged(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#becomesVisible() */ + @Override protected void becomesVisible() { super.becomesVisible(); getViewer().refresh(); @@ -1453,7 +1501,8 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#updateComplete(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor) */ - public void updateComplete(IViewerUpdate update) { + @Override + public void updateComplete(IViewerUpdate update) { if (!update.isCanceled()) { if (TreePath.EMPTY.equals(update.getElementPath())) { updateFindAction(); @@ -1465,13 +1514,15 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#updateStarted(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor) */ - public void updateStarted(IViewerUpdate update) { + @Override + public void updateStarted(IViewerUpdate update) { } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#viewerUpdatesBegin() */ - public synchronized void viewerUpdatesBegin() { + @Override + public synchronized void viewerUpdatesBegin() { IWorkbenchSiteProgressService progressService = (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class); if (progressService != null) { @@ -1482,7 +1533,8 @@ public class LaunchView extends AbstractDebugView /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#viewerUpdatesComplete() */ - public synchronized void viewerUpdatesComplete() { + @Override + public synchronized void viewerUpdatesComplete() { IWorkbenchSiteProgressService progressService = (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class); if (progressService != null) { @@ -1490,7 +1542,8 @@ public class LaunchView extends AbstractDebugView } } - public void modelChanged(IModelDelta delta, IModelProxy proxy) { + @Override + public void modelChanged(IModelDelta delta, IModelProxy proxy) { updateFindAction(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java index 3636de650..6bb242385 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation = bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.views.launch; @@ -69,13 +70,15 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo fPath = path; } - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { return obj instanceof Input && ((fPath == null && ((Input)obj).fPath == null) || (fPath != null && fPath.equals( ((Input)obj).fPath ))); } - public int hashCode() { + @Override + public int hashCode() { return fPath == null ? 0 : fPath.hashCode(); } } @@ -86,19 +89,22 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo public Input fInput; - public Object[] getChildren(TreePath parentPath) { + @Override + public Object[] getChildren(TreePath parentPath) { if (hasChildren(parentPath)) { return new Object[] { fInput.fPath.getSegment(parentPath.getSegmentCount()) }; } return EMPTY_ELEMENTS_ARRAY; } - public TreePath[] getParents(Object element) { + @Override + public TreePath[] getParents(Object element) { // Not supported return new TreePath[] { TreePath.EMPTY }; } - public boolean hasChildren(TreePath parentPath) { + @Override + public boolean hasChildren(TreePath parentPath) { if ( parentPath.getSegmentCount() == 0) { return fInput != null; } else if (fInput != null && @@ -121,7 +127,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo return false; } - public Object[] getElements(Object inputElement) { + @Override + public Object[] getElements(Object inputElement) { if (fInput != null && fInput.fPath != null) { @@ -131,11 +138,13 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } } - public void dispose() { + @Override + public void dispose() { fInput = null; } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput instanceof Input) { fInput = ((Input)newInput); } else { @@ -145,7 +154,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } private class LabelProvider extends BaseLabelProvider implements ITreePathLabelProvider { - public void updateLabel(ViewerLabel label, TreePath elementPath) { + @Override + public void updateLabel(ViewerLabel label, TreePath elementPath) { if (fgEmptyDebugContextElement.equals(elementPath.getLastSegment())) { label.setText(LaunchViewMessages.Breadcrumb_NoActiveContext); label.setImage(null); @@ -186,7 +196,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo fTreeViewerContextProvider.addDebugContextListener(this); } - public ISelection getActiveContext() { + @Override + public ISelection getActiveContext() { if (fBreadcrumbSelection != null && !fBreadcrumbSelection.isEmpty()) { return fBreadcrumbSelection; } else { @@ -200,11 +211,13 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo fTreeViewerContextProvider.removeDebugContextListener(this); } - public void debugContextChanged(DebugContextEvent event) { + @Override + public void debugContextChanged(DebugContextEvent event) { fire(new DebugContextEvent(this, getActiveContext(), event.getFlags())); } - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { ISelection oldContext = getActiveContext(); fBreadcrumbSelection = event.getSelection(); if (!getActiveContext().equals(oldContext)) { @@ -224,10 +237,12 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo fTreeViewerContextProvider.addDebugContextListener(this); } - protected void activateBreadcrumb() { + @Override + protected void activateBreadcrumb() { } - protected void deactivateBreadcrumb() { + @Override + protected void deactivateBreadcrumb() { if (fViewer.isDropDownOpen()) { Shell shell = fViewer.getDropDownShell(); if (shell != null && !shell.isDisposed()) { @@ -236,9 +251,11 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } } - protected BreadcrumbViewer createViewer(Composite parent) { + @Override + protected BreadcrumbViewer createViewer(Composite parent) { fViewer = new BreadcrumbViewer(parent, SWT.NONE) { - protected Control createDropDown(Composite dropDownParent, IBreadcrumbDropDownSite site, TreePath path) { + @Override + protected Control createDropDown(Composite dropDownParent, IBreadcrumbDropDownSite site, TreePath path) { return createDropDownControl(dropDownParent, site, path); } }; @@ -263,7 +280,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo MenuManager menuMgr = new MenuManager("#PopUp"); //$NON-NLS-1$ menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager mgr) { + @Override + public void menuAboutToShow(IMenuManager mgr) { fView.fillContextMenu(mgr); } }); @@ -276,27 +294,32 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo fView.addContextMenuManager(menuMgr); fViewer.addMenuDetectListener(new MenuDetectListener() { - public void menuDetected(MenuDetectEvent event) { + @Override + public void menuDetected(MenuDetectEvent event) { menu.setLocation(event.x + 10, event.y + 10); menu.setVisible(true); while (!menu.isDisposed() && menu.isVisible()) { - if (!menu.getDisplay().readAndDispatch()) - menu.getDisplay().sleep(); + if (!menu.getDisplay().readAndDispatch()) { + menu.getDisplay().sleep(); + } } } }); } - protected Object getCurrentInput() { + @Override + protected Object getCurrentInput() { return fBreadcrumbInput; } - protected boolean open(ISelection selection) { + @Override + protected boolean open(ISelection selection) { // Let the drop-down control implementation itself handle activating a new context. return false; } - public void dispose() { + @Override + public void dispose() { fBreadcrumbContextProvider = null; fTreeViewerContextProvider.removeDebugContextListener(this); fTreeViewer.removeLabelUpdateListener(this); @@ -305,7 +328,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo super.dispose(); } - public void debugContextChanged(DebugContextEvent event) { + @Override + public void debugContextChanged(DebugContextEvent event) { if (fView.isBreadcrumbVisible()) { fBreadcrumbInput = new Input(getPathForSelection(event.getContext())); if ((event.getFlags() & DebugContextEvent.ACTIVATED) != 0) { @@ -321,10 +345,12 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } } - public void labelUpdateStarted(ILabelUpdate update) { + @Override + public void labelUpdateStarted(ILabelUpdate update) { } - public void labelUpdateComplete(ILabelUpdate update) { + @Override + public void labelUpdateComplete(ILabelUpdate update) { if (fBreadcrumbInput != null && fBreadcrumbInput.fPath != null) { if (fBreadcrumbInput.fPath.startsWith(update.getElementPath(), null)) { synchronized (this) { @@ -334,10 +360,12 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } } - public void labelUpdatesBegin() { + @Override + public void labelUpdatesBegin() { } - public void labelUpdatesComplete() { + @Override + public void labelUpdatesComplete() { boolean refresh = false; synchronized(this) { refresh = fRefreshBreadcrumb; @@ -346,7 +374,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo if (fView.isBreadcrumbVisible() && refresh) { new UIJob(fViewer.getControl().getDisplay(), "refresh breadcrumb") { //$NON-NLS-1$ { setSystem(true); } - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { refresh(); return Status.OK_STATUS; } @@ -379,7 +408,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo SubTreeModelViewer fDropDownViewer; - protected TreeViewer createTreeViewer(Composite composite, int style, final TreePath path) { + @Override + protected TreeViewer createTreeViewer(Composite composite, int style, final TreePath path) { fDropDownViewer = new SubTreeModelViewer( composite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.VIRTUAL | SWT.POP_UP, fTreeViewer.getPresentationContext()); @@ -400,7 +430,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo final ModelDelta prunedDelta = new ModelDelta(launchViewInput, IModelDelta.NO_CHANGE); stateDelta.accept(new IModelDeltaVisitor() { ModelDelta copy = prunedDelta; - public boolean visit(IModelDelta delta, int depth) { + @Override + public boolean visit(IModelDelta delta, int depth) { TreePath deltaPath = getViewerTreePath(delta); if (deltaPath.getSegmentCount() == 0) { // skip copying the root element, only copy it's child count @@ -423,7 +454,7 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } private TreePath getViewerTreePath(IModelDelta node) { - ArrayList list = new ArrayList(); + ArrayList<Object> list = new ArrayList<Object>(); IModelDelta parentDelta = node.getParentDelta(); while (parentDelta != null) { list.add(0, node.getElement()); @@ -439,13 +470,18 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo fDropDownViewer.updateViewer(stateDelta); fDropDownViewer.addLabelUpdateListener(new ILabelUpdateListener() { - public void labelUpdateComplete(ILabelUpdate update) {} - public void labelUpdatesBegin() {} - public void labelUpdateStarted(ILabelUpdate update) {} - public void labelUpdatesComplete() { + @Override + public void labelUpdateComplete(ILabelUpdate update) {} + @Override + public void labelUpdatesBegin() {} + @Override + public void labelUpdateStarted(ILabelUpdate update) {} + @Override + public void labelUpdatesComplete() { new UIJob(fViewer.getControl().getDisplay(), "resize breadcrub dropdown") { //$NON-NLS-1$ { setSystem(true); } - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { site.updateSize(); return Status.OK_STATUS; } @@ -456,7 +492,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo return fDropDownViewer; } - protected void openElement(ISelection selection) { + @Override + protected void openElement(ISelection selection) { if (fTreeViewer.getControl().isDisposed()) { return; } @@ -488,7 +525,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo // Add the IModelDelta.FORCE flag to override the current selection in view. rootDelta.accept(new IModelDeltaVisitor(){ - public boolean visit(IModelDelta paramDelta, int depth) { + @Override + public boolean visit(IModelDelta paramDelta, int depth) { if ((paramDelta.getFlags() & IModelDelta.SELECT) != 0) { ((ModelDelta)paramDelta).setFlags(paramDelta.getFlags() | IModelDelta.FORCE); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewCopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewCopyToClipboardActionDelegate.java index dbed5e238..cffa5ecb0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewCopyToClipboardActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewCopyToClipboardActionDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation = bug fixing *******************************************************************************/ package org.eclipse.debug.internal.ui.views.launch; @@ -36,7 +37,8 @@ import org.eclipse.swt.widgets.Widget; */ public class LaunchViewCopyToClipboardActionDelegate extends VirtualCopyToClipboardActionDelegate { - protected TreeItem[] getSelectedItems(TreeModelViewer clientViewer) { + @Override + protected TreeItem[] getSelectedItems(TreeModelViewer clientViewer) { LaunchView view = (LaunchView)getView(); if (view.isBreadcrumbVisible()) { ISelection selection = getSelection(); @@ -51,9 +53,9 @@ public class LaunchViewCopyToClipboardActionDelegate extends VirtualCopyToClipbo } else { // Return tree selection plus children. TreeItem[] selection = clientViewer.getTree().getSelection(); - Set set = new HashSet(); + Set<Widget> set = new HashSet<Widget>(); collectChildItems(set, selection); - return (TreeItem[])set.toArray(new TreeItem[set.size()]); + return set.toArray(new TreeItem[set.size()]); } } @@ -66,7 +68,7 @@ public class LaunchViewCopyToClipboardActionDelegate extends VirtualCopyToClipbo */ private TreeItem[] getSelectedItemsInTreeViewer(TreeModelViewer viewer, TreePath path) { Widget item = viewer.findItem(path); - Set set = new HashSet(); + Set<Widget> set = new HashSet<Widget>(); if (item instanceof TreeItem) { set.add(item); if (((TreeItem) item).getExpanded()) { @@ -75,10 +77,10 @@ public class LaunchViewCopyToClipboardActionDelegate extends VirtualCopyToClipbo } else if (item instanceof Tree) { collectChildItems(set, ((Tree)item).getItems()); } - return (TreeItem[])set.toArray(new TreeItem[set.size()]); + return set.toArray(new TreeItem[set.size()]); } - private void collectChildItems(Set set, TreeItem[] items) { + private void collectChildItems(Set<Widget> set, TreeItem[] items) { if (items == null) { return; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditor.java index 78f007d56..06b9c4dea 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditor.java @@ -36,18 +36,21 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor /** * @see org.eclipse.ui.IEditorPart#doSave(IProgressMonitor) */ + @Override public void doSave(IProgressMonitor monitor) { } /** * @see org.eclipse.ui.IEditorPart#doSaveAs() */ + @Override public void doSaveAs() { } /** * @see org.eclipse.ui.IEditorPart#init(IEditorSite, IEditorInput) */ + @Override public void init(IEditorSite site, IEditorInput input) { setSite(site); setInput(input); @@ -56,6 +59,7 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor /** * @see org.eclipse.ui.IEditorPart#isDirty() */ + @Override public boolean isDirty() { return false; } @@ -63,6 +67,7 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor /** * @see org.eclipse.ui.IEditorPart#isSaveAsAllowed() */ + @Override public boolean isSaveAsAllowed() { return false; } @@ -70,6 +75,7 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor /** * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite) */ + @Override public void createPartControl(Composite parent) { fText = new Text(parent,SWT.MULTI|SWT.READ_ONLY|SWT.WRAP); fText.setForeground(JFaceColors.getErrorText(fText.getDisplay())); @@ -82,6 +88,7 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor /** * @see org.eclipse.ui.IWorkbenchPart#setFocus() */ + @Override public void setFocus() { if (fText != null) { fText.setFocus(); @@ -91,6 +98,7 @@ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor /** * @see IReusableEditor#setInput(org.eclipse.ui.IEditorInput) */ + @Override public void setInput(IEditorInput input) { super.setInput(input); setPartName(input.getName()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java index daa0f90ef..6d94c489a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,8 +11,6 @@ package org.eclipse.debug.internal.ui.views.launch; -import com.ibm.icu.text.MessageFormat; - import org.eclipse.core.runtime.PlatformObject; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IStackFrame; @@ -23,6 +21,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; +import com.ibm.icu.text.MessageFormat; + /** * Editor input for a stack frame for which source could not be located. * @@ -56,6 +56,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor /** * @see org.eclipse.ui.IEditorInput#exists() */ + @Override public boolean exists() { return false; } @@ -63,6 +64,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor /** * @see org.eclipse.ui.IEditorInput#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getDefaultImageDescriptor(fFrame); } @@ -70,6 +72,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor /** * @see org.eclipse.ui.IEditorInput#getName() */ + @Override public String getName() { try { return fFrame.getName(); @@ -81,6 +84,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor /** * @see org.eclipse.ui.IEditorInput#getPersistable() */ + @Override public IPersistableElement getPersistable() { return null; } @@ -88,8 +92,9 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor /** * @see org.eclipse.ui.IEditorInput#getToolTipText() */ + @Override public String getToolTipText() { - return MessageFormat.format(DebugUIViewsMessages.SourceNotFoundEditorInput_Source_not_found_for__0__2,new String[] {fFrameText}); + return MessageFormat.format(DebugUIViewsMessages.SourceNotFoundEditorInput_Source_not_found_for__0__2, new Object[] { fFrameText }); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java index ea33cf20d..639f708ef 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java @@ -32,6 +32,7 @@ public class StandardDecoration extends Decoration { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.launch.Decoration#remove() */ + @Override public void remove() { fPresentation.removeAnnotations(fEditor, fThread); } @@ -39,6 +40,7 @@ public class StandardDecoration extends Decoration { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.launch.Decoration#getThread() */ + @Override public IThread getThread() { return fThread; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java index ab2747bb7..09164c325 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2011 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,6 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.views.memory; - import java.util.Enumeration; import java.util.Hashtable; @@ -44,43 +43,43 @@ import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchPart; -public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, ISelectionListener, SelectionListener, IMemoryView, ISelectionChangedListener, IMemoryViewPane, IDebugContextListener, IDebugEventSetListener{ - +public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, ISelectionListener, SelectionListener, IMemoryView, ISelectionChangedListener, IMemoryViewPane, IDebugContextListener, IDebugEventSetListener { + public static final String BEGINNING_POPUP = "popUpBegin"; //$NON-NLS-1$ protected static final StructuredSelection EMPTY = new StructuredSelection(); - + protected Composite fViewPaneCanvas; protected StackLayout fStackLayout; protected ViewTabEnablementManager fViewTabEnablementManager; protected CTabFolder fEmptyTabFolder; - protected Hashtable fTabFolderForDebugView = new Hashtable(); + protected Hashtable<Integer, CTabFolder> fTabFolderForDebugView = new Hashtable<Integer, CTabFolder>(); protected boolean fVisible; - protected Hashtable fRenderingInfoTable; - protected IMemoryBlockRetrieval fKey; // store the key for current tab folder + protected IMemoryBlockRetrieval fKey; // store the key for current tab + // folder protected ViewPaneSelectionProvider fSelectionProvider; protected IViewPart fParent; protected String fPaneId; private Composite fCanvas; protected String fLabel; - + private volatile boolean fIsDisposed = false; - public AbstractMemoryViewPane(IViewPart parent) - { + public AbstractMemoryViewPane(IViewPart parent) { super(); fParent = parent; fSelectionProvider = new ViewPaneSelectionProvider(); } - + /** * Create the content of the view pane + * * @param parent the parent composite * @param paneId the id of the pane to create * @param label the label for the new pane * @return the control of the view pane */ - public Control createViewPane(Composite parent, String paneId, String label) - { + @Override + public Control createViewPane(Composite parent, String paneId, String label) { fPaneId = paneId; fLabel = label; fCanvas = new Composite(parent, SWT.NONE); @@ -99,7 +98,7 @@ public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, IS // memory view area Composite memoryViewAreaParent = fCanvas; - Composite subCanvas = new Composite(memoryViewAreaParent, SWT.NONE); + Composite subCanvas = new Composite(memoryViewAreaParent, SWT.NONE); fViewPaneCanvas = subCanvas; fStackLayout = new StackLayout(); GridData memoryAreaData = new GridData(); @@ -109,196 +108,180 @@ public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, IS memoryAreaData.horizontalAlignment = SWT.FILL; fViewPaneCanvas.setLayout(fStackLayout); fViewPaneCanvas.setLayoutData(memoryAreaData); - + fViewTabEnablementManager = new ViewTabEnablementManager(); - + fEmptyTabFolder = new CTabFolder(fViewPaneCanvas, SWT.NULL); setTabFolder(fEmptyTabFolder); - + addListeners(); - + Object context = DebugUITools.getPartDebugContext(fParent.getSite()); - if (context != null) - { + if (context != null) { IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(context); - if (retrieval != null) + if (retrieval != null) { createFolder(retrieval); + } } - + fVisible = true; - + return fCanvas; } - - protected void addListeners() - { + + protected void addListeners() { MemoryViewUtil.getMemoryBlockManager().addListener(this); fParent.getViewSite().getPage().addSelectionListener(this); DebugUITools.addPartDebugContextListener(fParent.getSite(), this); DebugPlugin.getDefault().addDebugEventListener(this); } - - protected void removeListeners() - { + + protected void removeListeners() { MemoryViewUtil.getMemoryBlockManager().removeListener(this); fParent.getViewSite().getPage().removeSelectionListener(this); - DebugUITools.removePartDebugContextListener(fParent.getSite(), this); - if (fStackLayout.topControl != null) - { - CTabFolder old = (CTabFolder)fStackLayout.topControl; - - if (!old.isDisposed()) - { + DebugUITools.removePartDebugContextListener(fParent.getSite(), this); + if (fStackLayout.topControl != null) { + CTabFolder old = (CTabFolder) fStackLayout.topControl; + + if (!old.isDisposed()) { old.removeSelectionListener(this); old.removeSelectionListener(fViewTabEnablementManager); } } DebugPlugin.getDefault().removeDebugEventListener(this); } - - protected void setTabFolder(CTabFolder folder) - { - if (fStackLayout.topControl != null) - { - CTabFolder old = (CTabFolder)fStackLayout.topControl; - - if (!old.isDisposed()) - { + + protected void setTabFolder(CTabFolder folder) { + if (fStackLayout.topControl != null) { + CTabFolder old = (CTabFolder) fStackLayout.topControl; + + if (!old.isDisposed()) { old.removeSelectionListener(this); old.removeSelectionListener(fViewTabEnablementManager); } } - + fStackLayout.topControl = folder; - - if (folder.getItemCount() > 0) - { + + if (folder.getItemCount() > 0) { CTabItem selectedItem = folder.getSelection(); - - if (selectedItem != null) - { + + if (selectedItem != null) { Object selected = getCurrentSelection(); - if (selected != null) - { + if (selected != null) { fSelectionProvider.setSelection(new StructuredSelection(selected)); - } - else - { + } else { fSelectionProvider.setSelection(AbstractMemoryViewPane.EMPTY); } } - } - else - { + } else { fSelectionProvider.setSelection(AbstractMemoryViewPane.EMPTY); } - + folder.addSelectionListener(this); folder.addSelectionListener(fViewTabEnablementManager); - } - - - private void createFolder(IMemoryBlockRetrieval memRetrieval) - { - //if we've got a tabfolder to go with the IMemoryBlockRetrieval, display it + } + + private void createFolder(IMemoryBlockRetrieval memRetrieval) { + // if we've got a tabfolder to go with the IMemoryBlockRetrieval, + // display it Integer key = MemoryViewUtil.getHashCode(memRetrieval); if (fTabFolderForDebugView.containsKey(key)) { - if (fStackLayout.topControl != (CTabFolder)fTabFolderForDebugView.get(key)) { - setTabFolder((CTabFolder)fTabFolderForDebugView.get(key)); + if (fStackLayout.topControl != fTabFolderForDebugView.get(key)) { + setTabFolder(fTabFolderForDebugView.get(key)); fViewPaneCanvas.layout(); } - } else { //otherwise, add a new one + } else { // otherwise, add a new one fTabFolderForDebugView.put(key, new CTabFolder(fViewPaneCanvas, SWT.NULL)); - setTabFolder((CTabFolder)fTabFolderForDebugView.get(key)); + setTabFolder(fTabFolderForDebugView.get(key)); fViewPaneCanvas.layout(); } } + @Override public IMemoryViewTab getTopMemoryTab() { - - if (fStackLayout.topControl instanceof CTabFolder) - { - CTabFolder folder = (CTabFolder)fStackLayout.topControl; - if (!folder.isDisposed()) - { + + if (fStackLayout.topControl instanceof CTabFolder) { + CTabFolder folder = (CTabFolder) fStackLayout.topControl; + if (!folder.isDisposed()) { int index = folder.getSelectionIndex(); if (index >= 0) { CTabItem tab = folder.getItem(index); - return (IMemoryViewTab)tab.getData(); + return (IMemoryViewTab) tab.getData(); } } } return null; } - - protected void disposeTab(CTabItem tabItem) - { - if (tabItem == null) + + protected void disposeTab(CTabItem tabItem) { + if (tabItem == null) { return; - - // dispose the tab item in case the view tab has not + } + + // dispose the tab item in case the view tab has not // cleaned up the tab item - if (!tabItem.isDisposed()) - { + if (!tabItem.isDisposed()) { tabItem.dispose(); - } + } } - protected void emptyFolder() - { + protected void emptyFolder() { setTabFolder(fEmptyTabFolder); if (!fViewPaneCanvas.isDisposed()) { fViewPaneCanvas.layout(); } } - - public void addSelectionListener(ISelectionChangedListener listener) - { - if (fSelectionProvider == null) + + @Override + public void addSelectionListener(ISelectionChangedListener listener) { + if (fSelectionProvider == null) { fSelectionProvider = new ViewPaneSelectionProvider(); - + } + fSelectionProvider.addSelectionChangedListener(listener); } - - public void removeSelctionListener(ISelectionChangedListener listener) - { - if (fSelectionProvider == null) + + @Override + public void removeSelctionListener(ISelectionChangedListener listener) { + if (fSelectionProvider == null) { return; - + } + fSelectionProvider.removeSelectionChangedListener(listener); } - - public ISelectionProvider getSelectionProvider() - { + + @Override + public ISelectionProvider getSelectionProvider() { return fSelectionProvider; } - public void handleDebugEvents(DebugEvent[] events) - { - for (int i = 0; i < events.length; i++) - { + @Override + public void handleDebugEvents(DebugEvent[] events) { + for (int i = 0; i < events.length; i++) { Object source = events[i].getSource(); - if (events[i].getKind() == DebugEvent.TERMINATE && source instanceof IMemoryBlockRetrieval) - { - if (isDisposed()) + if (events[i].getKind() == DebugEvent.TERMINATE && source instanceof IMemoryBlockRetrieval) { + if (isDisposed()) { return; + } - //When a memory block retrieval terminates, it and its - //tab folders should be removed from our map. - final IMemoryBlockRetrieval ret = (IMemoryBlockRetrieval)source; - if (ret != null) - { + // When a memory block retrieval terminates, it and its + // tab folders should be removed from our map. + final IMemoryBlockRetrieval ret = (IMemoryBlockRetrieval) source; + if (ret != null) { Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { - if (isDisposed()) + if (isDisposed()) { return; + } Integer key = MemoryViewUtil.getHashCode(ret); Object folder = fTabFolderForDebugView.get(key); - if (folder != null && folder != fEmptyTabFolder) - { - //remove the tab folder , and all contained tab items + if (folder != null && folder != fEmptyTabFolder) { + // remove the tab folder , and all contained tab + // items disposeOfFolder((CTabFolder) folder); fTabFolderForDebugView.remove(key); } @@ -309,53 +292,48 @@ public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, IS } } - - - public void dispose() - { - if (isDisposed()) + @Override + public void dispose() { + if (isDisposed()) { return; + } fIsDisposed = true; removeListeners(); - + // dispose empty folders fEmptyTabFolder.dispose(); - + // dispose all other folders try { - Enumeration enumeration = fTabFolderForDebugView.elements(); + Enumeration<CTabFolder> enumeration = fTabFolderForDebugView.elements(); - while (enumeration.hasMoreElements()) - { - CTabFolder tabFolder = (CTabFolder)enumeration.nextElement(); + while (enumeration.hasMoreElements()) { + CTabFolder tabFolder = enumeration.nextElement(); disposeOfFolder(tabFolder); } // Clear the table as all CTabFolder's have been dipose()d fTabFolderForDebugView.clear(); - } catch (Exception e) { - + } catch (Exception e) { + DebugUIPlugin.logErrorMessage("Exception occurred when the Memory View is disposed."); //$NON-NLS-1$ - } + } } /** - * Helper method to dispose of a tab folder, - * and of any tab items it contains. - * Must be called from the UI thread. + * Helper method to dispose of a tab folder, and of any tab items it + * contains. Must be called from the UI thread. + * * @param tabFolder the {@link CTabFolder} to dispose * */ - private void disposeOfFolder(CTabFolder tabFolder) - { - if (!tabFolder.isDisposed()) - { + private void disposeOfFolder(CTabFolder tabFolder) { + if (!tabFolder.isDisposed()) { // if tab folder is not empty, dipose view tabs CTabItem[] tabs = tabFolder.getItems(); - for (int i=0; i<tabs.length; i++) - { + for (int i = 0; i < tabs.length; i++) { disposeTab(tabs[i]); } @@ -363,82 +341,95 @@ public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, IS } } - public void setVisible(boolean visible) - { + @Override + public void setVisible(boolean visible) { fVisible = visible; - + IMemoryViewTab currentTab = getTopMemoryTab(); - if (currentTab != null) + if (currentTab != null) { currentTab.setEnabled(visible); + } } + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection = event.getSelection(); - selectionChanged(fParent,selection); - + selectionChanged(fParent, selection); + fSelectionProvider.setSelection(selection); } - + /** * @return the unique identifier of the view pane */ - public String getPaneId() - { + public String getPaneId() { return fPaneId; } - - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#getControl() + + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#getControl() */ + @Override public Control getControl() { return fCanvas; } - - public boolean isVisible() - { + + @Override + public boolean isVisible() { return fVisible; } - - public String getLabel() - { + + public String getLabel() { return fLabel; } - - protected boolean isDisposed() - { + + protected boolean isDisposed() { return fIsDisposed; } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener#MemoryBlockAdded(org.eclipse.debug.core.model.IMemoryBlock) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.core.memory.IMemoryBlockListener#MemoryBlockAdded + * (org.eclipse.debug.core.model.IMemoryBlock) */ - abstract public void memoryBlocksAdded(IMemoryBlock[] memoryBlocks); - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener#MemoryBlockRemoved(org.eclipse.debug.core.model.IMemoryBlock) + @Override + abstract public void memoryBlocksAdded(IMemoryBlock[] memoryBlocks); + + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener# + * MemoryBlockRemoved(org.eclipse.debug.core.model.IMemoryBlock) */ + @Override abstract public void memoryBlocksRemoved(final IMemoryBlock[] memoryBlocks); - /* (non-Javadoc) - * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui. + * IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override abstract public void selectionChanged(IWorkbenchPart part, ISelection selection); - + /** * @return current selection from the view pane */ abstract public Object getCurrentSelection(); - + /** - * retore the view pane based on current selection from the debug view - * and the memory blocks and renderings currently exist + * retore the view pane based on current selection from the debug view and + * the memory blocks and renderings currently exist */ + @Override abstract public void restoreViewPane(); - + /** * @return actions to be contributed to the view pane's toolbar */ + @Override abstract public IAction[] getActions(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java index 08dc02bd7..8d1ecc175 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2012 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -50,35 +50,32 @@ import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; - /** * Action for adding memory block. * * @since 3.0 */ -public class AddMemoryBlockAction extends Action implements IDebugContextListener, IDebugEventSetListener{ - +public class AddMemoryBlockAction extends Action implements IDebugContextListener, IDebugEventSetListener { + protected IAdaptable fCurrentContext = null; protected IMemoryBlock fLastMemoryBlock; private boolean fAddDefaultRenderings = true; protected IMemoryRenderingSite fSite; - - public AddMemoryBlockAction(IMemoryRenderingSite site) - { + + public AddMemoryBlockAction(IMemoryRenderingSite site) { initialize(site); } - + /** * @param site the site to add the action to - * @param addDefaultRenderings - specify if the action should add - * default renderings for the new memory block when it is run + * @param addDefaultRenderings - specify if the action should add default + * renderings for the new memory block when it is run */ - AddMemoryBlockAction(IMemoryRenderingSite site, boolean addDefaultRenderings) - { + AddMemoryBlockAction(IMemoryRenderingSite site, boolean addDefaultRenderings) { initialize(site); fAddDefaultRenderings = addDefaultRenderings; } - + /** * @param site the site to initialize */ @@ -87,13 +84,11 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene doInitialization(site); } - - public AddMemoryBlockAction(String text, int style, IMemoryRenderingSite site) - { + public AddMemoryBlockAction(String text, int style, IMemoryRenderingSite site) { super(text, style); - doInitialization(site); + doInitialization(site); } - + /** * @param site the site to initialize */ @@ -104,79 +99,78 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_ADD)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_MONITOR_EXPRESSION)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".addMemoryMonitorAction_context"); //$NON-NLS-1$ - - // listen for context changed - DebugUITools.addPartDebugContextListener(fSite.getSite(), this); - + + // listen for context changed + DebugUITools.addPartDebugContextListener(fSite.getSite(), this); + // get current context fCurrentContext = DebugUITools.getPartDebugContext(site.getSite()); - + // set up enablement based on current selection updateAction(fCurrentContext); - + DebugPlugin.getDefault().addDebugEventListener(this); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { boolean exit = false; String prefillExp = null; String prefillLength = null; - while (!exit) - { + while (!exit) { exit = true; - + Object elem = fCurrentContext; - + IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(elem); - - if (retrieval == null) + + if (retrieval == null) { return; - - Shell shell= DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); + } + + Shell shell = DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); // create dialog to ask for expression/address to block MonitorMemoryBlockDialog dialog = new MonitorMemoryBlockDialog(shell, retrieval, prefillExp, prefillLength); dialog.open(); int returnCode = dialog.getReturnCode(); - if (returnCode == Window.CANCEL) - { + if (returnCode == Window.CANCEL) { return; } // get expression entered in dialog String input = dialog.getExpression(); - + // remember expression and length prefillExp = input; prefillLength = dialog.getLength(); - - ArrayList expressions = new ArrayList(); - - if (input.length() == 0) - { + + ArrayList<String> expressions = new ArrayList<String>(); + + if (input.length() == 0) { expressions.add(IInternalDebugCoreConstants.EMPTY_STRING); - } - else - { + } else { StringTokenizer tokenizer = new StringTokenizer(input, ","); //$NON-NLS-1$ - while (tokenizer.hasMoreTokens()) - { + while (tokenizer.hasMoreTokens()) { expressions.add(tokenizer.nextToken()); } - } - final String[] expressionsArray = (String[])expressions.toArray(new String[expressions.size()]); + } + final String[] expressionsArray = expressions.toArray(new String[expressions.size()]); exit = true; - + final boolean finalExit = exit; final Object finalElement = elem; final IMemoryBlockRetrieval finalRetrieval = retrieval; final MonitorMemoryBlockDialog finalDialog = dialog; Job job = new Job("Add Memory Block") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { addMemoryBlocks(finalExit, finalElement, finalRetrieval, finalDialog, expressionsArray); return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } @@ -191,46 +185,41 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene * @return if we should exit */ private boolean addMemoryBlocks(boolean exit, Object elem, IMemoryBlockRetrieval standardMemRetrieval, MonitorMemoryBlockDialog dialog, final String[] expressionsArray) { - for (int i=0; i<expressionsArray.length; i++) - { + for (int i = 0; i < expressionsArray.length; i++) { String expression = expressionsArray[i].trim(); try { - if (standardMemRetrieval instanceof IMemoryBlockRetrievalExtension) - { - // if the debug session supports IMemoryBlockExtensionRetrieval - IMemoryBlockRetrievalExtension memRetrieval = (IMemoryBlockRetrievalExtension)standardMemRetrieval; - + if (standardMemRetrieval instanceof IMemoryBlockRetrievalExtension) { + // if the debug session supports + // IMemoryBlockExtensionRetrieval + IMemoryBlockRetrievalExtension memRetrieval = (IMemoryBlockRetrievalExtension) standardMemRetrieval; + // get extended memory block with the expression entered IMemoryBlockExtension memBlock = memRetrieval.getExtendedMemoryBlock(expression, elem); - + // add block to memory block manager - if (memBlock != null) - { + if (memBlock != null) { fLastMemoryBlock = memBlock; - - IMemoryBlock[] memArray = new IMemoryBlock[]{memBlock}; - + + IMemoryBlock[] memArray = new IMemoryBlock[] { memBlock }; + MemoryViewUtil.getMemoryBlockManager().addMemoryBlocks(memArray); - if (fAddDefaultRenderings) + if (fAddDefaultRenderings) { addDefaultRenderings(memBlock); - } - else - { + } + } else { // open error if it failed to retrieve a memory block MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, DebugUIMessages.AddMemoryBlockAction_noMemoryBlock, null); exit = false; } - } - else - { - // if the debug session does not support IMemoryBlockExtensionRetrieval + } else { + // if the debug session does not support + // IMemoryBlockExtensionRetrieval expression = expression.toUpperCase(); String hexPrefix = "0X"; //$NON-NLS-1$ - if (expression.startsWith(hexPrefix)) - { + if (expression.startsWith(hexPrefix)) { expression = expression.substring(hexPrefix.length()); } - + // convert the expression to an address BigInteger address = new BigInteger(expression, 16); @@ -238,41 +227,37 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene // get the length of memory to block String strLength = dialog.getLength(); - + long length = Long.parseLong(strLength); - + // must monitor at least one line - if (length <= 0) - { + if (length <= 0) { String message = DebugUIMessages.AddMemoryBlockAction_failed + "\n" + DebugUIMessages.AddMemoryBlockAction_input_invalid; //$NON-NLS-1$ - MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, message, null); + MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, message, null); exit = false; continue; } - + // get standard memory block IMemoryBlock memBlock = standardMemRetrieval.getMemoryBlock(longAddress, length); - - // make sure the memory block returned is not an instance of IMemoryBlockExtension - if (memBlock instanceof IMemoryBlockExtension) - { - Status status = new Status(IStatus.WARNING, DebugUIPlugin.getUniqueIdentifier(), 0, - "IMemoryBlockRetrieval returns IMemoryBlockExtension. This may result in unexpected behavior.", null); //$NON-NLS-1$ + + // make sure the memory block returned is not an instance of + // IMemoryBlockExtension + if (memBlock instanceof IMemoryBlockExtension) { + Status status = new Status(IStatus.WARNING, DebugUIPlugin.getUniqueIdentifier(), 0, "IMemoryBlockRetrieval returns IMemoryBlockExtension. This may result in unexpected behavior.", null); //$NON-NLS-1$ DebugUIPlugin.log(status); } - - if (memBlock != null) - { + + if (memBlock != null) { // add memory block to memory block manager - fLastMemoryBlock = memBlock; - IMemoryBlock[] memArray = new IMemoryBlock[]{memBlock}; - + fLastMemoryBlock = memBlock; + IMemoryBlock[] memArray = new IMemoryBlock[] { memBlock }; + MemoryViewUtil.getMemoryBlockManager().addMemoryBlocks(memArray); - if (fAddDefaultRenderings) + if (fAddDefaultRenderings) { addDefaultRenderings(memBlock); - } - else - { + } + } else { // otherwise open up an error doalog MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, DebugUIMessages.AddMemoryBlockAction_noMemoryBlock, null); exit = false; @@ -281,107 +266,102 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene } catch (DebugException e1) { MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, DebugUIMessages.AddMemoryBlockAction_failed, e1); exit = false; - } - catch(NumberFormatException e2) - { + } catch (NumberFormatException e2) { String message = DebugUIMessages.AddMemoryBlockAction_failed + "\n" + DebugUIMessages.AddMemoryBlockAction_input_invalid; //$NON-NLS-1$ - MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, message, null); + MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, message, null); exit = false; } } return exit; } - - /* (non-Javadoc) - * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse + * .debug.core.DebugEvent[]) */ + @Override public void handleDebugEvents(DebugEvent[] events) { - for (int i=0; i < events.length; i++) - handleDebugEvent(events[i]); - } - - private void handleDebugEvent(DebugEvent event) - { + for (int i = 0; i < events.length; i++) { + handleDebugEvent(events[i]); + } + } + + private void handleDebugEvent(DebugEvent event) { // update action enablement based on debug event Object src = event.getSource(); IDebugTarget srcDT = null; IDebugTarget selectionDT = null; - - if (event.getKind() == DebugEvent.TERMINATE) - { - if (src instanceof ITerminate && src instanceof IDebugElement) - { - srcDT = ((IDebugElement)src).getDebugTarget(); + + if (event.getKind() == DebugEvent.TERMINATE) { + if (src instanceof ITerminate && src instanceof IDebugElement) { + srcDT = ((IDebugElement) src).getDebugTarget(); } - - if (fCurrentContext instanceof IDebugElement) - { - selectionDT = ((IDebugElement)fCurrentContext).getDebugTarget(); + + if (fCurrentContext instanceof IDebugElement) { + selectionDT = ((IDebugElement) fCurrentContext).getDebugTarget(); } // disable action if the debug target is terminated. - if (srcDT == selectionDT) - { + if (srcDT == selectionDT) { setEnabled(false); } } // handle change event from memory block retrieval object // to allow non-standard debug models to update the action - else if (event.getKind() == DebugEvent.CHANGE && event.getDetail() == DebugEvent.STATE) - { + else if (event.getKind() == DebugEvent.CHANGE && event.getDetail() == DebugEvent.STATE) { Object evtSrc = event.getSource(); - if (evtSrc == MemoryViewUtil.getMemoryBlockRetrieval(fCurrentContext)) + if (evtSrc == MemoryViewUtil.getMemoryBlockRetrieval(fCurrentContext)) { updateAction(fCurrentContext); + } } } - + /** - * Return the last memory block added to memory block manager via this action. + * Return the last memory block added to memory block manager via this + * action. + * * @return Returns the fLastMemoryBlock. */ public IMemoryBlock getLastMemoryBlock() { return fLastMemoryBlock; } - + protected void dispose() { - + // remove listeners DebugPlugin.getDefault().removeDebugEventListener(this); DebugUITools.removePartDebugContextListener(fSite.getSite(), this); } - - private void addDefaultRenderings(IMemoryBlock memoryBlock) - { + + private void addDefaultRenderings(IMemoryBlock memoryBlock) { IMemoryRenderingType primaryType = DebugUITools.getMemoryRenderingManager().getPrimaryRenderingType(memoryBlock); IMemoryRenderingType renderingTypes[] = DebugUITools.getMemoryRenderingManager().getDefaultRenderingTypes(memoryBlock); - + // create primary rendering try { - if (primaryType != null) - { + if (primaryType != null) { createRenderingInContainer(memoryBlock, primaryType, IDebugUIConstants.ID_RENDERING_VIEW_PANE_1); - } - else if (renderingTypes.length > 0) - { + } else if (renderingTypes.length > 0) { primaryType = renderingTypes[0]; createRenderingInContainer(memoryBlock, renderingTypes[0], IDebugUIConstants.ID_RENDERING_VIEW_PANE_1); } } catch (CoreException e1) { - DebugUIPlugin.log(e1); + DebugUIPlugin.log(e1); } - - for (int i = 0; i<renderingTypes.length; i++) - { + + for (int i = 0; i < renderingTypes.length; i++) { try { boolean create = true; - if (primaryType != null) - { - if (primaryType.getId().equals(renderingTypes[i].getId())) + if (primaryType != null) { + if (primaryType.getId().equals(renderingTypes[i].getId())) { create = false; + } } - if (create) + if (create) { createRenderingInContainer(memoryBlock, renderingTypes[i], IDebugUIConstants.ID_RENDERING_VIEW_PANE_2); + } } catch (CoreException e) { DebugUIPlugin.log(e); } @@ -400,33 +380,39 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene rendering.init(container, memoryBlock); container.addMemoryRendering(rendering); } - - protected MemoryView getMemoryView() - { - if (fSite instanceof MemoryView) - return (MemoryView)fSite; + + protected MemoryView getMemoryView() { + if (fSite instanceof MemoryView) { + return (MemoryView) fSite; + } return null; } - - protected void updateAction(final Object debugContext) - { + + protected void updateAction(final Object debugContext) { Job job = new Job("Update Add Memory Block Action") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { setEnabled(MemoryViewUtil.isValidContext(debugContext)); return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener#contextEvent(org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener + * #contextEvent + * (org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { IAdaptable context = DebugUITools.getPartDebugContext(fSite.getSite()); updateAction(context); - fCurrentContext = context; + fCurrentContext = context; } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java index ab9fe9825..c6fcd7ab6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java @@ -22,23 +22,23 @@ import org.eclipse.ui.PlatformUI; * Toolbar "Add Memory Rendering Action" from Memory Rendering Pane */ public class AddMemoryRenderingAction extends AddMemoryBlockAction { - + private IMemoryRenderingContainer fContainer; - - public AddMemoryRenderingAction(IMemoryRenderingContainer container) - { - super(DebugUIMessages.AddMemoryRenderingAction_Add_renderings, AS_PUSH_BUTTON, container.getMemoryRenderingSite()); - setToolTipText(DebugUIMessages.AddMemoryRenderingAction_Add_renderings); + + public AddMemoryRenderingAction(IMemoryRenderingContainer container) { + super(DebugUIMessages.AddMemoryRenderingAction_Add_renderings, AS_PUSH_BUTTON, container.getMemoryRenderingSite()); + setToolTipText(DebugUIMessages.AddMemoryRenderingAction_Add_renderings); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, DebugUIPlugin.getUniqueIdentifier() + ".AddRenderingContextAction_context"); //$NON-NLS-1$ fContainer = container; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { if (fContainer instanceof RenderingViewPane) ((RenderingViewPane) fContainer).showCreateRenderingTab(); } } - diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java index b339883c1..b1da6ccef 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java @@ -17,36 +17,36 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; - public class AddMemoryRenderingContextAction implements IViewActionDelegate { private IMemoryRenderingSite fMemoryView; - - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { - - if (view instanceof IMemoryRenderingSite) - { - fMemoryView = (IMemoryRenderingSite)view; - } + + if (view instanceof IMemoryRenderingSite) { + fMemoryView = (IMemoryRenderingSite) view; + } } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { - + if (fMemoryView == null) return; - + IMemoryRenderingContainer container = getRenderingContainer(action); - if (container != null) - { + if (container != null) { AddMemoryRenderingAction addAction = new AddMemoryRenderingAction(container); - addAction.run(); + addAction.run(); addAction.dispose(); } } @@ -59,27 +59,28 @@ public class AddMemoryRenderingContextAction implements IViewActionDelegate { IMemoryRenderingContainer[] viewPanes = fMemoryView.getMemoryRenderingContainers(); String actionId = action.getId(); IMemoryRenderingContainer selectedPane = null; - - for (int i=0; i<viewPanes.length; i++) - { - if (actionId.indexOf(viewPanes[i].getId()) != -1) - { + + for (int i = 0; i < viewPanes.length; i++) { + if (actionId.indexOf(viewPanes[i].getId()) != -1) { selectedPane = viewPanes[i]; break; } } - + return selectedPane; } - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action + * .IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { IMemoryRenderingContainer container = getRenderingContainer(action); - if (container instanceof RenderingViewPane) - { - if (!((RenderingViewPane)container).canAddRendering()) + if (container instanceof RenderingViewPane) { + if (!((RenderingViewPane) container).canAddRendering()) action.setEnabled(false); else action.setEnabled(true); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java index 618a68b0d..38e1906d9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java @@ -68,45 +68,43 @@ import org.eclipse.ui.progress.WorkbenchJob; * Dialog allowing user to add a memory rendering */ public class AddMemoryRenderingDialog extends SelectionDialog { - + private IMemoryBlock[] fMemoryBlocks; private Combo memoryBlock; private ListViewer fViewer; private IMemoryBlock fSelectedMemoryBlock; private Button addNew; - + private ISelectionChangedListener fSelectionChangedListener; private SelectionListener fSelectionListener; private SelectionAdapter fAddNewSelectionAdapter; private IMemoryRenderingSite fSite; - - private IMemoryBlockListener fMemoryBlockListener = new IMemoryBlockListener(){ - - public void memoryBlocksAdded(final IMemoryBlock[] memory) - { - if (memory.length > 0) - { + + private IMemoryBlockListener fMemoryBlockListener = new IMemoryBlockListener() { + + @Override + public void memoryBlocksAdded(final IMemoryBlock[] memory) { + if (memory.length > 0) { IMemoryBlock currentBlock = getMemoryBlockToSelect(memory[0]); - if (currentBlock == null) - { + if (currentBlock == null) { addNew(); - } - else - { + } else { populateDialog(currentBlock); } } } - public void memoryBlocksRemoved(IMemoryBlock[] memory) - { + + @Override + public void memoryBlocksRemoved(IMemoryBlock[] memory) { } }; - - private IMemoryRenderingBindingsListener fBindingListener = new IMemoryRenderingBindingsListener() - { + + private IMemoryRenderingBindingsListener fBindingListener = new IMemoryRenderingBindingsListener() { + @Override public void memoryRenderingBindingsChanged() { - UIJob job = new UIJob("refresh"){ //$NON-NLS-1$ - + UIJob job = new UIJob("refresh") { //$NON-NLS-1$ + + @Override public IStatus runInUIThread(IProgressMonitor monitor) { fViewer.refresh(); return Status.OK_STATUS; @@ -115,145 +113,186 @@ public class AddMemoryRenderingDialog extends SelectionDialog { job.setSystem(true); job.schedule(); } - + }; - class MemoryRenderingLabelProvider implements ILabelProvider - { - - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) + class MemoryRenderingLabelProvider implements ILabelProvider { + + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { return null; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { - if (element instanceof IMemoryRenderingType) - { - String label = ((IMemoryRenderingType)element).getLabel(); + if (element instanceof IMemoryRenderingType) { + String label = ((IMemoryRenderingType) element).getLabel(); return label; } - return element.toString(); + return element.toString(); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse + * .jface.viewers.ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java + * .lang.Object, java.lang.String) */ + @Override public boolean isLabelProperty(Object element, String property) { return false; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse + * .jface.viewers.ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { } } - - class MemoryRenderingContentProvider implements IStructuredContentProvider - { - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) + class MemoryRenderingContentProvider implements IStructuredContentProvider { + + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.IStructuredContentProvider#getElements( + * java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { - IMemoryRenderingType[] renderings = DebugUITools.getMemoryRenderingManager().getRenderingTypes((IMemoryBlock)inputElement); + IMemoryRenderingType[] renderings = DebugUITools.getMemoryRenderingManager().getRenderingTypes((IMemoryBlock) inputElement); return renderings; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse + * .jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } - + } - - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.window.Window#close() */ + @Override public boolean close() { - + fViewer.removeSelectionChangedListener(fSelectionChangedListener); memoryBlock.removeSelectionListener(fSelectionListener); addNew.removeSelectionListener(fAddNewSelectionAdapter); DebugPlugin.getDefault().getMemoryBlockManager().removeListener(fMemoryBlockListener); DebugUITools.getMemoryRenderingManager().removeListener(fBindingListener); - + return super.close(); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse + * .swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); getButton(IDialogConstants.OK_ID).setEnabled(false); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.ui.dialogs.SelectionDialog#getResult() */ + @Override public Object[] getResult() { - + Object[] results = super.getResult(); - - if (results != null) - { - Object[] renderings = ((IStructuredSelection)results[0]).toArray(); + + if (results != null) { + Object[] renderings = ((IStructuredSelection) results[0]).toArray(); return renderings; } - return new Object[0]; + return new Object[0]; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#cancelPressed() */ + @Override protected void cancelPressed() { - + setResult(null); - + super.cancelPressed(); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { - + ISelection select = fViewer.getSelection(); - setSelectionResult(new Object[]{select}); - + setSelectionResult(new Object[] { select }); + super.okPressed(); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) + /* + * (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, DebugUIPlugin.getUniqueIdentifier() + ".AddMemoryRenderingDialog_context"); //$NON-NLS-1$ @@ -262,268 +301,253 @@ public class AddMemoryRenderingDialog extends SelectionDialog { compositeLayout.numColumns = 3; compositeLayout.makeColumnsEqualWidth = true; composite.setLayout(compositeLayout); - - GridData comositeSpec= new GridData(); - comositeSpec.grabExcessVerticalSpace= true; - comositeSpec.grabExcessHorizontalSpace= true; - comositeSpec.horizontalAlignment= GridData.FILL; - comositeSpec.verticalAlignment= GridData.CENTER; + + GridData comositeSpec = new GridData(); + comositeSpec.grabExcessVerticalSpace = true; + comositeSpec.grabExcessHorizontalSpace = true; + comositeSpec.horizontalAlignment = GridData.FILL; + comositeSpec.verticalAlignment = GridData.CENTER; composite.setLayoutData(comositeSpec); - + Label textLabel = new Label(composite, SWT.NONE); - textLabel.setText(DebugUIMessages.AddMemoryRenderingDialog_Memory_Monitor); + textLabel.setText(DebugUIMessages.AddMemoryRenderingDialog_Memory_Monitor); GridData textLayout = new GridData(); - textLayout.verticalAlignment=GridData.CENTER; - textLayout.horizontalAlignment=GridData.BEGINNING; + textLayout.verticalAlignment = GridData.CENTER; + textLayout.horizontalAlignment = GridData.BEGINNING; textLabel.setLayoutData(textLayout); - + memoryBlock = new Combo(composite, SWT.BORDER | SWT.READ_ONLY); - GridData spec= new GridData(GridData.FILL_HORIZONTAL); - spec.grabExcessVerticalSpace= false; - spec.grabExcessHorizontalSpace= false; - spec.horizontalAlignment= GridData.FILL; - spec.verticalAlignment= GridData.FILL; + GridData spec = new GridData(GridData.FILL_HORIZONTAL); + spec.grabExcessVerticalSpace = false; + spec.grabExcessHorizontalSpace = false; + spec.horizontalAlignment = GridData.FILL; + spec.verticalAlignment = GridData.FILL; spec.horizontalSpan = 4; memoryBlock.setLayoutData(spec); - + Label filler = new Label(composite, SWT.NONE); filler.setText(" "); //$NON-NLS-1$ GridData fillerData = new GridData(GridData.FILL_HORIZONTAL); fillerData.horizontalSpan = 2; filler.setLayoutData(fillerData); - + addNew = new Button(composite, SWT.NONE); - addNew.setText(DebugUIMessages.AddMemoryRenderingDialog_Add_New); - GridData specButton= new GridData(); - specButton.horizontalAlignment= GridData.END; - specButton.verticalAlignment= GridData.CENTER; + addNew.setText(DebugUIMessages.AddMemoryRenderingDialog_Add_New); + GridData specButton = new GridData(); + specButton.horizontalAlignment = GridData.END; + specButton.verticalAlignment = GridData.CENTER; addNew.setLayoutData(specButton); - + fAddNewSelectionAdapter = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { RetargetAddMemoryBlockAction action = new RetargetAddMemoryBlockAction(fSite, false); action.run(); action.dispose(); - }}; - + } + }; + addNew.addSelectionListener(fAddNewSelectionAdapter); - - fSelectionListener = new SelectionListener(){ + fSelectionListener = new SelectionListener() { + + @Override public void widgetSelected(SelectionEvent e) { - + int idx = memoryBlock.getSelectionIndex(); - + // avoid null pointer exception if (fMemoryBlocks == null) return; - + fSelectedMemoryBlock = fMemoryBlocks[idx]; - - fViewer.setInput(fSelectedMemoryBlock); - + + fViewer.setInput(fSelectedMemoryBlock); + } + @Override public void widgetDefaultSelected(SelectionEvent e) { - }}; - + } + }; + memoryBlock.addSelectionListener(fSelectionListener); - + Label renderingLabel = new Label(composite, SWT.NONE); - renderingLabel.setText(DebugUIMessages.AddMemoryRenderingDialog_Memory_renderings); + renderingLabel.setText(DebugUIMessages.AddMemoryRenderingDialog_Memory_renderings); GridData renderingLayout = new GridData(); renderingLayout.horizontalAlignment = GridData.BEGINNING; renderingLayout.verticalAlignment = GridData.CENTER; renderingLayout.horizontalSpan = 3; renderingLabel.setLayoutData(renderingLayout); - + fViewer = new ListViewer(composite); fViewer.setContentProvider(new MemoryRenderingContentProvider()); fViewer.setLabelProvider(new MemoryRenderingLabelProvider()); - + GridData listLayout = new GridData(GridData.FILL_BOTH); listLayout.horizontalSpan = 3; - listLayout.heightHint =140; + listLayout.heightHint = 140; fViewer.getControl().setLayoutData(listLayout); - - fViewer.addDoubleClickListener(new IDoubleClickListener (){ + fViewer.addDoubleClickListener(new IDoubleClickListener() { + + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); - }}); - + } + }); + IMemoryBlock currentBlock = getMemoryBlockToSelect(null); - if (currentBlock == null) - { + if (currentBlock == null) { addNew(); - } - else - { + } else { populateDialog(currentBlock); } - - + fSelectionChangedListener = new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { - ISelection selection = fViewer.getSelection(); - - if (selection.isEmpty()) - { + ISelection selection = fViewer.getSelection(); + + if (selection.isEmpty()) { getButton(IDialogConstants.OK_ID).setEnabled(false); - } - else - { + } else { getButton(IDialogConstants.OK_ID).setEnabled(true); } - }}; - + } + }; + fViewer.addSelectionChangedListener(fSelectionChangedListener); - + DebugPlugin.getDefault().getMemoryBlockManager().addListener(fMemoryBlockListener); DebugUITools.getMemoryRenderingManager().addListener(fBindingListener); - + return composite; } public AddMemoryRenderingDialog(Shell parent, IMemoryRenderingSite site) { super(parent); - super.setTitle(DebugUIMessages.AddMemoryRenderingDialog_Add_memory_rendering); + super.setTitle(DebugUIMessages.AddMemoryRenderingDialog_Add_memory_rendering); setShellStyle(getShellStyle() | SWT.RESIZE); fSite = site; } - - - private void doPopulateDialog(Combo combo, ListViewer viewer, String[] labels, int selectionIdx, IMemoryBlock currentBlock) - { + + private void doPopulateDialog(Combo combo, ListViewer viewer, String[] labels, int selectionIdx, IMemoryBlock currentBlock) { // clean up combo.removeAll(); - - for (int i=0; i<labels.length; i++) - { + + for (int i = 0; i < labels.length; i++) { combo.add(labels[i]); } combo.select(selectionIdx); fSelectedMemoryBlock = currentBlock; - + viewer.setInput(currentBlock); } - - private IMemoryBlock getMemoryBlockToSelect(IMemoryBlock lastAdded) - { + + private IMemoryBlock getMemoryBlockToSelect(IMemoryBlock lastAdded) { IMemoryBlock currentBlock = null; - + if (lastAdded != null) currentBlock = lastAdded; - else - { + else { // take Memory View's selection if possible ISelectionProvider selectionProvider = fSite.getSite().getSelectionProvider(); ISelection selection = null; - + if (selectionProvider != null) selection = selectionProvider.getSelection(); - else // otherwise, take selection from selection service - selection = DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(IDebugUIConstants.ID_MEMORY_VIEW); - + else + // otherwise, take selection from selection service + selection = DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(IDebugUIConstants.ID_MEMORY_VIEW); + IMemoryBlock element = getMemoryBlock(selection); - - if (element == null) - { - IAdaptable context = DebugUITools.getPartDebugContext(fSite.getSite()); - - if (context != null) - { + + if (element == null) { + IAdaptable context = DebugUITools.getPartDebugContext(fSite.getSite()); + + if (context != null) { IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(context); - + if (retrieval == null) return currentBlock; - + IMemoryBlock[] blocks = new IMemoryBlock[0]; - + if (retrieval != null) blocks = MemoryViewUtil.getMemoryBlockManager().getMemoryBlocks(retrieval); - + if (blocks.length > 0) currentBlock = blocks[0]; } - } - else - { + } else { currentBlock = element; } } return currentBlock; } - - private String[] getLabels(IMemoryBlock[] memoryBlocks) - { + + private String[] getLabels(IMemoryBlock[] memoryBlocks) { String[] labels = new String[memoryBlocks.length]; - for (int i=0; i<memoryBlocks.length; i++) - { + for (int i = 0; i < memoryBlocks.length; i++) { String text = IInternalDebugCoreConstants.EMPTY_STRING; - if (memoryBlocks[i] instanceof IMemoryBlockExtension) - { + if (memoryBlocks[i] instanceof IMemoryBlockExtension) { try { - text = ((IMemoryBlockExtension)memoryBlocks[i]).getExpression(); - + text = ((IMemoryBlockExtension) memoryBlocks[i]).getExpression(); + if (text == null) - text = DebugUIMessages.AddMemoryRenderingDialog_Unknown; - - if (((IMemoryBlockExtension)memoryBlocks[i]).getBigBaseAddress() != null) - { + text = DebugUIMessages.AddMemoryRenderingDialog_Unknown; + + if (((IMemoryBlockExtension) memoryBlocks[i]).getBigBaseAddress() != null) { text += " : 0x"; //$NON-NLS-1$ - text += ((IMemoryBlockExtension)memoryBlocks[i]).getBigBaseAddress().toString(16); - } + text += ((IMemoryBlockExtension) memoryBlocks[i]).getBigBaseAddress().toString(16); + } } catch (DebugException e) { long address = memoryBlocks[i].getStartAddress(); text = Long.toHexString(address); } - } - else - { + } else { long address = memoryBlocks[i].getStartAddress(); text = Long.toHexString(address); } - + // ask decorator to decorate to ensure consistent label - ILabelDecorator decorator = (ILabelDecorator)fMemoryBlocks[i].getAdapter(ILabelDecorator.class); + ILabelDecorator decorator = (ILabelDecorator) fMemoryBlocks[i].getAdapter(ILabelDecorator.class); if (decorator != null) text = decorator.decorateText(text, fMemoryBlocks[i]); - + labels[i] = text; } return labels; } - - private IMemoryBlock getMemoryBlock(ISelection selection) - { + + private IMemoryBlock getMemoryBlock(ISelection selection) { if (!(selection instanceof IStructuredSelection)) return null; - //only single selection of debug element is allowed for this action - if (selection.isEmpty() || ((IStructuredSelection)selection).size() > 1) - { + // only single selection of debug element is allowed for this action + if (selection.isEmpty() || ((IStructuredSelection) selection).size() > 1) { return null; } - Object elem = ((IStructuredSelection)selection).getFirstElement(); - + Object elem = ((IStructuredSelection) selection).getFirstElement(); + if (elem instanceof IMemoryBlock) - return (IMemoryBlock)elem; + return (IMemoryBlock) elem; else if (elem instanceof IMemoryRendering) - return ((IMemoryRendering)elem).getMemoryBlock(); + return ((IMemoryRendering) elem).getMemoryBlock(); else return null; } - - public IMemoryBlock getMemoryBlock() - { + + public IMemoryBlock getMemoryBlock() { return fSelectedMemoryBlock; } - + /** * @param currentBlock the current memory block context */ @@ -531,40 +555,39 @@ public class AddMemoryRenderingDialog extends SelectionDialog { final IMemoryBlock selectMB = currentBlock; Job job = new Job("Populate dialog") //$NON-NLS-1$ { + @Override protected IStatus run(IProgressMonitor monitor) { - IMemoryBlockRetrieval mbRetrieval = MemoryViewUtil.getMemoryBlockRetrieval(selectMB); - - if (mbRetrieval != null) - { + IMemoryBlockRetrieval mbRetrieval = MemoryViewUtil.getMemoryBlockRetrieval(selectMB); + + if (mbRetrieval != null) { fMemoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(mbRetrieval); int selectionIdx = 0; - for (int i=0; i<fMemoryBlocks.length; i++) - { - if (fMemoryBlocks[i] == selectMB) - { + for (int i = 0; i < fMemoryBlocks.length; i++) { + if (fMemoryBlocks[i] == selectMB) { selectionIdx = i; break; } } - + final String[] labels = getLabels(fMemoryBlocks); final int idx = selectionIdx; final IMemoryBlock selectedBlk = selectMB; - WorkbenchJob wbJob = new WorkbenchJob("populate dialog"){ //$NON-NLS-1$ - + WorkbenchJob wbJob = new WorkbenchJob("populate dialog") { //$NON-NLS-1$ + + @Override public IStatus runInUIThread(IProgressMonitor wbMonitor) { - doPopulateDialog(memoryBlock, fViewer, labels, idx, selectedBlk); + doPopulateDialog(memoryBlock, fViewer, labels, idx, selectedBlk); return Status.OK_STATUS; - }}; - wbJob.setSystem(true); - wbJob.schedule(); - } - else - { - DebugUIPlugin.logErrorMessage("Unable to obtain memory block retrieval."); //$NON-NLS-1$ - } + } + }; + wbJob.setSystem(true); + wbJob.schedule(); + } else { + DebugUIPlugin.logErrorMessage("Unable to obtain memory block retrieval."); //$NON-NLS-1$ + } return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } @@ -573,13 +596,15 @@ public class AddMemoryRenderingDialog extends SelectionDialog { * */ private void addNew() { - WorkbenchJob job = new WorkbenchJob("populate dialog"){ //$NON-NLS-1$ + WorkbenchJob job = new WorkbenchJob("populate dialog") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { memoryBlock.add(DebugUIMessages.AddMemoryRenderingDialog_Add_New); memoryBlock.select(0); return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CodePagesPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CodePagesPreferencePage.java index 0e9a10395..69d744617 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CodePagesPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CodePagesPreferencePage.java @@ -9,7 +9,6 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.debug.internal.ui.views.memory; import java.io.UnsupportedEncodingException; @@ -38,52 +37,53 @@ public class CodePagesPreferencePage extends FieldEditorPreferencePage { setTitle(DebugUIMessages.CodePagesPrefDialog_1); } + @Override protected void createFieldEditors() { fAsciiCodePage = new StringFieldEditor(IDebugUIConstants.PREF_DEFAULT_ASCII_CODE_PAGE, DebugUIMessages.CodePagesPrefDialog_2, getFieldEditorParent()); fAsciiCodePage.setEmptyStringAllowed(false); addField(fAsciiCodePage); - + fEbcdicCodePage = new StringFieldEditor(IDebugUIConstants.PREF_DEFAULT_EBCDIC_CODE_PAGE, DebugUIMessages.CodePagesPrefDialog_4, getFieldEditorParent()); fEbcdicCodePage.setEmptyStringAllowed(false); addField(fEbcdicCodePage); } + @Override public boolean performOk() { - + if (fAsciiCodePage == null || fEbcdicCodePage == null) return super.performOk(); - + // check that the codepages are supported String asciiCodePage = fAsciiCodePage.getStringValue(); asciiCodePage = asciiCodePage.trim(); try { - new String(new byte[]{1}, asciiCodePage); + new String(new byte[] { 1 }, asciiCodePage); } catch (UnsupportedEncodingException e) { Shell shell = DebugUIPlugin.getShell(); - if (shell != null) - { - IStatus status = DebugUIPlugin.newErrorStatus(DebugUIMessages.CodePagesPrefDialog_0, e); - ErrorDialog.openError(shell, DebugUIMessages.CodePagesPrefDialog_6, DebugUIMessages.CodePagesPrefDialog_7, status); // + if (shell != null) { + IStatus status = DebugUIPlugin.newErrorStatus(DebugUIMessages.CodePagesPrefDialog_0, e); + ErrorDialog.openError(shell, DebugUIMessages.CodePagesPrefDialog_6, DebugUIMessages.CodePagesPrefDialog_7, status); // } return false; } - + String ebcdicCodePage = fEbcdicCodePage.getStringValue(); ebcdicCodePage = ebcdicCodePage.trim(); try { - new String(new byte[]{1}, ebcdicCodePage); + new String(new byte[] { 1 }, ebcdicCodePage); } catch (UnsupportedEncodingException e) { Shell shell = DebugUIPlugin.getShell(); - if (shell != null) - { - IStatus status = DebugUIPlugin.newErrorStatus(DebugUIMessages.CodePagesPrefDialog_0, e); - ErrorDialog.openError(shell, DebugUIMessages.CodePagesPrefDialog_8, DebugUIMessages.CodePagesPrefDialog_9, status); // + if (shell != null) { + IStatus status = DebugUIPlugin.newErrorStatus(DebugUIMessages.CodePagesPrefDialog_0, e); + ErrorDialog.openError(shell, DebugUIMessages.CodePagesPrefDialog_8, DebugUIMessages.CodePagesPrefDialog_9, status); // } return false; } return super.performOk(); } + @Override protected Control createContents(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, DebugUIPlugin.getUniqueIdentifier() + ".CodePagesPrefDialog_context"); //$NON-NLS-1$ return super.createContents(parent); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryView.java index aa0ae6580..61933c8dc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryView.java @@ -11,28 +11,28 @@ package org.eclipse.debug.internal.ui.views.memory; - /** - * Functions to allow user to control the Memory View or the Memory Rendering View + * Functions to allow user to control the Memory View or the Memory Rendering + * View * * @since 3.0 */ -public interface IMemoryView -{ +public interface IMemoryView { /** * @return the top view tab from the Memory View */ - public IMemoryViewTab getTopMemoryTab( ); - + public IMemoryViewTab getTopMemoryTab(); + /** * @return all view tabs from current tab folder */ public IMemoryViewTab[] getAllViewTabs(); - + /** * Move specified view tab to the top + * * @param viewTab */ public void moveToTop(IMemoryViewTab viewTab); - + } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewPane.java index e7329f13d..b092ff38c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewPane.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewPane.java @@ -16,79 +16,81 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; - /** * Represent a view pane in the memory view. * - * This is an internal interface for mananging the view panes within the Memory View + * This is an internal interface for mananging the view panes within the Memory + * View + * * @since 3.1 */ public interface IMemoryViewPane { - + /** - * Create the view pane with the given parent composite, and pane - * id. + * Create the view pane with the given parent composite, and pane id. + * * @param parent * @param paneId * @param label * @return the control of the view pane */ public Control createViewPane(Composite parent, String paneId, String label); - + /** - * Restore view pane based on current selection from the debug view. - * Create memory blocks or renderings that currently exist in the debug - * session. + * Restore view pane based on current selection from the debug view. Create + * memory blocks or renderings that currently exist in the debug session. */ public void restoreViewPane(); - + /** * Dispose the view pane */ public void dispose(); - + /** * @return unique identifier of the view pane */ public String getId(); - + /** - * @return array of actions to be contributed to the view pane's - * acition bar. + * @return array of actions to be contributed to the view pane's acition + * bar. */ public IAction[] getActions(); - + /** - * Add the given selection listener to the view pane. The selection - * listener gets notified when the selection from the view pane - * has changed. + * Add the given selection listener to the view pane. The selection listener + * gets notified when the selection from the view pane has changed. + * * @param listener */ public void addSelectionListener(ISelectionChangedListener listener); - + /** - * Remove the selection listener from the view pane. The listener - * will no longer get notified when selection is changed. + * Remove the selection listener from the view pane. The listener will no + * longer get notified when selection is changed. + * * @param listener */ public void removeSelctionListener(ISelectionChangedListener listener); - + /** * @return the selection provider of the view pane */ public ISelectionProvider getSelectionProvider(); - + /** * @return the control for ths memory view pane */ public Control getControl(); - + /** * Called when the view pane becomes visible or hidden + * * @param visible visibility state of teh view pane */ public void setVisible(boolean visible); - + /** * @return if the view pane is currently visible */ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewTab.java index c9dab6a24..0b5f388bc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewTab.java @@ -9,55 +9,53 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.debug.internal.ui.views.memory; import org.eclipse.debug.ui.memory.IMemoryRendering; - /** * Represent a view tab in the Memory View or Memory Rendering View * - * Refer to AbstractMemoryViewTab. - * This is an internal interface. This class is not intended to be implemented by clients. + * Refer to AbstractMemoryViewTab. This is an internal interface. This class is + * not intended to be implemented by clients. * * @since 3.0 */ -public interface IMemoryViewTab -{ +public interface IMemoryViewTab { /** * Remove the view tab. */ public void dispose(); - + /** * @return if the view tab is disposed */ public boolean isDisposed(); - + /** * @return enablement state of the view tab. */ public boolean isEnabled(); - - + /** * Sets the enablament state of the view tab. + * * @param enabled */ public void setEnabled(boolean enabled); - + /** * Set view tab's label + * * @param label */ public void setTabLabel(String label); - + /** * @return view tab's label, null if the label is not available */ public String getTabLabel(); - + /** * @return the rendering of this view tab */ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LinkRenderingPanesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LinkRenderingPanesAction.java index 767f3c588..7af713e31 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LinkRenderingPanesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LinkRenderingPanesAction.java @@ -20,35 +20,38 @@ import org.eclipse.ui.IViewPart; /** * Action to link/unlink rendering view panes */ -public class LinkRenderingPanesAction implements IViewActionDelegate{ +public class LinkRenderingPanesAction implements IViewActionDelegate { IMemoryRenderingSite fRenderingSite; private MemoryViewSynchronizationService fMemSyncService; - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ - public void init(IViewPart view) { - - if (view instanceof IMemoryRenderingSite) - { - fRenderingSite = (IMemoryRenderingSite)view; - + @Override + public void init(IViewPart view) { + + if (view instanceof IMemoryRenderingSite) { + fRenderingSite = (IMemoryRenderingSite) view; + IMemoryRenderingSynchronizationService syncService = fRenderingSite.getSynchronizationService(); - + if (syncService instanceof MemoryViewSynchronizationService) - fMemSyncService = (MemoryViewSynchronizationService)syncService; + fMemSyncService = (MemoryViewSynchronizationService) syncService; } } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { - + if (fMemSyncService == null) return; - + fMemSyncService.setEnabled(!fMemSyncService.isEnabled()); updateActionState(action); } @@ -57,20 +60,24 @@ public class LinkRenderingPanesAction implements IViewActionDelegate{ * @param action */ private void updateActionState(IAction action) { - + if (fMemSyncService == null) return; - + if (fMemSyncService.isEnabled()) action.setChecked(true); else action.setChecked(false); } - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action + * .IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { - updateActionState(action); + updateActionState(action); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java index 2e4179594..0adc1a39e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,7 @@ * display memory blocks that do not reference IDebugTarget * *******************************************************************************/ - + package org.eclipse.debug.internal.ui.views.memory; import java.util.ArrayList; @@ -66,14 +66,13 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.UIJob; - /** * Tree viewer for memory blocks */ -public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionChangedListener, IMemoryViewPane, IMemoryRenderingContainer{ - +public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionChangedListener, IMemoryViewPane, IMemoryRenderingContainer { + public static final String PANE_ID = DebugUIPlugin.getUniqueIdentifier() + ".MemoryView.MemoryBlocksTreeViewPane"; //$NON-NLS-1$ - + private IViewPart fParent; private IPresentationContext fPresentationContext; private MemoryViewTreeViewer fTreeViewer; @@ -87,85 +86,83 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC private TreeViewPaneContextListener fDebugContextListener; private ViewPaneEventHandler fEvtHandler; private String fLabel; - - class TreeViewerRemoveMemoryBlocksAction extends Action - { - TreeViewerRemoveMemoryBlocksAction() - { + + class TreeViewerRemoveMemoryBlocksAction extends Action { + TreeViewerRemoveMemoryBlocksAction() { super(); - setText(DebugUIMessages.RemoveMemoryBlockAction_title); + setText(DebugUIMessages.RemoveMemoryBlockAction_title); - setToolTipText(DebugUIMessages.RemoveMemoryBlockAction_tooltip); - setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_MEMORY)); + setToolTipText(DebugUIMessages.RemoveMemoryBlockAction_tooltip); + setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_MEMORY)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_REMOVE_MEMORY)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_MEMORY)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".RemoveMemoryBlockAction_context"); //$NON-NLS-1$ setEnabled(true); } - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { ISelection selected = fTreeViewer.getSelection(); - - if (selected != null && selected instanceof IStructuredSelection) - { - Object[] selectedMemBlks = ((IStructuredSelection)selected).toArray(); - ArrayList memoryBlocks = new ArrayList(); - for (int i=0; i<selectedMemBlks.length; i++) - { - if (selectedMemBlks[i] instanceof IMemoryBlock) + + if (selected != null && selected instanceof IStructuredSelection) { + Object[] selectedMemBlks = ((IStructuredSelection) selected).toArray(); + ArrayList<Object> memoryBlocks = new ArrayList<Object>(); + for (int i = 0; i < selectedMemBlks.length; i++) { + if (selectedMemBlks[i] instanceof IMemoryBlock) { memoryBlocks.add(selectedMemBlks[i]); + } } - - DebugPlugin.getDefault().getMemoryBlockManager().removeMemoryBlocks((IMemoryBlock[])memoryBlocks.toArray(new IMemoryBlock[memoryBlocks.size()])); + + DebugPlugin.getDefault().getMemoryBlockManager().removeMemoryBlocks(memoryBlocks.toArray(new IMemoryBlock[memoryBlocks.size()])); } } } - - class TreeViewerRemoveAllMemoryBlocksAction extends Action - { - TreeViewerRemoveAllMemoryBlocksAction() - { + + class TreeViewerRemoveAllMemoryBlocksAction extends Action { + TreeViewerRemoveAllMemoryBlocksAction() { super(); - setText(DebugUIMessages.MemoryBlocksTreeViewPane_2); + setText(DebugUIMessages.MemoryBlocksTreeViewPane_2); - setToolTipText(DebugUIMessages.MemoryBlocksTreeViewPane_2); - setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL)); + setToolTipText(DebugUIMessages.MemoryBlocksTreeViewPane_2); + setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".RemoveAllMemoryBlocksAction_context"); //$NON-NLS-1$ } - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { - - IWorkbenchWindow window= DebugUIPlugin.getActiveWorkbenchWindow(); + + IWorkbenchWindow window = DebugUIPlugin.getActiveWorkbenchWindow(); if (window == null) { return; } - boolean proceed = MessageDialog.openQuestion(window.getShell(), DebugUIMessages.MemoryBlocksTreeViewPane_0, DebugUIMessages.MemoryBlocksTreeViewPane_1); // + boolean proceed = MessageDialog.openQuestion(window.getShell(), DebugUIMessages.MemoryBlocksTreeViewPane_0, DebugUIMessages.MemoryBlocksTreeViewPane_1); // if (proceed) { IMemoryBlock[] memoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(fRetrieval); DebugPlugin.getDefault().getMemoryBlockManager().removeMemoryBlocks(memoryBlocks); } - } + } } - - class ViewPaneEventHandler implements IMemoryBlockListener, IDebugEventSetListener - { + + class ViewPaneEventHandler implements IMemoryBlockListener, IDebugEventSetListener { private boolean fDisposed = false; - - public ViewPaneEventHandler() - { + + public ViewPaneEventHandler() { DebugPlugin.getDefault().getMemoryBlockManager().addListener(this); DebugPlugin.getDefault().addDebugEventListener(this); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ public void dispose() { @@ -174,54 +171,67 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC DebugPlugin.getDefault().removeDebugEventListener(this); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener#MemoryBlockAdded(org.eclipse.debug.core.model.IMemoryBlock) + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener# + * MemoryBlockAdded(org.eclipse.debug.core.model.IMemoryBlock) */ + @Override public void memoryBlocksAdded(final IMemoryBlock[] memory) { // if the content provider is disposed, do not handle event - if (fDisposed) + if (fDisposed) { return; + } updateActionsEnablement(); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener#MemoryBlockRemoved(org.eclipse.debug.core.model.IMemoryBlock) + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener# + * MemoryBlockRemoved(org.eclipse.debug.core.model.IMemoryBlock) */ + @Override public void memoryBlocksRemoved(final IMemoryBlock[] memory) { - if (fDisposed) + if (fDisposed) { return; + } updateActionsEnablement(); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.BasicDebugViewContentProvider#doHandleDebugEvent(org.eclipse.debug.core.DebugEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.BasicDebugViewContentProvider + * #doHandleDebugEvent(org.eclipse.debug.core.DebugEvent) */ protected void doHandleDebugEvent(DebugEvent event) { - + // if the view is disposed, do not handle event - if (fDisposed) + if (fDisposed) { return; - - if (event.getKind() == DebugEvent.TERMINATE) - { - // should only handle the terminate event if the target is terminated - if (event.getSource() instanceof IDebugTarget) - { + } + + if (event.getKind() == DebugEvent.TERMINATE) { + // should only handle the terminate event if the target is + // terminated + if (event.getSource() instanceof IDebugTarget) { IMemoryBlockRetrieval srcRetrieval = MemoryViewUtil.getMemoryBlockRetrieval(event.getSource()); - if (srcRetrieval == fRetrieval) - { + if (srcRetrieval == fRetrieval) { // #setInput must be done on the UI thread - UIJob job = new UIJob("setInput"){ //$NON-NLS-1$ + UIJob job = new UIJob("setInput") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { - - // if viewpane is disposed, do not handle event - if (fTreeViewer.getContentProvider() == null) - return Status.OK_STATUS; - + + // if viewpane is disposed, do not handle event + if (fTreeViewer.getContentProvider() == null) { + return Status.OK_STATUS; + } + fTreeViewer.setInput(null); return Status.OK_STATUS; - }}; - + } + }; + job.setSystem(true); job.schedule(); } @@ -229,37 +239,32 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC } } + @Override public void handleDebugEvents(DebugEvent[] events) { - for (int i=0; i<events.length; i++) - { + for (int i = 0; i < events.length; i++) { doHandleDebugEvent(events[i]); } } } - - class TreeViewPaneContextListener implements IDebugContextListener - { + + class TreeViewPaneContextListener implements IDebugContextListener { public void contextActivated(ISelection selection) { - - if (selection.isEmpty() && fRetrieval != null) - { + + if (selection.isEmpty() && fRetrieval != null) { fRetrieval = null; - if (fTreeViewer != null && fTreeViewer.getContentProvider() != null) + if (fTreeViewer != null && fTreeViewer.getContentProvider() != null) { fTreeViewer.setInput(fRetrieval); + } updateActionsEnablement(); return; } - - if (selection instanceof IStructuredSelection) - { - Object obj = ((IStructuredSelection)selection).getFirstElement(); - if (obj instanceof IAdaptable) - { - IAdaptable context = (IAdaptable)obj; + + if (selection instanceof IStructuredSelection) { + Object obj = ((IStructuredSelection) selection).getFirstElement(); + if (obj instanceof IAdaptable) { + IAdaptable context = (IAdaptable) obj; IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(context); - if (retrieval != null && retrieval != fRetrieval && - fTreeViewer != null && fTreeViewer.getContentProvider() != null) - { + if (retrieval != null && retrieval != fRetrieval && fTreeViewer != null && fTreeViewer.getContentProvider() != null) { // set new setting fRetrieval = retrieval; fTreeViewer.setInput(fRetrieval); @@ -269,79 +274,85 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC } } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener#contextEvent(org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener + * #contextEvent(org.eclipse.debug.internal.ui.contexts.provisional. + * DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { contextActivated(event.getContext()); } } } - - public MemoryBlocksTreeViewPane(IViewPart parent) - { + + public MemoryBlocksTreeViewPane(IViewPart parent) { fParent = parent; fSelectionProvider = new ViewPaneSelectionProvider(); } - - public Control createViewPane(Composite parent, String paneId, String label) - { + + @Override + public Control createViewPane(Composite parent, String paneId, String label) { fPaneId = paneId; int style = SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.VIRTUAL; fLabel = label; - + IMemoryRenderingSite site = getMemoryRenderingSite(); fPresentationContext = new MemoryViewPresentationContext(site, this, null); fTreeViewer = new MemoryViewTreeViewer(parent, style, fPresentationContext); - + IAdaptable context = DebugUITools.getPartDebugContext(fParent.getSite()); IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(context); - if (retrieval != null) + if (retrieval != null) { fTreeViewer.setInput(retrieval); - + } + fRetrieval = retrieval; - + fParent.getViewSite().getSelectionProvider().addSelectionChangedListener(this); fParent.getViewSite().getPage().addSelectionListener(this); - + fDebugContextListener = new TreeViewPaneContextListener(); DebugUITools.addPartDebugContextListener(fParent.getSite(), fDebugContextListener); - + fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection treeSelected = event.getSelection(); fSelectionProvider.setSelection(treeSelected); - }}); + } + }); updateRetrieval(); fEvtHandler = new ViewPaneEventHandler(); - + // create context menu MenuManager mgr = createContextMenuManager(); Menu menu = mgr.createContextMenu(fTreeViewer.getControl()); fTreeViewer.getControl().setMenu(menu); - + GridData data = new GridData(); data.grabExcessHorizontalSpace = true; data.grabExcessVerticalSpace = true; data.horizontalAlignment = SWT.FILL; data.verticalAlignment = SWT.FILL; fTreeViewer.getControl().setLayoutData(data); - + updateActionsEnablement(); - + return fTreeViewer.getControl(); } - - + /** * */ private void updateRetrieval() { - + Object context = DebugUITools.getPartDebugContext(fParent.getSite()); fRetrieval = MemoryViewUtil.getMemoryBlockRetrieval(context); } @@ -350,6 +361,7 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { manager.add(fAddMemoryBlockAction); manager.add(fRemoveMemoryBlockAction); @@ -361,212 +373,238 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC fParent.getSite().registerContextMenu(getId(), menuMgr, fSelectionProvider); return menuMgr; } - - public void dispose() - { + + @Override + public void dispose() { fParent.getViewSite().getSelectionProvider().removeSelectionChangedListener(this); - fParent.getViewSite().getPage().removeSelectionListener(this); + fParent.getViewSite().getPage().removeSelectionListener(this); fAddMemoryBlockAction.dispose(); DebugUITools.removePartDebugContextListener(fParent.getSite(), fDebugContextListener); - fEvtHandler.dispose(); - fPresentationContext.dispose(); + fEvtHandler.dispose(); + fPresentationContext.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui. + * IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { - + if (selection instanceof IStructuredSelection) { + Object obj = ((IStructuredSelection) selection).getFirstElement(); - if (selection instanceof IStructuredSelection) - { - Object obj = ((IStructuredSelection)selection).getFirstElement(); - - if (obj instanceof IMemoryBlock) - { + if (obj instanceof IMemoryBlock) { // if the selection event comes from this view - if (part == fParent) - { - // do not change selection if the selection is already correct + if (part == fParent) { + // do not change selection if the selection is already + // correct ISelection treeSel = fTreeViewer.getSelection(); - if (treeSel instanceof IStructuredSelection) - { - if (((IStructuredSelection)treeSel).getFirstElement() == obj) + if (treeSel instanceof IStructuredSelection) { + if (((IStructuredSelection) treeSel).getFirstElement() == obj) { return; + } } - // remove itself as selection listener when handling selection changed event + // remove itself as selection listener when handling + // selection changed event removeSelctionListener(this); fTreeViewer.setSelection(selection); - // remove itself as selection listener when handling selection changed event + // remove itself as selection listener when handling + // selection changed event addSelectionListener(this); } } } - - } + } - - public String getId() - { + @Override + public String getId() { return fPaneId; } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#getActions() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#getActions() */ + @Override public IAction[] getActions() { - - if (fAddMemoryBlockAction == null) - fAddMemoryBlockAction = new RetargetAddMemoryBlockAction((IMemoryRenderingSite)fParent); - - if (fRemoveMemoryBlockAction == null) - { + + if (fAddMemoryBlockAction == null) { + fAddMemoryBlockAction = new RetargetAddMemoryBlockAction((IMemoryRenderingSite) fParent); + } + + if (fRemoveMemoryBlockAction == null) { fRemoveMemoryBlockAction = new TreeViewerRemoveMemoryBlocksAction(); } - - if (fRemoveAllMemoryBlocksAction == null) - { + + if (fRemoveAllMemoryBlocksAction == null) { fRemoveAllMemoryBlocksAction = new TreeViewerRemoveAllMemoryBlocksAction(); } - + updateActionsEnablement(); - - return new IAction[]{fAddMemoryBlockAction, fRemoveMemoryBlockAction, fRemoveAllMemoryBlocksAction}; + + return new IAction[] { + fAddMemoryBlockAction, fRemoveMemoryBlockAction, + fRemoveAllMemoryBlocksAction }; } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#addSelectionListener(org.eclipse.jface.viewers.ISelectionChangedListener) + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane# + * addSelectionListener(org.eclipse.jface.viewers.ISelectionChangedListener) */ - public void addSelectionListener(ISelectionChangedListener listener) - { - if (fSelectionProvider == null) + @Override + public void addSelectionListener(ISelectionChangedListener listener) { + if (fSelectionProvider == null) { fSelectionProvider = new ViewPaneSelectionProvider(); - + } + fSelectionProvider.addSelectionChangedListener(listener); } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#removeSelctionListener(org.eclipse.jface.viewers.ISelectionChangedListener) + + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane# + * removeSelctionListener + * (org.eclipse.jface.viewers.ISelectionChangedListener) */ - public void removeSelctionListener(ISelectionChangedListener listener) - { - if (fSelectionProvider == null) + @Override + public void removeSelctionListener(ISelectionChangedListener listener) { + if (fSelectionProvider == null) { return; - + } + fSelectionProvider.removeSelectionChangedListener(listener); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#getSelectionProvider() + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane# + * getSelectionProvider() */ + @Override public ISelectionProvider getSelectionProvider() { return fSelectionProvider; } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#restoreViewPane() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#restoreViewPane + * () */ + @Override public void restoreViewPane() { updateRetrieval(); updateActionsEnablement(); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#getControl() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#getControl() */ + @Override public Control getControl() { return fTreeViewer.getControl(); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#setVisible(boolean) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#setVisible + * (boolean) */ + @Override public void setVisible(boolean visible) { - if (fVisible != visible) - { + if (fVisible != visible) { fVisible = visible; - - if(fVisible) - { + + if (fVisible) { fTreeViewer.refresh(); fTreeViewer.getControl().setFocus(); } } } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#isVisible() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#isVisible() */ + @Override public boolean isVisible() { return fVisible; } - - private void updateActionsEnablement() - { - if (fRemoveMemoryBlockAction == null) + + private void updateActionsEnablement() { + if (fRemoveMemoryBlockAction == null) { return; - - if (fRemoveAllMemoryBlocksAction == null) + } + + if (fRemoveAllMemoryBlocksAction == null) { return; - - if (fRetrieval != null) - { + } + + if (fRetrieval != null) { IMemoryBlock[] memBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(fRetrieval); - if(memBlocks.length > 0) - { + if (memBlocks.length > 0) { fRemoveMemoryBlockAction.setEnabled(true); fRemoveAllMemoryBlocksAction.setEnabled(true); - } - else - { + } else { fRemoveMemoryBlockAction.setEnabled(false); - fRemoveAllMemoryBlocksAction.setEnabled(false); + fRemoveAllMemoryBlocksAction.setEnabled(false); } - } - else - { + } else { fRemoveMemoryBlockAction.setEnabled(false); fRemoveAllMemoryBlocksAction.setEnabled(false); } } + @Override public void selectionChanged(SelectionChangedEvent event) { // only handle selection changed from parent's selection provider - if (event.getSource() == fParent.getSite().getSelectionProvider()) - { + if (event.getSource() == fParent.getSite().getSelectionProvider()) { MemoryBlocksTreeViewPane.this.selectionChanged(fParent, event.getSelection()); } } - - public StructuredViewer getViewer() - { + + public StructuredViewer getViewer() { return fTreeViewer; } + @Override public IMemoryRenderingSite getMemoryRenderingSite() { - if (fParent instanceof IMemoryRenderingSite) - return (IMemoryRenderingSite)fParent; + if (fParent instanceof IMemoryRenderingSite) { + return (IMemoryRenderingSite) fParent; + } return null; } + @Override public void addMemoryRendering(IMemoryRendering rendering) { // do nothing } + @Override public void removeMemoryRendering(IMemoryRendering rendering) { // do nothing } + @Override public IMemoryRendering[] getRenderings() { return new IMemoryRendering[0]; } + @Override public IMemoryRendering getActiveRendering() { return null; } + @Override public String getLabel() { return fLabel; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java index d6001e865..6fbf1344d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java @@ -77,34 +77,37 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { protected MemoryViewSelectionProvider fSelectionProvider; private MemoryViewPartListener fPartListener; - + private SashForm fSashForm; - private Hashtable fViewPanes = new Hashtable(); - private Hashtable fViewPaneControls = new Hashtable(); - private ArrayList fVisibleViewPanes = new ArrayList(); + private Hashtable<String, IMemoryViewPane> fViewPanes = new Hashtable<String, IMemoryViewPane>(); + private Hashtable<String, ViewForm> fViewPaneControls = new Hashtable<String, ViewForm>(); + private ArrayList<String> fVisibleViewPanes = new ArrayList<String>(); private boolean fVisible; - - private ArrayList fWeights = new ArrayList(); - - private static final String VISIBILITY_PREF = IDebugUIConstants.ID_MEMORY_VIEW+".viewPanesVisibility"; //$NON-NLS-1$ + + private ArrayList<Integer> fWeights = new ArrayList<Integer>(); + + private static final String VISIBILITY_PREF = IDebugUIConstants.ID_MEMORY_VIEW + ".viewPanesVisibility"; //$NON-NLS-1$ private static final String ID_MEMORY_VIEW_CONTEXT = "org.eclipse.debug.ui.memoryview"; //$NON-NLS-1$ private static final String ID_ADD_MEMORY_BLOCK_COMMAND = "org.eclipse.debug.ui.commands.addMemoryMonitor"; //$NON-NLS-1$ private static final String ID_TOGGLE_MEMORY_MONITORS_PANE_COMMAND = "org.eclipse.debug.ui.commands.toggleMemoryMonitorsPane"; //$NON-NLS-1$ private static final String ID_NEXT_MEMORY_BLOCK_COMMAND = "org.eclipse.debug.ui.commands.nextMemoryBlock"; //$NON-NLS-1$ private static final String ID_NEW_RENDERING_COMMAND = "org.eclipse.debug.ui.commands.newRendering"; //$NON-NLS-1$ private static final String ID_CLOSE_RENDERING_COMMAND = "org.eclipse.debug.ui.commands.closeRendering"; //$NON-NLS-1$ - - public static final String VIEW_PANE_ORIENTATION_PREF = IDebugUIConstants.ID_MEMORY_VIEW+".orientation"; //$NON-NLS-1$ + + public static final String VIEW_PANE_ORIENTATION_PREF = IDebugUIConstants.ID_MEMORY_VIEW + ".orientation"; //$NON-NLS-1$ public static final int HORIZONTAL_VIEW_ORIENTATION = 0; - public static final int VERTICAL_VIEW_ORIENTATION =1; + public static final int VERTICAL_VIEW_ORIENTATION = 1; + + private String[] defaultVisiblePaneIds = { + MemoryBlocksTreeViewPane.PANE_ID, + IDebugUIConstants.ID_RENDERING_VIEW_PANE_1 }; - private String[] defaultVisiblePaneIds ={MemoryBlocksTreeViewPane.PANE_ID, IDebugUIConstants.ID_RENDERING_VIEW_PANE_1}; - private MemoryBlocksTreeViewPane fMemBlkViewer; - + private MemoryViewSynchronizationService fSyncService; - - private boolean fPinMBDisplay = false; // pin memory block display, on by default + + private boolean fPinMBDisplay = false; // pin memory block display, on by + // default private static int fViewCnt = 0; private AbstractHandler fAddHandler; @@ -112,231 +115,253 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { private AbstractHandler fNextMemoryBlockHandler; private AbstractHandler fNewRenderingHandler; private AbstractHandler fCloseRenderingHandler; - + private ViewPaneOrientationAction[] fOrientationActions; private int fViewOrientation = HORIZONTAL_VIEW_ORIENTATION; - + private String fActivePaneId; - - class MemoryViewSelectionProvider implements ISelectionProvider, ISelectionChangedListener - { - ArrayList fListeners = new ArrayList(); - + + class MemoryViewSelectionProvider implements ISelectionProvider, ISelectionChangedListener { + ArrayList<ISelectionChangedListener> fListeners = new ArrayList<ISelectionChangedListener>(); + IStructuredSelection fSelections = new StructuredSelection(); - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener + * (org.eclipse.jface.viewers.ISelectionChangedListener) */ - public void addSelectionChangedListener(ISelectionChangedListener listener) - { + @Override + public void addSelectionChangedListener(ISelectionChangedListener listener) { if (!fListeners.contains(listener)) fListeners.add(listener); - + } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() */ - public ISelection getSelection() - { + @Override + public ISelection getSelection() { return fSelections; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) + /* + * (non-Javadoc) + * @see org.eclipse.jface.viewers.ISelectionProvider# + * removeSelectionChangedListener + * (org.eclipse.jface.viewers.ISelectionChangedListener) */ - public void removeSelectionChangedListener(ISelectionChangedListener listener) - { + @Override + public void removeSelectionChangedListener(ISelectionChangedListener listener) { if (fListeners.contains(listener)) fListeners.remove(listener); - + } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse + * .jface.viewers.ISelection) */ - public void setSelection(ISelection selection) - { - if (selection instanceof IStructuredSelection) - { + @Override + public void setSelection(ISelection selection) { + if (selection instanceof IStructuredSelection) { boolean fireChanged = false; - + // only fire change event if the selection has really changed - if (fSelections.getFirstElement() != ((IStructuredSelection)selection).getFirstElement()) + if (fSelections.getFirstElement() != ((IStructuredSelection) selection).getFirstElement()) fireChanged = true; - fSelections = (IStructuredSelection)selection; - + fSelections = (IStructuredSelection) selection; + if (fireChanged) fireChanged(); } } - - public void fireChanged() - { + + public void fireChanged() { SelectionChangedEvent evt = new SelectionChangedEvent(this, getSelection()); - for (int i=0; i<fListeners.size(); i++) - { - ((ISelectionChangedListener)fListeners.get(i)).selectionChanged(evt); + for (int i = 0; i < fListeners.size(); i++) { + fListeners.get(i).selectionChanged(evt); } } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged + * (org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection viewPaneSelection = event.getSelection(); - - if (viewPaneSelection instanceof IStructuredSelection) - { - Object selected = ((IStructuredSelection)viewPaneSelection).getFirstElement(); - - if (selected != null) - { - StructuredSelection strucSelection = new StructuredSelection(new Object[]{selected}); + + if (viewPaneSelection instanceof IStructuredSelection) { + Object selected = ((IStructuredSelection) viewPaneSelection).getFirstElement(); + + if (selected != null) { + StructuredSelection strucSelection = new StructuredSelection(new Object[] { selected }); setSelection(strucSelection); - } - else - { + } else { setSelection(viewPaneSelection); } } } } - - class MemoryViewPartListener implements IPartListener2 - { + + class MemoryViewPartListener implements IPartListener2 { IMemoryRenderingSite fView = null; - - public MemoryViewPartListener(IMemoryRenderingSite view) - { + + public MemoryViewPartListener(IMemoryRenderingSite view) { fView = view; } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference) + /* + * (non-Javadoc) + * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui. + * IWorkbenchPartReference) */ + @Override public void partActivated(IWorkbenchPartReference ref) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference) + /* + * (non-Javadoc) + * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui. + * IWorkbenchPartReference) */ + @Override public void partBroughtToTop(IWorkbenchPartReference ref) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) + /* + * (non-Javadoc) + * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui. + * IWorkbenchPartReference) */ + @Override public void partClosed(IWorkbenchPartReference ref) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) + /* + * (non-Javadoc) + * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui. + * IWorkbenchPartReference) */ + @Override public void partDeactivated(IWorkbenchPartReference ref) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference) + /* + * (non-Javadoc) + * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui. + * IWorkbenchPartReference) */ + @Override public void partHidden(IWorkbenchPartReference ref) { - + IWorkbenchPart part = ref.getPart(false); - - if (part == fView) - { + + if (part == fView) { setVisible(false); } } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference) + /* + * (non-Javadoc) + * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui. + * IWorkbenchPartReference) */ + @Override public void partVisible(IWorkbenchPartReference ref) { IWorkbenchPart part = ref.getPart(false); - - if (part == fView) - { + + if (part == fView) { setVisible(true); restoreView(); } } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) + /* + * (non-Javadoc) + * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui. + * IWorkbenchPartReference) */ + @Override public void partInputChanged(IWorkbenchPartReference ref) { } - public void partOpened(IWorkbenchPartReference ref) - { + @Override + public void partOpened(IWorkbenchPartReference ref) { } } - + + @Override public void init(IViewSite site) throws PartInitException { super.init(site); - - fViewCnt ++; + + fViewCnt++; String secondaryId = site.getSecondaryId(); if (secondaryId != null) MemoryViewIdRegistry.registerView(secondaryId); - + // only do this the first time // not sure if there is a bug in the UI... if the view is // not a primary view and if it's hidden, the view is not // init and created until it becomes visible. - if (fViewCnt == 1) - { + if (fViewCnt == 1) { // also try to find other views and register - if (DebugUIPlugin.getActiveWorkbenchWindow() != null && - DebugUIPlugin.getActiveWorkbenchWindow().getActivePage() != null) - { + if (DebugUIPlugin.getActiveWorkbenchWindow() != null && DebugUIPlugin.getActiveWorkbenchWindow().getActivePage() != null) { IViewReference references[] = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage().getViewReferences(); - for (int i=0; i<references.length; i++) - { - if (references[i].getSecondaryId() != null) - { + for (int i = 0; i < references.length; i++) { + if (references[i].getSecondaryId() != null) { MemoryViewIdRegistry.registerView(references[i].getSecondaryId()); } } } } - + fSyncService = new MemoryViewSynchronizationService(); } - - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) + + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets + * .Composite) */ + @Override public void createPartControl(Composite parent) { fSashForm = new SashForm(parent, SWT.HORIZONTAL); - + fSelectionProvider = new MemoryViewSelectionProvider(); - + // set up selection provider and listeners getSite().setSelectionProvider(fSelectionProvider); createMemoryBlocksTreeViewPane(fSashForm); createRenderingViewPane(IDebugUIConstants.ID_RENDERING_VIEW_PANE_1); createRenderingViewPane(IDebugUIConstants.ID_RENDERING_VIEW_PANE_2); - + setVisible(true); - + // set up weights in sashform - Integer[] weights = (Integer[])fWeights.toArray(new Integer[fWeights.size()]); + Integer[] weights = fWeights.toArray(new Integer[fWeights.size()]); int[] intWeights = new int[weights.length]; - for (int i=0; i<weights.length; i++) - { + for (int i = 0; i < weights.length; i++) { intWeights[i] = weights[i].intValue(); } fSashForm.setWeights(intWeights); loadViewPanesVisibility(); - + createOrientationActions(); loadOrientation(); - + fPartListener = new MemoryViewPartListener(this); getSite().getPage().addPartListener(fPartListener); activateHandlers(); @@ -344,45 +369,45 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { restoreView(); } - - public void activateHandlers() { - ICommandService commandSupport = (ICommandService)getSite().getService(ICommandService.class); - IHandlerService handlerService = (IHandlerService)getSite().getService(IHandlerService.class); - IContextService contextSupport = (IContextService)getSite().getService(IContextService.class); - - if (commandSupport != null && handlerService != null && contextSupport != null) - { + public void activateHandlers() { + ICommandService commandSupport = (ICommandService) getSite().getService(ICommandService.class); + IHandlerService handlerService = (IHandlerService) getSite().getService(IHandlerService.class); + IContextService contextSupport = (IContextService) getSite().getService(IContextService.class); + + if (commandSupport != null && handlerService != null && contextSupport != null) { contextSupport.activateContext(ID_MEMORY_VIEW_CONTEXT); - + fAddHandler = new AbstractHandler() { - public Object execute(ExecutionEvent event) throws ExecutionException { - IAdaptable context = DebugUITools.getPartDebugContext(getSite()); - if (context != null && MemoryViewUtil.isValidSelection(new StructuredSelection(context))) - { - RetargetAddMemoryBlockAction action = new RetargetAddMemoryBlockAction(MemoryView.this); - action.run(); - action.dispose(); - } - return null; - }}; - handlerService.activateHandler(ID_ADD_MEMORY_BLOCK_COMMAND, fAddHandler); - - fToggleMonitorsHandler = new AbstractHandler() { - public Object execute(ExecutionEvent event) throws ExecutionException { - ToggleMemoryMonitorsAction action = new ToggleMemoryMonitorsAction(); - action.init(MemoryView.this); + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + IAdaptable context = DebugUITools.getPartDebugContext(getSite()); + if (context != null && MemoryViewUtil.isValidSelection(new StructuredSelection(context))) { + RetargetAddMemoryBlockAction action = new RetargetAddMemoryBlockAction(MemoryView.this); action.run(); action.dispose(); - return null; } - }; - + return null; + } + }; + handlerService.activateHandler(ID_ADD_MEMORY_BLOCK_COMMAND, fAddHandler); + + fToggleMonitorsHandler = new AbstractHandler() { + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + ToggleMemoryMonitorsAction action = new ToggleMemoryMonitorsAction(); + action.init(MemoryView.this); + action.run(); + action.dispose(); + return null; + } + }; + handlerService.activateHandler(ID_TOGGLE_MEMORY_MONITORS_PANE_COMMAND, fToggleMonitorsHandler); - + fNextMemoryBlockHandler = new AbstractHandler() { - public Object execute(ExecutionEvent event) - throws ExecutionException { + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { SwitchMemoryBlockAction action = new SwitchMemoryBlockAction(); action.init(MemoryView.this); action.run(); @@ -391,22 +416,20 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { } }; handlerService.activateHandler(ID_NEXT_MEMORY_BLOCK_COMMAND, fNextMemoryBlockHandler); - + fCloseRenderingHandler = new AbstractHandler() { - public Object execute(ExecutionEvent event) - throws ExecutionException { - + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + IMemoryRenderingContainer container = getContainer(fActivePaneId); - if (container != null) - { + if (container != null) { if (container instanceof RenderingViewPane) { if (!((RenderingViewPane) container).canRemoveRendering()) return null; } IMemoryRendering activeRendering = container.getActiveRendering(); - if (activeRendering != null) - { + if (activeRendering != null) { container.removeMemoryRendering(activeRendering); } } @@ -415,17 +438,16 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { } }; handlerService.activateHandler(ID_CLOSE_RENDERING_COMMAND, fCloseRenderingHandler); - + fNewRenderingHandler = new AbstractHandler() { - public Object execute(ExecutionEvent event) - throws ExecutionException { + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + + IMemoryRenderingContainer container = getContainer(fActivePaneId); - IMemoryRenderingContainer container = getContainer(fActivePaneId); - - if (container != null && container instanceof RenderingViewPane) - { - RenderingViewPane pane = (RenderingViewPane)container; + if (container != null && container instanceof RenderingViewPane) { + RenderingViewPane pane = (RenderingViewPane) container; if (pane.canAddRendering()) pane.showCreateRenderingTab(); } @@ -434,46 +456,47 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { }; handlerService.activateHandler(ID_NEW_RENDERING_COMMAND, fNewRenderingHandler); } - } - + } + /** * */ private void createMemoryBlocksTreeViewPane(Composite parent) { - + fMemBlkViewer = new MemoryBlocksTreeViewPane(this); fViewPanes.put(MemoryBlocksTreeViewPane.PANE_ID, fMemBlkViewer); ViewForm viewerViewForm = new ViewForm(parent, SWT.NONE); PlatformUI.getWorkbench().getHelpSystem().setHelp(viewerViewForm, IDebugUIConstants.PLUGIN_ID + ".MemoryView_context"); //$NON-NLS-1$ fViewPaneControls.put(MemoryBlocksTreeViewPane.PANE_ID, viewerViewForm); fWeights.add(new Integer(15)); - + fMemBlkViewer.addSelectionListener(fSelectionProvider); - + Control viewerControl = fMemBlkViewer.createViewPane(viewerViewForm, MemoryBlocksTreeViewPane.PANE_ID, DebugUIMessages.MemoryView_Memory_monitors); viewerViewForm.setContent(viewerControl); - + ISelection selection = fMemBlkViewer.getSelectionProvider().getSelection(); if (selection != null) - fSelectionProvider.setSelection(selection); + fSelectionProvider.setSelection(selection); - ToolBarManager viewerToolBarMgr = new ToolBarManager(SWT.FLAT); + ToolBarManager viewerToolBarMgr = new ToolBarManager(SWT.FLAT); IAction[] actions = fMemBlkViewer.getActions(); - for (int i=0; i<actions.length; i++) - { + for (int i = 0; i < actions.length; i++) { viewerToolBarMgr.add(actions[i]); } ToolBar viewerToolbar = viewerToolBarMgr.createControl(viewerViewForm); viewerViewForm.setTopRight(viewerToolbar); - + Label viewerLabel = new Label(viewerViewForm, SWT.WRAP); - viewerLabel.setText(DebugUIMessages.MemoryView_Memory_monitors); + viewerLabel.setText(DebugUIMessages.MemoryView_Memory_monitors); viewerViewForm.setTopLeft(viewerLabel); - + fMemBlkViewer.getControl().addFocusListener(new FocusAdapter() { + @Override public void focusGained(FocusEvent e) { fActivePaneId = fMemBlkViewer.getId(); - }}); + } + }); } /** @@ -482,11 +505,14 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { */ private Listener createDeactivateListener(final IMemoryViewPane viewPane) { Listener deactivateListener = new Listener() { - private String id=viewPane.getId(); + private String id = viewPane.getId(); + + @Override public void handleEvent(Event event) { if (fActivePaneId.equals(id)) viewPane.removeSelctionListener(fSelectionProvider); - }}; + } + }; return deactivateListener; } @@ -495,12 +521,15 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { */ private Listener createActivateListener(final IMemoryViewPane viewPane) { Listener activateListener = new Listener() { - private String id=viewPane.getId(); + private String id = viewPane.getId(); + + @Override public void handleEvent(Event event) { fActivePaneId = id; viewPane.addSelectionListener(fSelectionProvider); fSelectionProvider.setSelection(viewPane.getSelectionProvider().getSelection()); - }}; + } + }; return activateListener; } @@ -508,167 +537,174 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { * */ public void createRenderingViewPane(final String paneId) { - final RenderingViewPane renderingPane = new RenderingViewPane(this); + final RenderingViewPane renderingPane = new RenderingViewPane(this); fViewPanes.put(paneId, renderingPane); ViewForm renderingViewForm = new ViewForm(fSashForm, SWT.NONE); fViewPaneControls.put(paneId, renderingViewForm); fWeights.add(new Integer(40)); - + Control renderingControl = renderingPane.createViewPane(renderingViewForm, paneId, DebugUIMessages.MemoryView_Memory_renderings, true, true); PlatformUI.getWorkbench().getHelpSystem().setHelp(renderingControl, IDebugUIConstants.PLUGIN_ID + ".MemoryView_context"); //$NON-NLS-1$ renderingViewForm.setContent(renderingControl); - + Listener renderingActivateListener = createActivateListener(renderingPane); renderingControl.addListener(SWT.Activate, renderingActivateListener); - + Listener renderingDeactivateListener = createDeactivateListener(renderingPane); renderingControl.addListener(SWT.Deactivate, renderingDeactivateListener); } - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.ui.part.WorkbenchPart#setFocus() */ + @Override public void setFocus() { if (fActivePaneId == null) fActivePaneId = fMemBlkViewer.getId(); - + IMemoryViewPane pane = getViewPane(fActivePaneId); pane.getControl().setFocus(); } - + + @Override public void dispose() { - getSite().getPage().removePartListener(fPartListener); - - Enumeration enumeration = fViewPanes.elements(); - while (enumeration.hasMoreElements()) - { + getSite().getPage().removePartListener(fPartListener); + + Enumeration<IMemoryViewPane> enumeration = fViewPanes.elements(); + while (enumeration.hasMoreElements()) { Object element = enumeration.nextElement(); - if (element instanceof IMemoryViewPane) - { - ((IMemoryViewPane)element).dispose(); + if (element instanceof IMemoryViewPane) { + ((IMemoryViewPane) element).dispose(); } } - + fViewPaneControls.clear(); - + IViewSite viewSite = getViewSite(); String secondaryId = viewSite.getSecondaryId(); if (secondaryId != null) MemoryViewIdRegistry.deregisterView(secondaryId); - + fSyncService.shutdown(); - + if (fAddHandler != null) fAddHandler.dispose(); - + if (fToggleMonitorsHandler != null) fToggleMonitorsHandler.dispose(); - + if (fNextMemoryBlockHandler != null) fNextMemoryBlockHandler.dispose(); - + super.dispose(); } - - private void setVisible(boolean visible) - { + + private void setVisible(boolean visible) { IMemoryViewPane[] viewPanes = getViewPanes(); - - for (int i=0; i<viewPanes.length; i++) - { + + for (int i = 0; i < viewPanes.length; i++) { // if currently visible, take view pane's visibility into account // else force view pane to be visible if it is listed in // "visible view panes" array list. if (fVisible) viewPanes[i].setVisible(visible && viewPanes[i].isVisible()); - else - { + else { if (isViewPaneVisible(viewPanes[i].getId())) viewPanes[i].setVisible(visible); - } + } } - + fVisible = visible; } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#getViewPane(java.lang.String) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#getViewPane + * (java.lang.String) */ public IMemoryViewPane getViewPane(String paneId) { - return (IMemoryViewPane)fViewPanes.get(paneId); - } + return fViewPanes.get(paneId); + } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#getViewPanes() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#getViewPanes + * () */ public IMemoryViewPane[] getViewPanes() { IMemoryViewPane[] viewPanes = new IMemoryViewPane[fViewPanes.size()]; - Enumeration enumeration = fViewPanes.elements(); - int i=0; - while (enumeration.hasMoreElements()) - { - viewPanes[i] = (IMemoryViewPane)enumeration.nextElement(); + Enumeration<IMemoryViewPane> enumeration = fViewPanes.elements(); + int i = 0; + while (enumeration.hasMoreElements()) { + viewPanes[i] = enumeration.nextElement(); i++; } - + return viewPanes; } - + /** - * Restore each view pane from the memory view based on current - * debug selection + * Restore each view pane from the memory view based on current debug + * selection */ private void restoreView() { IMemoryViewPane[] viewPanes = getViewPanes(); - for (int i=0; i<viewPanes.length; i++) - { + for (int i = 0; i < viewPanes.length; i++) { viewPanes[i].restoreViewPane(); } } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#showViewPane(boolean, java.lang.String) + + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#showViewPane + * (boolean, java.lang.String) */ public void showViewPane(boolean show, String paneId) { - - Control viewPaneControl = (Control)fViewPaneControls.get(paneId); - - if (viewPaneControl != null) - { + + Control viewPaneControl = fViewPaneControls.get(paneId); + + if (viewPaneControl != null) { Control children[] = fSashForm.getChildren(); - - for (int i=0; i<children.length; i++) - { - if (children[i] == viewPaneControl) - { + + for (int i = 0; i < children.length; i++) { + if (children[i] == viewPaneControl) { children[i].setVisible(show); - IMemoryViewPane viewPane = (IMemoryViewPane)fViewPanes.get(paneId); + IMemoryViewPane viewPane = fViewPanes.get(paneId); if (viewPane != null) viewPane.setVisible(show); } } fSashForm.layout(); } - + storeViewPaneVisibility(); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#isViewPaneVisible(java.lang.String) + + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView# + * isViewPaneVisible(java.lang.String) */ public boolean isViewPaneVisible(String paneId) { return fVisibleViewPanes.contains(paneId); } - - private void storeViewPaneVisibility() { + + private void storeViewPaneVisibility() { fVisibleViewPanes.clear(); - StringBuffer visibleViewPanes= new StringBuffer(); - - Enumeration enumeration = fViewPaneControls.keys(); - + StringBuffer visibleViewPanes = new StringBuffer(); + + Enumeration<String> enumeration = fViewPaneControls.keys(); + while (enumeration.hasMoreElements()) { - String paneId = (String)enumeration.nextElement(); - - Control control = (Control)fViewPaneControls.get(paneId); + String paneId = enumeration.nextElement(); + + Control control = fViewPaneControls.get(paneId); if (control.isVisible()) { visibleViewPanes.append(paneId); visibleViewPanes.append(","); //$NON-NLS-1$ @@ -676,7 +712,7 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { } } IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); - if(node != null) { + if (node != null) { try { node.put(getVisibilityPrefId(), visibleViewPanes.toString()); node.flush(); @@ -685,66 +721,53 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { } } } - + private void loadViewPanesVisibility() { - String visiblePanes = Platform.getPreferencesService().getString( - DebugUIPlugin.getUniqueIdentifier(), - getVisibilityPrefId(), - null, - null); - + String visiblePanes = Platform.getPreferencesService().getString(DebugUIPlugin.getUniqueIdentifier(), getVisibilityPrefId(), null, null); + if (visiblePanes != null && visiblePanes.length() > 0) { StringTokenizer tokenizer = new StringTokenizer(visiblePanes, ","); //$NON-NLS-1$ - while (tokenizer.hasMoreTokens()) - { + while (tokenizer.hasMoreTokens()) { String paneId = tokenizer.nextToken(); fVisibleViewPanes.add(paneId); } - } - else { - for (int i=0 ;i<defaultVisiblePaneIds.length; i++) - { + } else { + for (int i = 0; i < defaultVisiblePaneIds.length; i++) { fVisibleViewPanes.add(defaultVisiblePaneIds[i]); } } - - Enumeration enumeration = fViewPaneControls.keys(); - while (enumeration.hasMoreElements()) - { - String paneId = (String)enumeration.nextElement(); + + Enumeration<String> enumeration = fViewPaneControls.keys(); + while (enumeration.hasMoreElements()) { + String paneId = enumeration.nextElement(); boolean visible = false; - if(fVisibleViewPanes.contains(paneId)) + if (fVisibleViewPanes.contains(paneId)) visible = true; - - Control control = (Control)fViewPaneControls.get(paneId); + + Control control = fViewPaneControls.get(paneId); control.setVisible(visible); - - IMemoryViewPane viewPane = (IMemoryViewPane)fViewPanes.get(paneId); + + IMemoryViewPane viewPane = fViewPanes.get(paneId); viewPane.setVisible(visible); } - + fSashForm.layout(); } - + private void loadOrientation() { - fViewOrientation = Platform.getPreferencesService().getInt( - DebugUIPlugin.getUniqueIdentifier(), - getOrientationPrefId(), - HORIZONTAL_VIEW_ORIENTATION, - null); - - for (int i=0; i<fOrientationActions.length; i++) { - if (fOrientationActions[i].getOrientation() == fViewOrientation) - { + fViewOrientation = Platform.getPreferencesService().getInt(DebugUIPlugin.getUniqueIdentifier(), getOrientationPrefId(), HORIZONTAL_VIEW_ORIENTATION, null); + + for (int i = 0; i < fOrientationActions.length; i++) { + if (fOrientationActions[i].getOrientation() == fViewOrientation) { fOrientationActions[i].run(); } } updateOrientationActions(); } - + private void saveOrientation() { IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); - if(node != null) { + if (node != null) { try { node.putInt(getOrientationPrefId(), fViewOrientation); node.flush(); @@ -753,97 +776,100 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { } } } - - private void updateOrientationActions() - { - for (int i=0; i<fOrientationActions.length; i++) - { - if (fOrientationActions[i].getOrientation() == fViewOrientation) - { + + private void updateOrientationActions() { + for (int i = 0; i < fOrientationActions.length; i++) { + if (fOrientationActions[i].getOrientation() == fViewOrientation) { fOrientationActions[i].setChecked(true); - } - else - { + } else { fOrientationActions[i].setChecked(false); } - + } } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingSite#getSynchronizationService() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.memory.IMemoryRenderingSite#getSynchronizationService + * () */ + @Override public IMemoryRenderingSynchronizationService getSynchronizationService() { return fSyncService; } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingSite#getMemoryRenderingContainers() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.memory.IMemoryRenderingSite#getMemoryRenderingContainers + * () */ + @Override public IMemoryRenderingContainer[] getMemoryRenderingContainers() { - Enumeration enumeration = fViewPanes.elements(); - ArrayList containers = new ArrayList(); - while (enumeration.hasMoreElements()){ + Enumeration<IMemoryViewPane> enumeration = fViewPanes.elements(); + ArrayList<Object> containers = new ArrayList<Object>(); + while (enumeration.hasMoreElements()) { Object obj = enumeration.nextElement(); if (obj instanceof IMemoryRenderingContainer) containers.add(obj); } - - return (IMemoryRenderingContainer[])containers.toArray(new IMemoryRenderingContainer[containers.size()]); + + return containers.toArray(new IMemoryRenderingContainer[containers.size()]); } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingSite#getContainer(java.lang.String) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.memory.IMemoryRenderingSite#getContainer(java.lang + * .String) */ + @Override public IMemoryRenderingContainer getContainer(String id) { - Object viewPane = fViewPanes.get(id); - + Object viewPane = fViewPanes.get(id); + if (viewPane instanceof IMemoryRenderingContainer) - return (IMemoryRenderingContainer)viewPane; - + return (IMemoryRenderingContainer) viewPane; + return null; } public boolean isPinMBDisplay() { return fPinMBDisplay; } - public void setPinMBDisplay(boolean pinMBDisplay) { fPinMBDisplay = pinMBDisplay; } - - private String getVisibilityPrefId() - { + + private String getVisibilityPrefId() { IViewSite vs = getViewSite(); String viewId = vs.getSecondaryId(); - + if (viewId != null) return VISIBILITY_PREF + "." + viewId; //$NON-NLS-1$ return VISIBILITY_PREF; } - - private String getOrientationPrefId() - { + + private String getOrientationPrefId() { IViewSite vs = getViewSite(); String viewId = vs.getSecondaryId(); - + if (viewId != null) return VIEW_PANE_ORIENTATION_PREF + "." + viewId; //$NON-NLS-1$ return VIEW_PANE_ORIENTATION_PREF; } - - private void createOrientationActions() - { + + private void createOrientationActions() { IActionBars actionBars = getViewSite().getActionBars(); IMenuManager viewMenu = actionBars.getMenuManager(); - + fOrientationActions = new ViewPaneOrientationAction[2]; fOrientationActions[0] = new ViewPaneOrientationAction(this, HORIZONTAL_VIEW_ORIENTATION); fOrientationActions[1] = new ViewPaneOrientationAction(this, VERTICAL_VIEW_ORIENTATION); - + viewMenu.add(new Separator()); MenuManager layoutSubMenu = new MenuManager(VariablesViewMessages.VariablesView_40); layoutSubMenu.add(fOrientationActions[0]); @@ -851,24 +877,23 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { viewMenu.add(layoutSubMenu); viewMenu.add(new Separator()); } - - public void setViewPanesOrientation(int orientation) - { + + public void setViewPanesOrientation(int orientation) { fViewOrientation = orientation; if (fViewOrientation == VERTICAL_VIEW_ORIENTATION) fSashForm.setOrientation(SWT.VERTICAL); else fSashForm.setOrientation(SWT.HORIZONTAL); - + saveOrientation(); updateOrientationActions(); } - - public int getViewPanesOrientation() - { + + public int getViewPanesOrientation() { return fViewOrientation; } + @Override public void setContainerVisible(String id, boolean visible) { showViewPane(visible, id); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewIdRegistry.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewIdRegistry.java index f26a4901e..92c3d6686 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewIdRegistry.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewIdRegistry.java @@ -14,50 +14,43 @@ import java.util.ArrayList; /** * Class for managing the secondary ids for Memory View - * + * */ -public class MemoryViewIdRegistry{ - - private static ArrayList fgRegistry; - - public static void registerView(String secondaryId) - { - ArrayList registry = getRegistry(); - - if (!registry.contains(secondaryId)) - { +public class MemoryViewIdRegistry { + + private static ArrayList<String> fgRegistry; + + public static void registerView(String secondaryId) { + ArrayList<String> registry = getRegistry(); + + if (!registry.contains(secondaryId)) { registry.add(secondaryId); } } - - public static void deregisterView(String secondaryId) - { - ArrayList registry = getRegistry(); - - if (registry.contains(secondaryId)) - { + + public static void deregisterView(String secondaryId) { + ArrayList<String> registry = getRegistry(); + + if (registry.contains(secondaryId)) { registry.remove(secondaryId); } } - - public static String getUniqueSecondaryId(String viewId) - { + + public static String getUniqueSecondaryId(String viewId) { int cnt = 0; String id = viewId + "." + cnt; //$NON-NLS-1$ - ArrayList registry = getRegistry(); - while (registry.contains(id)) - { - cnt ++; + ArrayList<String> registry = getRegistry(); + while (registry.contains(id)) { + cnt++; id = viewId + "." + cnt; //$NON-NLS-1$ } return id; } - - private static ArrayList getRegistry() - { + + private static ArrayList<String> getRegistry() { if (fgRegistry == null) - fgRegistry = new ArrayList(); - + fgRegistry = new ArrayList<String>(); + return fgRegistry; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewPrefAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewPrefAction.java index 9b54d9fc2..8980ef6f0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewPrefAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewPrefAction.java @@ -24,37 +24,41 @@ import org.eclipse.ui.IViewPart; public class MemoryViewPrefAction implements IViewActionDelegate { + @Override public void init(IViewPart view) { } + @Override public void run(IAction action) { - + PreferenceManager prefManager = new PreferenceManager(); - + ResetMemoryBlockPreferencePage page = new ResetMemoryBlockPreferencePage(); - IPreferenceNode node = new PreferenceNode("org.eclipse.debug.ui.memory.resetMemoryBlock", page); //$NON-NLS-1$ + IPreferenceNode node = new PreferenceNode("org.eclipse.debug.ui.memory.resetMemoryBlock", page); //$NON-NLS-1$ prefManager.addToRoot(node); - + SetPaddedStringPreferencePage page2 = new SetPaddedStringPreferencePage(); - IPreferenceNode node2 = new PreferenceNode("org.eclipse.debug.ui.memory.setPaddedString", page2); //$NON-NLS-1$ + IPreferenceNode node2 = new PreferenceNode("org.eclipse.debug.ui.memory.setPaddedString", page2); //$NON-NLS-1$ prefManager.addToRoot(node2); CodePagesPreferencePage page3 = new CodePagesPreferencePage(); - IPreferenceNode node3 = new PreferenceNode("org.eclipse.debug.ui.memory.codePages", page3); //$NON-NLS-1$ + IPreferenceNode node3 = new PreferenceNode("org.eclipse.debug.ui.memory.codePages", page3); //$NON-NLS-1$ prefManager.addToRoot(node3); - + final PreferenceDialog dialog = new PreferenceDialog(DebugUIPlugin.getShell(), prefManager); BusyIndicator.showWhile(DebugUIPlugin.getStandardDisplay(), new Runnable() { + @Override public void run() { dialog.create(); dialog.open(); } - }); + }); } + @Override public void selectionChanged(IAction action, ISelection selection) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java index c99109a02..4669b9a4a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java @@ -27,63 +27,59 @@ import org.eclipse.swt.widgets.Display; /** * Synchronization service for the memory view. + * * @since 3.1 */ -public class MemoryViewSynchronizationService implements - IMemoryRenderingSynchronizationService, IMemoryBlockListener, IPropertyChangeListener { +public class MemoryViewSynchronizationService implements IMemoryRenderingSynchronizationService, IMemoryBlockListener, IPropertyChangeListener { private static final int ENABLED = 0; private static final int ENABLING = 1; private static final int DISABLED = 2; - - private Hashtable fSynchronizeInfo; + + private Hashtable<IMemoryBlock, SynchronizeInfo> fSynchronizeInfo; private int fEnableState = ENABLED; - private Hashtable fPropertyListeners; - + private Hashtable<IPropertyChangeListener, PropertyListener> fPropertyListeners; + private IMemoryRendering fLastChangedRendering; private IMemoryRendering fSyncServiceProvider; private static final boolean DEBUG_SYNC_SERVICE = false; - - public MemoryViewSynchronizationService() - { - fSynchronizeInfo = new Hashtable(); - fPropertyListeners = new Hashtable(); + + public MemoryViewSynchronizationService() { + fSynchronizeInfo = new Hashtable<IMemoryBlock, SynchronizeInfo>(); + fPropertyListeners = new Hashtable<IPropertyChangeListener, PropertyListener>(); MemoryViewUtil.getMemoryBlockManager().addListener(this); } /** - * Wrapper for ISynchronizedMemoryBlockView - * Holds a list of property filters for the view. + * Wrapper for ISynchronizedMemoryBlockView Holds a list of property filters + * for the view. */ - class PropertyListener - { + class PropertyListener { IPropertyChangeListener fListener; String[] fFilters; - - public PropertyListener(IPropertyChangeListener listener, String[] properties) - { + + public PropertyListener(IPropertyChangeListener listener, String[] properties) { fListener = listener; - - if(properties != null) - { + + if (properties != null) { fFilters = properties; } } /** - * If the property matches one of the filters, the property - * is valid and the view should be notified about its change. + * If the property matches one of the filters, the property is valid and + * the view should be notified about its change. + * * @param property the property * @return if the property is specified in the filter */ - public boolean isValidProperty(String property){ - if (fFilters == null) + public boolean isValidProperty(String property) { + if (fFilters == null) { return true; - for (int i=0; i<fFilters.length; i++) - { - if (fFilters[i].equals(property)) - { + } + for (int i = 0; i < fFilters.length; i++) { + if (fFilters[i].equals(property)) { return true; } } @@ -91,11 +87,12 @@ public class MemoryViewSynchronizationService implements } /** - * Set property filters, indicating what property change events - * the listener is interested in. + * Set property filters, indicating what property change events the + * listener is interested in. + * * @param filters the property filters or <code>null</code> */ - public void setPropertyFilters(String[] filters){ + public void setPropertyFilters(String[] filters) { fFilters = filters; } @@ -106,241 +103,257 @@ public class MemoryViewSynchronizationService implements return fListener; } } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.IMemoryBlockViewSynchronizer#getSynchronizedProperty(org.eclipse.debug.ui.ISynchronizedMemoryBlockView, java.lang.String) + + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.IMemoryBlockViewSynchronizer#getSynchronizedProperty + * (org.eclipse.debug.ui.ISynchronizedMemoryBlockView, java.lang.String) */ - public Object getSynchronizedProperty(IMemoryBlock memoryBlock, String propertyId) - { - SynchronizeInfo info = (SynchronizeInfo)fSynchronizeInfo.get(memoryBlock); - - if (info != null) - { + public Object getSynchronizedProperty(IMemoryBlock memoryBlock, String propertyId) { + SynchronizeInfo info = fSynchronizeInfo.get(memoryBlock); + + if (info != null) { Object value = info.getProperty(propertyId); return value; } - + return null; } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.IMemoryBlockListener#MemoryBlockAdded(org.eclipse.debug.core.model.IMemoryBlock) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.IMemoryBlockListener#MemoryBlockAdded(org.eclipse + * .debug.core.model.IMemoryBlock) */ + @Override public void memoryBlocksAdded(IMemoryBlock[] memoryBlocks) { // do nothing when a memory block is added // create a synchronize info object when there is a fView // tab registered to be synchronized. - - + } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.IMemoryBlockListener#MemoryBlockRemoved(org.eclipse.debug.core.model.IMemoryBlock) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.IMemoryBlockListener#MemoryBlockRemoved(org.eclipse + * .debug.core.model.IMemoryBlock) */ + @Override public void memoryBlocksRemoved(IMemoryBlock[] memoryBlocks) { - + // Sync info can be null if the service is already shut down - if (fSynchronizeInfo == null) + if (fSynchronizeInfo == null) { return; - - for (int i=0; i<memoryBlocks.length; i++) - { + } + + for (int i = 0; i < memoryBlocks.length; i++) { IMemoryBlock memory = memoryBlocks[i]; - - if (fLastChangedRendering != null && fLastChangedRendering.getMemoryBlock() == memory) + + if (fLastChangedRendering != null && fLastChangedRendering.getMemoryBlock() == memory) { fLastChangedRendering = null; - - if (fSyncServiceProvider != null && fSyncServiceProvider.getMemoryBlock() == memory) + } + + if (fSyncServiceProvider != null && fSyncServiceProvider.getMemoryBlock() == memory) { fSyncServiceProvider = null; - + } + // delete the info object and remove it from fSynchronizeInfo // when the memory block is deleted - SynchronizeInfo info = (SynchronizeInfo)fSynchronizeInfo.get(memory); - - if (info != null) - { + SynchronizeInfo info = fSynchronizeInfo.get(memory); + + if (info != null) { info.delete(); fSynchronizeInfo.remove(memory); } } } - + /** * Clean up when the plug-in is shutdown */ - public void shutdown() - { - if (fSynchronizeInfo != null) - { - Enumeration enumeration = fSynchronizeInfo.elements(); - + public void shutdown() { + if (fSynchronizeInfo != null) { + Enumeration<SynchronizeInfo> enumeration = fSynchronizeInfo.elements(); + // clean up all synchronize info objects - while (enumeration.hasMoreElements()){ - SynchronizeInfo info = (SynchronizeInfo)enumeration.nextElement(); + while (enumeration.hasMoreElements()) { + SynchronizeInfo info = enumeration.nextElement(); info.delete(); } - + fSynchronizeInfo.clear(); fSynchronizeInfo = null; } MemoryViewUtil.getMemoryBlockManager().removeListener(this); } - - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener, java.lang.String[]) + + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService# + * addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener, + * java.lang.String[]) */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener, String[] properties) { fPropertyListeners.put(listener, new PropertyListener(listener, properties)); } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService# + * removePropertyChangeListener + * (org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { - if (fPropertyListeners.containsKey(listener)) - { + if (fPropertyListeners.containsKey(listener)) { fPropertyListeners.remove(listener); } } - + /** * Fire property change events + * * @param evt the event to fire */ - public void firePropertyChanged(final PropertyChangeEvent evt) - { + public void firePropertyChanged(final PropertyChangeEvent evt) { // do not fire property changed event if the synchronization // service is disabled - if (fEnableState == DISABLED) + if (fEnableState == DISABLED) { return; - + } + // Make sure the synchronizer does not swallow any events // Values of the properties are updated in the syncrhonizer immediately. // Change events are queued up on the UI Thread. - Display.getDefault().syncExec(new Runnable() - { - public void run() - { - if (fSynchronizeInfo == null) + Display.getDefault().syncExec(new Runnable() { + @Override + public void run() { + if (fSynchronizeInfo == null) { return; - - IMemoryRendering rendering = (IMemoryRendering)evt.getSource(); + } + + IMemoryRendering rendering = (IMemoryRendering) evt.getSource(); String propertyId = evt.getProperty(); - - SynchronizeInfo info = (SynchronizeInfo)fSynchronizeInfo.get(rendering.getMemoryBlock()); - if (info != null) - { + + SynchronizeInfo info = fSynchronizeInfo.get(rendering.getMemoryBlock()); + if (info != null) { Object value = info.getProperty(propertyId); - if (value != null) - { - Enumeration enumeration = fPropertyListeners.elements(); - - while(enumeration.hasMoreElements()) - { - PropertyListener listener = (PropertyListener)enumeration.nextElement(); - + if (value != null) { + Enumeration<PropertyListener> enumeration = fPropertyListeners.elements(); + + while (enumeration.hasMoreElements()) { + PropertyListener listener = enumeration.nextElement(); + IPropertyChangeListener origListener = listener.getListener(); - - // if it's a valid property - valid means that it's listed in the property filters - if (listener.isValidProperty(propertyId)){ + + // if it's a valid property - valid means that it's + // listed in the property filters + if (listener.isValidProperty(propertyId)) { PropertyChangeNotifier notifier = new PropertyChangeNotifier(origListener, evt); - SafeRunner.run(notifier); + SafeRunner.run(notifier); } } } } } }); - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService#getProperty(org.eclipse.debug.core.model.IMemoryBlock, java.lang.String) + } + + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService# + * getProperty(org.eclipse.debug.core.model.IMemoryBlock, java.lang.String) */ + @Override public Object getProperty(IMemoryBlock block, String property) { - + // When the synchronization service is disabled // return null for all queries to properties // This is to ensure that renderings are not synchronized // to new synchronization properties when the sync service is // disabled. - if (!isEnabled()) + if (!isEnabled()) { return null; - - SynchronizeInfo info = (SynchronizeInfo)fSynchronizeInfo.get(block); - - if (info != null) + } + + SynchronizeInfo info = fSynchronizeInfo.get(block); + + if (info != null) { return info.getProperty(property); - + } + return null; } - - /* (non-Javadoc) - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse + * .jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { - if (event == null || !(event.getSource() instanceof IMemoryRendering)) - { + if (event == null || !(event.getSource() instanceof IMemoryRendering)) { return; } - + // Do not handle any property changed event as the // sync service is being enabled. // Otherwise, current sync info provider may overwrite - // sync info unexpectedly. We want to sync with the rendering + // sync info unexpectedly. We want to sync with the rendering // that is last changed. - if (fEnableState == ENABLING) + if (fEnableState == ENABLING) { return; - - IMemoryRendering rendering = ((IMemoryRendering)event.getSource()); + } + + IMemoryRendering rendering = ((IMemoryRendering) event.getSource()); IMemoryBlock memoryBlock = rendering.getMemoryBlock(); String propertyId = event.getProperty(); Object value = event.getNewValue(); - - if (DEBUG_SYNC_SERVICE) - { + + if (DEBUG_SYNC_SERVICE) { DebugUIPlugin.trace("SYNC SERVICE RECEIVED CHANGED EVENT:"); //$NON-NLS-1$ DebugUIPlugin.trace("Source: " + rendering); //$NON-NLS-1$ DebugUIPlugin.trace("Property: " + propertyId); //$NON-NLS-1$ DebugUIPlugin.trace("Value: " + value); //$NON-NLS-1$ - - if (value instanceof BigInteger) - { - DebugUIPlugin.trace("Value in hex: " + ((BigInteger)value).toString(16)); //$NON-NLS-1$ + + if (value instanceof BigInteger) { + DebugUIPlugin.trace("Value in hex: " + ((BigInteger) value).toString(16)); //$NON-NLS-1$ } } - - if (memoryBlock == null) + + if (memoryBlock == null) { return; - - if (propertyId == null) + } + + if (propertyId == null) { return; - + } + // find the synchronize info object for the memory block - SynchronizeInfo info = (SynchronizeInfo)fSynchronizeInfo.get(memoryBlock); - + SynchronizeInfo info = fSynchronizeInfo.get(memoryBlock); + // if info is not available, need to create one to hold the property - if (info == null) - { + if (info == null) { info = new SynchronizeInfo(memoryBlock); fSynchronizeInfo.put(memoryBlock, info); } - + // get the value of the property Object oldValue = info.getProperty(propertyId); - - if (oldValue == null) - { + + if (oldValue == null) { // if the value has never been added to the info object // set the property and fire a change event info.setProperty(propertyId, value); fLastChangedRendering = rendering; firePropertyChanged(event); return; - } - else if (!oldValue.equals(value)) - { + } else if (!oldValue.equals(value)) { // if the value has changed // set the property and fire a change event info.setProperty(propertyId, value); @@ -348,60 +361,57 @@ public class MemoryViewSynchronizationService implements firePropertyChanged(event); } } - - public void setEnabled(boolean enabled) - { - if (enabled && fEnableState == ENABLED) + + public void setEnabled(boolean enabled) { + if (enabled && fEnableState == ENABLED) { return; - - if (!enabled && fEnableState == DISABLED) + } + + if (!enabled && fEnableState == DISABLED) { return; - - try - { - if (enabled) - { + } + + try { + if (enabled) { fEnableState = ENABLING; - // get sync info from the sync service provider - if (fLastChangedRendering != null) - { + // get sync info from the sync service provider + if (fLastChangedRendering != null) { IMemoryBlock memBlock = fLastChangedRendering.getMemoryBlock(); - SynchronizeInfo info = (SynchronizeInfo)fSynchronizeInfo.get(memBlock); + SynchronizeInfo info = fSynchronizeInfo.get(memBlock); String[] ids = info.getPropertyIds(); - + // stop handling property changed event while the // synchronization service is being enabled // this is to get around problem when the last changed // rendering is not currently the sync info provider - - for (int i=0; i<ids.length; i++) - { + + for (int i = 0; i < ids.length; i++) { PropertyChangeEvent evt = new PropertyChangeEvent(fLastChangedRendering, ids[i], null, info.getProperty(ids[i])); firePropertyChanged(evt); } } } - } - finally - { - if (enabled) + } finally { + if (enabled) { fEnableState = ENABLED; - else + } else { fEnableState = DISABLED; + } } } - - public boolean isEnabled() - { + + public boolean isEnabled() { return fEnableState == ENABLED; } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService#setSynchronizationProvider(org.eclipse.debug.ui.memory.IMemoryRendering) + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService# + * setSynchronizationProvider(org.eclipse.debug.ui.memory.IMemoryRendering) */ + @Override public void setSynchronizationProvider(IMemoryRendering rendering) { - + if (DEBUG_SYNC_SERVICE) { DebugUIPlugin.trace("SYNCHRONIZATION PROVIDER: " + rendering); //$NON-NLS-1$ } @@ -413,11 +423,13 @@ public class MemoryViewSynchronizationService implements } fSyncServiceProvider = rendering; } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService#getSynchronizationProvider() + /* + * (non-Javadoc) + * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService# + * getSynchronizationProvider() */ + @Override public IMemoryRendering getSynchronizationProvider() { return fSyncServiceProvider; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java index b39cd4f10..1f7dd7c23 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java @@ -32,8 +32,9 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.progress.WorkbenchJob; /** - * Represents a tab in the Memory View. This is where memory renderings - * are hosted in the Memory View. + * Represents a tab in the Memory View. This is where memory renderings are + * hosted in the Memory View. + * * @since 3.1 */ public class MemoryViewTab implements IMemoryViewTab, IPropertyChangeListener, Listener { @@ -45,42 +46,42 @@ public class MemoryViewTab implements IMemoryViewTab, IPropertyChangeListener, L private boolean fIsDisposed = false; private Control fControl; private RenderingViewPane fContainer; - - - public MemoryViewTab(CTabItem tabItem, IMemoryRendering rendering, RenderingViewPane container) - { + + public MemoryViewTab(CTabItem tabItem, IMemoryRendering rendering, RenderingViewPane container) { fTabItem = tabItem; fRendering = rendering; fContainer = container; - + // set the rendering as the synchronization provider - // as the new rendering should be in focus and have control + // as the new rendering should be in focus and have control // after it's created - + if (container.getMemoryRenderingSite().getSynchronizationService() != null) container.getMemoryRenderingSite().getSynchronizationService().setSynchronizationProvider(rendering); Control control = createViewTab(); - + control.addListener(SWT.Activate, this); control.addListener(SWT.Deactivate, this); - + fTabItem.setControl(control); fTabItem.setData(this); fTabItem.setText(getLabel()); fTabItem.setImage(getImage()); - + fTabItem.addDisposeListener(fDisposeListener = new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fTabItem.removeDisposeListener(fDisposeListener); dispose(); - }}); + } + }); } - - private Control createViewTab() - { + + private Control createViewTab() { ISafeRunnable safeRunnable = new ISafeRunnable() { + @Override public void handleException(Throwable exception) { // create an error rendering to fill the view tab ErrorRendering rendering = new ErrorRendering(fRendering.getRenderingId(), exception); @@ -88,72 +89,80 @@ public class MemoryViewTab implements IMemoryViewTab, IPropertyChangeListener, L // dispose the rendering fRendering.dispose(); - + fRendering = rendering; fControl = rendering.createControl(fTabItem.getParent()); } + @Override public void run() throws Exception { fControl = fRendering.createControl(fTabItem.getParent()); fRendering.addPropertyChangeListener(getInstance()); - }}; - + } + }; + SafeRunner.run(safeRunnable); return fControl; } - - private String getLabel() - { + + private String getLabel() { return fRendering.getLabel(); } - - private Image getImage() - { + + private Image getImage() { return fRendering.getImage(); } - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#dispose() */ + @Override public void dispose() { - + if (fIsDisposed) return; - + fIsDisposed = true; - + fRendering.removePropertyChangeListener(this); - - if (!fControl.isDisposed()) - { + + if (!fControl.isDisposed()) { fControl.removeListener(SWT.Activate, this); fControl.removeListener(SWT.Deactivate, this); } - + // always deactivate rendering before disposing it. fRendering.deactivated(); - + fRendering.dispose(); } - - public boolean isDisposed() - { + + @Override + public boolean isDisposed() { return fIsDisposed; } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#isEnabled() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#isEnabled() */ + @Override public boolean isEnabled() { return fEnabled; } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#setEnabled(boolean) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#setEnabled( + * boolean) */ + @Override public void setEnabled(boolean enabled) { fEnabled = enabled; - + if (fEnabled) fRendering.becomesVisible(); else @@ -161,67 +170,73 @@ public class MemoryViewTab implements IMemoryViewTab, IPropertyChangeListener, L } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#setTabLabel(java.lang.String) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#setTabLabel + * (java.lang.String) */ + @Override public void setTabLabel(String label) { fTabItem.setText(label); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#getTabLabel() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#getTabLabel() */ + @Override public String getTabLabel() { return fTabItem.getText(); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#getRendering() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#getRendering() */ + @Override public IMemoryRendering getRendering() { return fRendering; } - /* (non-Javadoc) - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse + * .jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(final PropertyChangeEvent event) { - + // make sure this runs on the UI thread, otherwise, it // will get to a swt exception - + WorkbenchJob job = new WorkbenchJob("MemoryViewTab PropertyChanged") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (isDisposed()) return Status.OK_STATUS; - - if (event.getSource() == fRendering) - { - if (event.getProperty().equals(IBasicPropertyConstants.P_TEXT)) - { + + if (event.getSource() == fRendering) { + if (event.getProperty().equals(IBasicPropertyConstants.P_TEXT)) { Object value = event.getNewValue(); - if (value != null && value instanceof String) - { - String label = (String)value; + if (value != null && value instanceof String) { + String label = (String) value; setTabLabel(label); - } - else - { + } else { setTabLabel(fRendering.getLabel()); } } - - if (event.getProperty().equals(IBasicPropertyConstants.P_IMAGE)) - { + + if (event.getProperty().equals(IBasicPropertyConstants.P_IMAGE)) { Object value = event.getNewValue(); - if (value != null && value instanceof Image) - { - Image image = (Image)value; + if (value != null && value instanceof Image) { + Image image = (Image) value; fTabItem.setImage(image); - } - else - { + } else { fTabItem.setImage(fRendering.getImage()); } } @@ -232,23 +247,24 @@ public class MemoryViewTab implements IMemoryViewTab, IPropertyChangeListener, L job.setSystem(true); job.schedule(); } - - private MemoryViewTab getInstance() - { + + private MemoryViewTab getInstance() { return this; } - /* (non-Javadoc) - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) + /* + * (non-Javadoc) + * @see + * org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets. + * Event) */ + @Override public void handleEvent(Event event) { - if (event.type == SWT.Activate) - { + if (event.type == SWT.Activate) { fRendering.activated(); fContainer.setRenderingSelection(fRendering); } - if (event.type == SWT.Deactivate) - { + if (event.type == SWT.Deactivate) { fRendering.deactivated(); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java index 2862b623d..4eea20d3e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java @@ -19,22 +19,17 @@ import org.eclipse.debug.internal.ui.viewers.model.TreeModelContentProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer; -public class MemoryViewTreeModelContentProvider extends - TreeModelContentProvider { - +public class MemoryViewTreeModelContentProvider extends TreeModelContentProvider { + + @Override protected void updateNodes(IModelDelta[] nodes, int mask) { - - if (getViewer() instanceof TreeModelViewer) - { - for (int i = 0; i < nodes.length; i++) { + + if (getViewer() instanceof TreeModelViewer) { + for (int i = 0; i < nodes.length; i++) { IModelDelta node = nodes[i]; int flags = node.getFlags(); - if((mask & ITreeModelContentProvider.CONTROL_MODEL_DELTA_FLAGS) != 0 && - (flags & IModelDelta.ADDED) != 0 && - (flags & IModelDelta.SELECT) != 0 && - node.getElement() instanceof IMemoryBlock) - { + if ((mask & ITreeModelContentProvider.CONTROL_MODEL_DELTA_FLAGS) != 0 && (flags & IModelDelta.ADDED) != 0 && (flags & IModelDelta.SELECT) != 0 && node.getElement() instanceof IMemoryBlock) { if ((flags & IModelDelta.SELECT) != 0) { if (getPresentationContext().getPart() instanceof MemoryView) { MemoryView view = (MemoryView) getPresentationContext().getPart(); @@ -54,53 +49,51 @@ public class MemoryViewTreeModelContentProvider extends } flags = flags & mask; - if ((flags & IModelDelta.ADDED) != 0) { - handleAdd(node); - } - if ((flags & IModelDelta.REMOVED) != 0) { - handleRemove(node); - } - if ((flags & IModelDelta.CONTENT) != 0) { - handleContent(node); - } - if ((flags & IModelDelta.STATE) != 0) { - handleState(node); - } - if ((flags & IModelDelta.INSERTED) != 0) { - handleInsert(node); - } - if ((flags & IModelDelta.REPLACED) != 0) { - handleReplace(node); - } - if ((flags & IModelDelta.INSTALL) != 0) { - handleInstall(node); - } - if ((flags & IModelDelta.UNINSTALL) != 0) { - handleUninstall(node); - } - if ((flags & IModelDelta.EXPAND) != 0) { - handleExpand(node); - } - if ((flags & IModelDelta.COLLAPSE) != 0) { - handleCollapse(node); - } - if ((flags & IModelDelta.SELECT) != 0) { - handleSelect(node); - } - if ((flags & IModelDelta.REVEAL) != 0) { - handleReveal(node); - } - updateNodes(node.getChildDeltas(), mask); - } + if ((flags & IModelDelta.ADDED) != 0) { + handleAdd(node); + } + if ((flags & IModelDelta.REMOVED) != 0) { + handleRemove(node); + } + if ((flags & IModelDelta.CONTENT) != 0) { + handleContent(node); + } + if ((flags & IModelDelta.STATE) != 0) { + handleState(node); + } + if ((flags & IModelDelta.INSERTED) != 0) { + handleInsert(node); + } + if ((flags & IModelDelta.REPLACED) != 0) { + handleReplace(node); + } + if ((flags & IModelDelta.INSTALL) != 0) { + handleInstall(node); + } + if ((flags & IModelDelta.UNINSTALL) != 0) { + handleUninstall(node); + } + if ((flags & IModelDelta.EXPAND) != 0) { + handleExpand(node); + } + if ((flags & IModelDelta.COLLAPSE) != 0) { + handleCollapse(node); + } + if ((flags & IModelDelta.SELECT) != 0) { + handleSelect(node); + } + if ((flags & IModelDelta.REVEAL) != 0) { + handleReveal(node); + } + updateNodes(node.getChildDeltas(), mask); + } } } - - private boolean isFirstMemoryBlock() - { + + private boolean isFirstMemoryBlock() { Object input = getViewer().getInput(); - if (input instanceof IMemoryBlockRetrieval) - { - IMemoryBlock[] memoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks((IMemoryBlockRetrieval)input); + if (input instanceof IMemoryBlockRetrieval) { + IMemoryBlock[] memoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks((IMemoryBlockRetrieval) input); if (memoryBlocks.length == 1) return true; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java index e97c86ea1..2031204ee 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java @@ -17,29 +17,31 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer; import org.eclipse.swt.widgets.Composite; /** - * Customized tree viewer for the Memory View - * This Tree Viewer has a specialized update policy for the memory view. - * When the model fires a ADDED delta, the update policy handles the event as follows: - * If the ADDED delta is accompanied by SELECT, and the added element is an memory blok, then - * the udpate policy asks the Memory View if the it is currently pinned to a memory block. If the view - * is currently pinned, then the SELECT delta is ignored. + * Customized tree viewer for the Memory View This Tree Viewer has a specialized + * update policy for the memory view. When the model fires a ADDED delta, the + * update policy handles the event as follows: If the ADDED delta is accompanied + * by SELECT, and the added element is an memory blok, then the udpate policy + * asks the Memory View if the it is currently pinned to a memory block. If the + * view is currently pinned, then the SELECT delta is ignored. + * + * If the ADDED delta and SELECT delta are recieved in separate nodes, then the + * delta will be handled as-is and would not take the pinning state of the + * memory view into account. * - * If the ADDED delta and SELECT delta are recieved in separate nodes, then the delta will be handled as-is and would - * not take the pinning state of the memory view into account. - * */ public class MemoryViewTreeViewer extends TreeModelViewer { - public MemoryViewTreeViewer(Composite parent, int style, - IPresentationContext context) { + public MemoryViewTreeViewer(Composite parent, int style, IPresentationContext context) { super(parent, style, context); } - - /* - * Need to have a customized content provider to define a special update policy for the Memory View - * (non-Javadoc) - * @see org.eclipse.debug.internal.ui.viewers.model.InternalTreeModelViewer#createContentProvider() + + /* + * Need to have a customized content provider to define a special update + * policy for the Memory View (non-Javadoc) + * @see org.eclipse.debug.internal.ui.viewers.model.InternalTreeModelViewer# + * createContentProvider() */ + @Override protected ITreeModelContentProvider createContentProvider() { return new MemoryViewTreeModelContentProvider(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java index 7836738b8..2957f11e4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java @@ -39,69 +39,36 @@ import org.eclipse.ui.progress.UIJob; * @since 3.0 */ public class MemoryViewUtil { - - public static final int[] ignoreKeyEvents = - { - SWT.ARROW_UP, - SWT.ARROW_DOWN, - SWT.ARROW_LEFT, - SWT.ARROW_RIGHT, - SWT.PAGE_UP, - SWT.PAGE_DOWN, - SWT.HOME, - SWT.END, - SWT.INSERT, - SWT.F1, - SWT.F2, - SWT.F3, - SWT.F4, - SWT.F5, - SWT.F6, - SWT.F7, - SWT.F8, - SWT.F9, - SWT.F10, - SWT.F11, - SWT.F12, - SWT.F13, - SWT.F14, - SWT.F15, - SWT.HELP, - SWT.CAPS_LOCK, - SWT.NUM_LOCK, - SWT.SCROLL_LOCK, - SWT.PAUSE, - SWT.BREAK, - SWT.PRINT_SCREEN, - SWT.ESC, - SWT.CTRL, - SWT.ALT, - SWT.SHIFT - }; - - public static ArrayList MEMORY_BLOCKS_HISTORY = new ArrayList(); - + + public static final int[] ignoreKeyEvents = { + SWT.ARROW_UP, SWT.ARROW_DOWN, SWT.ARROW_LEFT, SWT.ARROW_RIGHT, + SWT.PAGE_UP, SWT.PAGE_DOWN, SWT.HOME, SWT.END, SWT.INSERT, SWT.F1, + SWT.F2, SWT.F3, SWT.F4, SWT.F5, SWT.F6, SWT.F7, SWT.F8, SWT.F9, + SWT.F10, SWT.F11, SWT.F12, SWT.F13, SWT.F14, SWT.F15, SWT.HELP, + SWT.CAPS_LOCK, SWT.NUM_LOCK, SWT.SCROLL_LOCK, SWT.PAUSE, SWT.BREAK, + SWT.PRINT_SCREEN, SWT.ESC, SWT.CTRL, SWT.ALT, SWT.SHIFT }; + + public static ArrayList<String> MEMORY_BLOCKS_HISTORY = new ArrayList<String>(); + /** * @param selection * @return true if the given selection is valid for creating a memory block */ static public boolean isValidSelection(ISelection selection) { - + if (!(selection instanceof IStructuredSelection)) return false; - - //only single selection is allowed for this action - if (selection.isEmpty() || ((IStructuredSelection)selection).size() > 1) - { + + // only single selection is allowed for this action + if (selection.isEmpty() || ((IStructuredSelection) selection).size() > 1) { return false; } - - Object elem = ((IStructuredSelection)selection).getFirstElement(); - + + Object elem = ((IStructuredSelection) selection).getFirstElement(); + return isValidContext(elem); } - /** * @param elem * @return @@ -110,78 +77,75 @@ public class MemoryViewUtil { // if not debug element if (!(elem instanceof IAdaptable)) return false; - - IMemoryBlockRetrieval memRetrieval =(IMemoryBlockRetrieval) ((IAdaptable)elem).getAdapter(IMemoryBlockRetrieval.class); + + IMemoryBlockRetrieval memRetrieval = (IMemoryBlockRetrieval) ((IAdaptable) elem).getAdapter(IMemoryBlockRetrieval.class); IDebugTarget debugTarget = null; if (elem instanceof IDebugElement) { - debugTarget = ((IDebugElement)elem).getDebugTarget(); + debugTarget = ((IDebugElement) elem).getDebugTarget(); } else { - debugTarget = (IDebugTarget)((IAdaptable)elem).getAdapter(IDebugTarget.class); + debugTarget = (IDebugTarget) ((IAdaptable) elem).getAdapter(IDebugTarget.class); } - - if (memRetrieval == null) - { - // if debug element returns null from getAdapter, assume its debug target is going to retrieve memory blocks + + if (memRetrieval == null) { + // if debug element returns null from getAdapter, assume its debug + // target is going to retrieve memory blocks memRetrieval = debugTarget; } - + // not valid if the debug target is already terminated if (debugTarget != null && (debugTarget.isTerminated() || debugTarget.isDisconnected())) return false; - + if (memRetrieval != null && memRetrieval.supportsStorageRetrieval()) { return true; } - + return false; - } + } - /** * Helper function to open an error dialog. + * * @param title * @param message * @param e */ - static public void openError (final String title, final String message, final Exception e) - { - UIJob uiJob = new UIJob("open error"){ //$NON-NLS-1$ + static public void openError(final String title, final String message, final Exception e) { + UIJob uiJob = new UIJob("open error") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { -// open error for the exception + // open error for the exception String detail = IInternalDebugCoreConstants.EMPTY_STRING; if (e != null) detail = e.getMessage(); - + Shell shell = DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); - - MessageDialog.openError( - shell, - title, - message + "\n" + detail); //$NON-NLS-1$ + + MessageDialog.openError(shell, title, message + "\n" + detail); //$NON-NLS-1$ return Status.OK_STATUS; - }}; + } + }; uiJob.setSystem(true); uiJob.schedule(); } - - static IMemoryBlockManager getMemoryBlockManager() - { + + static IMemoryBlockManager getMemoryBlockManager() { return DebugPlugin.getDefault().getMemoryBlockManager(); } - - static public boolean isLinuxGTK() - { + + static public boolean isLinuxGTK() { String ws = Platform.getWS(); return ws.equals(Platform.WS_GTK); } - + /** - * Checks to see if the event is valid for activating - * cell editing in a view tab + * Checks to see if the event is valid for activating cell editing in a view + * tab + * * @param event - * @return true if the edit event is valid for activating the cell editor + * @return true if the edit event is valid for activating the cell editor */ public static boolean isValidEditEvent(int event) { for (int i = 0; i < MemoryViewUtil.ignoreKeyEvents.length; i++) { @@ -190,76 +154,71 @@ public class MemoryViewUtil { } return true; } - - public static BigInteger alignToBoundary(BigInteger integer, int numberOfUnitsPerLine) - { + + public static BigInteger alignToBoundary(BigInteger integer, int numberOfUnitsPerLine) { BigInteger[] result = integer.divideAndRemainder(BigInteger.valueOf(numberOfUnitsPerLine)); integer = integer.subtract(result[1]); return integer; } - - public static void addHistory(String expression) - { + + public static void addHistory(String expression) { if (!MEMORY_BLOCKS_HISTORY.contains(expression)) MEMORY_BLOCKS_HISTORY.add(0, expression); - + if (MEMORY_BLOCKS_HISTORY.size() > 5) - MEMORY_BLOCKS_HISTORY.remove(MEMORY_BLOCKS_HISTORY.size()-1); + MEMORY_BLOCKS_HISTORY.remove(MEMORY_BLOCKS_HISTORY.size() - 1); } - - public static String[] getHistory() - { - return (String[])MEMORY_BLOCKS_HISTORY.toArray(new String[MEMORY_BLOCKS_HISTORY.size()]); + + public static String[] getHistory() { + return MEMORY_BLOCKS_HISTORY.toArray(new String[MEMORY_BLOCKS_HISTORY.size()]); } - + /** * Return the memory block retrieval of the given object + * * @param object - * @return the memory block retrieval of the given object or <code>null</code> - * if no memory block retrieval can be found - * - * Returning null for the memory block retrieval will result in errors in operations - * that follow. - * - * Non-standard debug models must provide a memory block retrieval via - * <code>getAdapter(IMemoryBlockRetrieval.class</code> + * @return the memory block retrieval of the given object or + * <code>null</code> if no memory block retrieval can be found + * + * Returning null for the memory block retrieval will result in + * errors in operations that follow. + * + * Non-standard debug models must provide a memory block retrieval + * via <code>getAdapter(IMemoryBlockRetrieval.class</code> */ - public static IMemoryBlockRetrieval getMemoryBlockRetrieval(Object object) - { + public static IMemoryBlockRetrieval getMemoryBlockRetrieval(Object object) { IMemoryBlockRetrieval retrieval = null; - - // if memory block extension, retrieval must be queired throught its interface + + // if memory block extension, retrieval must be queired throught its + // interface if (object instanceof IMemoryBlockExtension) - return ((IMemoryBlockExtension)object).getMemoryBlockRetrieval(); + return ((IMemoryBlockExtension) object).getMemoryBlockRetrieval(); // check if the object can adapt to a memory block retrieval - if (object instanceof IAdaptable) - { - IAdaptable adaptable = (IAdaptable)object; - retrieval = (IMemoryBlockRetrieval)adaptable.getAdapter(IMemoryBlockRetrieval.class); + if (object instanceof IAdaptable) { + IAdaptable adaptable = (IAdaptable) object; + retrieval = (IMemoryBlockRetrieval) adaptable.getAdapter(IMemoryBlockRetrieval.class); } - - // if cannot adapt and the object itself is already an IMemoryBlockRetrieval, return that. - if (retrieval == null && object instanceof IMemoryBlockRetrieval) - { - retrieval = (IMemoryBlockRetrieval)object; + + // if cannot adapt and the object itself is already an + // IMemoryBlockRetrieval, return that. + if (retrieval == null && object instanceof IMemoryBlockRetrieval) { + retrieval = (IMemoryBlockRetrieval) object; } - + // otherewise, default back to the debug target - if (retrieval == null && object instanceof IDebugElement) - { - IDebugElement de = (IDebugElement)object; + if (retrieval == null && object instanceof IDebugElement) { + IDebugElement de = (IDebugElement) object; retrieval = de.getDebugTarget(); } - + return retrieval; } - + /** * Returns the hash code for this object, as an Integer. * */ - public static Integer getHashCode(Object o) - { + public static Integer getHashCode(Object o) { return new Integer(o.hashCode()); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java index 474a6ea74..937f26044 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java @@ -11,7 +11,6 @@ package org.eclipse.debug.internal.ui.views.memory; - import org.eclipse.debug.core.model.IMemoryBlockRetrieval; import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension; import org.eclipse.debug.internal.core.IInternalDebugCoreConstants; @@ -33,7 +32,7 @@ import org.eclipse.ui.PlatformUI; /** * @since 3.0 */ -public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListener{ +public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListener { private Combo expressionInput; private Text lengthInput; @@ -42,30 +41,36 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen private boolean needLength = true; private String fPrefillExp = null; private String fPrefillLength = null; - + /** - * the predefined width of the wrapping label for the expression to enter combo + * the predefined width of the wrapping label for the expression to enter + * combo + * * @since 3.3 */ private static final int LABEL_WIDTH = 210; - + /** * @param parentShell */ public MonitorMemoryBlockDialog(Shell parentShell, IMemoryBlockRetrieval memRetrieval, String prefillExp, String prefillLength) { super(parentShell); - + if (memRetrieval instanceof IMemoryBlockRetrievalExtension) needLength = false; - + fPrefillExp = prefillExp; fPrefillLength = prefillLength; setShellStyle(getShellStyle() | SWT.RESIZE); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets + * .Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite comp = (Composite) super.createDialogArea(parent); SWTFactory.createWrapLabel(comp, DebugUIMessages.MonitorMemoryBlockDialog_EnterExpressionToMonitor, 1, LABEL_WIDTH); @@ -74,7 +79,7 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen expressionInput.setText(fPrefillExp); } expressionInput.addModifyListener(this); - + if (needLength) { SWTFactory.createLabel(comp, DebugUIMessages.MonitorMemoryBlockDialog_NumberOfBytes, 1); lengthInput = SWTFactory.createSingleText(comp, 1); @@ -86,32 +91,39 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IDebugUIConstants.PLUGIN_ID + ".MonitorMemoryBlockDialog_context"); //$NON-NLS-1$ return comp; } - /* (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) + + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets + * .Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); - + newShell.setText(DebugUIMessages.MonitorMemoryBlockDialog_MonitorMemory); } - + /** * @return the entered expression */ public String getExpression() { return expression; } - + /** * @return the entered length */ public String getLength() { return length; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { expression = expressionInput.getText(); @@ -125,43 +137,47 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen super.okPressed(); } - /* (non-Javadoc) - * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events + * .ModifyEvent) */ + @Override public void modifyText(ModifyEvent e) { updateOKButtonState(); } private void updateOKButtonState() { - if (needLength) - { + if (needLength) { String lengthText = lengthInput.getText(); String input = expressionInput.getText(); - - if (input == null || input.equals(IInternalDebugCoreConstants.EMPTY_STRING) || lengthText == null || lengthText.equals(IInternalDebugCoreConstants.EMPTY_STRING)) - { - getButton(IDialogConstants.OK_ID).setEnabled(false); - } - else - { + + if (input == null || input.equals(IInternalDebugCoreConstants.EMPTY_STRING) || lengthText == null || lengthText.equals(IInternalDebugCoreConstants.EMPTY_STRING)) { + getButton(IDialogConstants.OK_ID).setEnabled(false); + } else { getButton(IDialogConstants.OK_ID).setEnabled(true); - } + } } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets.Composite) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets + * .Composite) */ + @Override protected Control createButtonBar(Composite parent) { - - Control ret = super.createButtonBar(parent); - + + Control ret = super.createButtonBar(parent); + if (needLength) updateOKButtonState(); else // always enable the OK button if we only need the expression getButton(IDialogConstants.OK_ID).setEnabled(true); - + return ret; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/NewMemoryViewAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/NewMemoryViewAction.java index 2e62da38d..b6afd1e24 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/NewMemoryViewAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/NewMemoryViewAction.java @@ -30,22 +30,25 @@ import org.eclipse.ui.PartInitException; public class NewMemoryViewAction implements IViewActionDelegate { private MemoryView fView; + + @Override public void init(IViewPart view) { if (view instanceof MemoryView) - fView = (MemoryView)view; + fView = (MemoryView) view; } + @Override public void run(IAction action) { - + String secondaryId = MemoryViewIdRegistry.getUniqueSecondaryId(IDebugUIConstants.ID_MEMORY_VIEW); try { IWorkbenchPage page = DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(); IViewPart newView = page.showView(IDebugUIConstants.ID_MEMORY_VIEW, secondaryId, IWorkbenchPage.VIEW_ACTIVATE); - + // set initial selection for new view setInitialSelection(newView); setInitialViewSettings(newView); - + } catch (PartInitException e) { // if view cannot be opened, open error DebugUIPlugin.log(e); @@ -54,52 +57,47 @@ public class NewMemoryViewAction implements IViewActionDelegate { private void setInitialSelection(IViewPart newView) { ISelection selection = fView.getSite().getSelectionProvider().getSelection(); - if (selection instanceof IStructuredSelection) - { - IStructuredSelection strucSel = (IStructuredSelection)selection; - + if (selection instanceof IStructuredSelection) { + IStructuredSelection strucSel = (IStructuredSelection) selection; + // return if current selection is empty if (strucSel.isEmpty()) return; - + Object obj = strucSel.getFirstElement(); - + if (obj == null) return; - - if (obj instanceof IMemoryRendering) - { - IMemoryBlock memBlock = ((IMemoryRendering)obj).getMemoryBlock(); + + if (obj instanceof IMemoryRendering) { + IMemoryBlock memBlock = ((IMemoryRendering) obj).getMemoryBlock(); strucSel = new StructuredSelection(memBlock); newView.getSite().getSelectionProvider().setSelection(strucSel); - } - else if (obj instanceof IMemoryBlock) - { + } else if (obj instanceof IMemoryBlock) { newView.getSite().getSelectionProvider().setSelection(strucSel); } } } private void setInitialViewSettings(IViewPart newView) { - if (fView != null && newView instanceof MemoryView) - { - MemoryView newMView = (MemoryView)newView; + if (fView != null && newView instanceof MemoryView) { + MemoryView newMView = (MemoryView) newView; IMemoryViewPane[] viewPanes = fView.getViewPanes(); int orientation = fView.getViewPanesOrientation(); - for (int i=0; i<viewPanes.length; i++) - { + for (int i = 0; i < viewPanes.length; i++) { // copy view pane visibility newMView.showViewPane(fView.isViewPaneVisible(viewPanes[i].getId()), viewPanes[i].getId()); } - + // do not want to copy renderings as it could be very expensive // create a blank view and let user creates renderings as needed - + // set orientation of new view newMView.setViewPanesOrientation(orientation); } } + @Override public void selectionChanged(IAction action, ISelection selection) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PinMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PinMemoryBlockAction.java index 93f5fa3d3..c4ee61cb6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PinMemoryBlockAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PinMemoryBlockAction.java @@ -17,30 +17,34 @@ import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; /** - * Action for pinning the display of the memory view to - * the current memory block. The view would not change - * selection when a new memory block is added if the diplay is pinned. - * + * Action for pinning the display of the memory view to the current memory + * block. The view would not change selection when a new memory block is added + * if the diplay is pinned. + * */ public class PinMemoryBlockAction implements IViewActionDelegate { private MemoryView fView; + + @Override public void init(IViewPart view) { if (view instanceof MemoryView) - fView = (MemoryView)view; + fView = (MemoryView) view; } + @Override public void run(IAction action) { if (fView == null) return; - + boolean pin = !fView.isPinMBDisplay(); fView.setPinMBDisplay(pin); - + action.setChecked(pin); } + @Override public void selectionChanged(IAction action, ISelection selection) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PropertyChangeNotifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PropertyChangeNotifier.java index 4b50660d2..558cd48bd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PropertyChangeNotifier.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PropertyChangeNotifier.java @@ -17,32 +17,37 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; /** - * Fire properties changes events in ISafeRunnable to ensure that - * exceptions are caught and handled. + * Fire properties changes events in ISafeRunnable to ensure that exceptions are + * caught and handled. + * * @since 3.1 */ -public class PropertyChangeNotifier implements ISafeRunnable -{ - +public class PropertyChangeNotifier implements ISafeRunnable { + IPropertyChangeListener fListener; PropertyChangeEvent fEvt; - - public PropertyChangeNotifier(IPropertyChangeListener listener, PropertyChangeEvent evt) - { + + public PropertyChangeNotifier(IPropertyChangeListener listener, PropertyChangeEvent evt) { fListener = listener; fEvt = evt; } - - /* (non-Javadoc) - * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) + + /* + * (non-Javadoc) + * @see + * org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable + * ) */ + @Override public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.core.runtime.ISafeRunnable#run() */ + @Override public void run() throws Exception { fListener.propertyChange(fEvt); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java index 0b5618cba..d0fb67ef6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java @@ -18,60 +18,60 @@ import org.eclipse.debug.ui.memory.IMemoryRendering; import org.eclipse.debug.ui.memory.IMemoryRenderingContainer; import org.eclipse.jface.action.Action; - /** - * Remove Memory Rendering action - * This action serves two purposes: - * - remove memory rendering from Memory Rendering Pane - * - quck way to remove a memory block from Memory Rendering Pane + * Remove Memory Rendering action This action serves two purposes: - remove + * memory rendering from Memory Rendering Pane - quck way to remove a memory + * block from Memory Rendering Pane + * + * When user clicks on the this tool bar action, it simply removes the top view + * tab from Memory Rendering Pane. * - * When user clicks on the this tool bar action, it simply removes - * the top view tab from Memory Rendering Pane. * @since 3.0 */ -public class RemoveMemoryRenderingAction extends Action -{ +public class RemoveMemoryRenderingAction extends Action { private IMemoryRenderingContainer fViewPane; - public RemoveMemoryRenderingAction(IMemoryRenderingContainer viewPane) - { + + public RemoveMemoryRenderingAction(IMemoryRenderingContainer viewPane) { // create action as drop down - super(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering, AS_PUSH_BUTTON); - setText(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering); + super(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering, AS_PUSH_BUTTON); + setText(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering); - setToolTipText(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering); - setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_MEMORY)); + setToolTipText(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering); + setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_MEMORY)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_REMOVE_MEMORY)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_MEMORY)); fViewPane = viewPane; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { - + // user has click on the RemoveMemoryRendering button IMemoryViewTab topTab = getViewTab(); - - if (topTab != null) - { + + if (topTab != null) { IMemoryRendering rendering = topTab.getRendering(); - - if (rendering != null) - { + + if (rendering != null) { fViewPane.removeMemoryRendering(rendering); } } } - /* (non-Javadoc) - * @see com.ibm.debug.defaultrenderings.internal.actions.AbstractMemoryAction#getViewTab() + /* + * (non-Javadoc) + * @see + * com.ibm.debug.defaultrenderings.internal.actions.AbstractMemoryAction + * #getViewTab() */ IMemoryViewTab getViewTab() { - if (fViewPane instanceof IMemoryView) - { - return ((IMemoryView)fViewPane).getTopMemoryTab(); + if (fViewPane instanceof IMemoryView) { + return ((IMemoryView) fViewPane).getTopMemoryTab(); } return null; - } + } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java index c908ef62b..43a741344 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java @@ -19,51 +19,56 @@ import org.eclipse.ui.IViewPart; /** * @since 3.0 - * + * */ public class RemoveRenderingContextAction implements IViewActionDelegate { private IMemoryRenderingSite fMemoryView; - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { - if (view instanceof IMemoryRenderingSite) - { - fMemoryView = (IMemoryRenderingSite)view; + if (view instanceof IMemoryRenderingSite) { + fMemoryView = (IMemoryRenderingSite) view; } } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fMemoryView == null) return; - + IMemoryRenderingContainer container = getRenderingContainer(action); - if (container != null) - { + if (container != null) { RemoveMemoryRenderingAction removeAction = new RemoveMemoryRenderingAction(container); removeAction.run(); } } - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action + * .IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { IMemoryRenderingContainer container = getRenderingContainer(action); - if (container instanceof RenderingViewPane) - { - if (!((RenderingViewPane)container).canRemoveRendering()) + if (container instanceof RenderingViewPane) { + if (!((RenderingViewPane) container).canRemoveRendering()) action.setEnabled(false); else action.setEnabled(true); } } - + /** * @param action * @return @@ -72,16 +77,14 @@ public class RemoveRenderingContextAction implements IViewActionDelegate { IMemoryRenderingContainer[] viewPanes = fMemoryView.getMemoryRenderingContainers(); String actionId = action.getId(); IMemoryRenderingContainer selectedPane = null; - - for (int i=0; i<viewPanes.length; i++) - { - if (actionId.indexOf(viewPanes[i].getId()) != -1) - { + + for (int i = 0; i < viewPanes.length; i++) { + if (actionId.indexOf(viewPanes[i].getId()) != -1) { selectedPane = viewPanes[i]; break; } } - + return selectedPane; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java index d45f55b35..3628aa755 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -62,178 +62,179 @@ import org.eclipse.ui.IWorkbenchPreferenceConstants; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.UIJob; - - /** - * Represents a rendering view pane in the Memory View. - * This hosts the memory view tabs in the view. + * Represents a rendering view pane in the Memory View. This hosts the memory + * view tabs in the view. + * * @since 3.1 - * + * */ -public class RenderingViewPane extends AbstractMemoryViewPane implements IMemoryRenderingContainer{ +public class RenderingViewPane extends AbstractMemoryViewPane implements IMemoryRenderingContainer { public static final String RENDERING_VIEW_PANE_ID = DebugUIPlugin.getUniqueIdentifier() + ".MemoryView.RenderingViewPane"; //$NON-NLS-1$ - - private Hashtable fTabFolderForMemoryBlock = new Hashtable(); - private Hashtable fMemoryBlockFromTabFolder = new Hashtable(); + + private Hashtable<IMemoryBlock, CTabFolder> fTabFolderForMemoryBlock = new Hashtable<IMemoryBlock, CTabFolder>(); + private Hashtable<CTabFolder, IMemoryBlock> fMemoryBlockFromTabFolder = new Hashtable<CTabFolder, IMemoryBlock>(); private ViewPaneRenderingMgr fRenderingMgr; - + private IMemoryRenderingSite fRenderingSite; - private Set fAddedRenderings = new HashSet(); - private Set fAddedMemoryBlocks = new HashSet(); - + private Set<IMemoryRendering> fAddedRenderings = new HashSet<IMemoryRendering>(); + private Set<IMemoryBlock> fAddedMemoryBlocks = new HashSet<IMemoryBlock>(); + private boolean fCanAddRendering = true; private boolean fCanRemoveRendering = true; - + /** * @param parent is the view hosting this view pane * @param paneId is the identifier assigned by the Memory View * - * Pane id is assigned with the following format. - * Rendering view pane created has its id assigned to - * org.eclipse.debug.ui.MemoryView.RenderingViewPane.#. - * # is a number indicating the order of which the rendering view - * pane is created. First rendering view pane created will have its - * id assigned to org.eclipse.debug.ui.MemoryView.RenderingViewPane.1. - * Second rendering view pane created will have its id assigned to - * org.eclipse.debug.ui.MemoryView.RenderingViewPane.2. and so on. - * View pane are created from left to right by the Memory View. + * Pane id is assigned with the following format. Rendering view + * pane created has its id assigned to + * org.eclipse.debug.ui.MemoryView.RenderingViewPane.#. # is a + * number indicating the order of which the rendering view pane + * is created. First rendering view pane created will have its id + * assigned to + * org.eclipse.debug.ui.MemoryView.RenderingViewPane.1. Second + * rendering view pane created will have its id assigned to + * org.eclipse.debug.ui.MemoryView.RenderingViewPane.2. and so + * on. View pane are created from left to right by the Memory + * View. * */ public RenderingViewPane(IViewPart parent) { super(parent); - - if (parent instanceof IMemoryRenderingSite) - fRenderingSite = (IMemoryRenderingSite)parent; - else - { + + if (parent instanceof IMemoryRenderingSite) { + fRenderingSite = (IMemoryRenderingSite) parent; + } else { DebugUIPlugin.logErrorMessage("Parent for the rendering view pane is invalid."); //$NON-NLS-1$ } } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener#MemoryBlockAdded(org.eclipse.debug.core.model.IMemoryBlock) + + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.core.memory.IMemoryBlockListener#MemoryBlockAdded + * (org.eclipse.debug.core.model.IMemoryBlock) */ + @Override public void memoryBlocksAdded(final IMemoryBlock[] memoryBlocks) { Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { - - if (isDisposed()) + + if (isDisposed()) { return; - + } + // check condition before doing anything - if (memoryBlocks == null || memoryBlocks.length <= 0) + if (memoryBlocks == null || memoryBlocks.length <= 0) { return; - - for (int i=0; i<memoryBlocks.length; i++) - { + } + + for (int i = 0; i < memoryBlocks.length; i++) { IMemoryBlock memory = memoryBlocks[i]; - - if (!fTabFolderForMemoryBlock.containsKey(memory)) - { - createFolderForMemoryBlock(memory); - } + + if (!fTabFolderForMemoryBlock.containsKey(memory)) { + createFolderForMemoryBlock(memory); + } fAddedMemoryBlocks.add(memory); updateToolBarActionsEnablement(); } - }}); + } + }); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener#MemoryBlockRemoved(org.eclipse.debug.core.model.IMemoryBlock) + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener# + * MemoryBlockRemoved(org.eclipse.debug.core.model.IMemoryBlock) */ + @Override public void memoryBlocksRemoved(final IMemoryBlock[] memoryBlocks) { Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { - for (int j=0; j<memoryBlocks.length; j++) - { + for (int j = 0; j < memoryBlocks.length; j++) { IMemoryBlock mbRemoved = memoryBlocks[j]; - if (fTabFolderForMemoryBlock == null) - { + if (fTabFolderForMemoryBlock == null) { return; } - - // get all renderings from this memory block and remove them from the view + + // get all renderings from this memory block and remove them + // from the view IMemoryRendering[] renderings = fRenderingMgr.getRenderingsFromMemoryBlock(mbRemoved); - - for (int k=0; k<renderings.length; k++) - { + + for (int k = 0; k < renderings.length; k++) { removeMemoryRendering(renderings[k]); } - + // remove a the tab folder if the memory block is removed - CTabFolder tabFolder = - (CTabFolder) fTabFolderForMemoryBlock.get(mbRemoved); - - if (tabFolder == null) + CTabFolder tabFolder = fTabFolderForMemoryBlock.get(mbRemoved); + + if (tabFolder == null) { continue; - + } + fTabFolderForMemoryBlock.remove(mbRemoved); fMemoryBlockFromTabFolder.remove(tabFolder); IMemoryBlockRetrieval retrieve = MemoryViewUtil.getMemoryBlockRetrieval(mbRemoved); - if (retrieve != null) - { - if (fTabFolderForDebugView.contains(tabFolder)) - { + if (retrieve != null) { + if (fTabFolderForDebugView.contains(tabFolder)) { fTabFolderForDebugView.remove(MemoryViewUtil.getHashCode(retrieve)); } } - - if (!tabFolder.isDisposed()) { + + if (!tabFolder.isDisposed()) { // dispose all view tabs belonging to the tab folder CTabItem[] items = tabFolder.getItems(); - - for (int i=0; i<items.length; i++) - { + + for (int i = 0; i < items.length; i++) { disposeTab(items[i]); } - + // dispose the tab folder - tabFolder.dispose(); - + tabFolder.dispose(); + // if this is the top control - if (tabFolder == fStackLayout.topControl) - { - + if (tabFolder == fStackLayout.topControl) { + // if memory view is visible and have a selection // follow memory view's selection - + ISelection selection = DebugUIPlugin.getActiveWorkbenchWindow().getSelectionService().getSelection(IDebugUIConstants.ID_MEMORY_VIEW); IMemoryBlock mbToSelect = getMemoryBlock(selection); - - if (mbToSelect != null) - { - // memory view may not have got the event and is still displaying + + if (mbToSelect != null) { + // memory view may not have got the event and is + // still displaying // the deleted memory block - if (mbToSelect != mbRemoved) + if (mbToSelect != mbRemoved) { handleMemoryBlockSelection(null, mbToSelect); - else if ((MemoryViewUtil.getMemoryBlockManager().getMemoryBlocks(retrieve).length > 0)) - { + } else if ((MemoryViewUtil.getMemoryBlockManager().getMemoryBlocks(retrieve).length > 0)) { mbToSelect = MemoryViewUtil.getMemoryBlockManager().getMemoryBlocks(retrieve)[0]; - handleMemoryBlockSelection(null, mbToSelect); - } - else - { + handleMemoryBlockSelection(null, mbToSelect); + } else { emptyFolder(); } - } - else if (MemoryViewUtil.getMemoryBlockManager().getMemoryBlocks(retrieve).length > 0) - { // get to the next folder + } else if (MemoryViewUtil.getMemoryBlockManager().getMemoryBlocks(retrieve).length > 0) { // get + // to + // the + // next + // folder mbToSelect = MemoryViewUtil.getMemoryBlockManager().getMemoryBlocks(retrieve)[0]; handleMemoryBlockSelection(null, mbToSelect); - } - else - { + } else { emptyFolder(); - + } } - + // if not the top control // no need to do anything } - + fAddedMemoryBlocks.remove(mbRemoved); updateToolBarActionsEnablement(); } @@ -242,112 +243,127 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory } - /* (non-Javadoc) - * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui. + * IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(final IWorkbenchPart part, final ISelection selection) { - if (isDisposed()) + if (isDisposed()) { return; - + } + // do not schedule job if any of these conditions are true - if(part == RenderingViewPane.this) + if (part == RenderingViewPane.this) { return; - - if (!(selection instanceof IStructuredSelection)) + } + + if (!(selection instanceof IStructuredSelection)) { return; - - if (selection == AbstractMemoryViewPane.EMPTY) + } + + if (selection == AbstractMemoryViewPane.EMPTY) { return; - - UIJob job = new UIJob("RenderingViewPane selectionChanged"){ //$NON-NLS-1$ + } + + UIJob job = new UIJob("RenderingViewPane selectionChanged") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { try { - if (isDisposed()) + if (isDisposed()) { return Status.OK_STATUS; - - if (selection.isEmpty()) - { + } + + if (selection.isEmpty()) { // if the event comes from Memory View - // pick empty tab folder as the memory view is no longer displaying anything - if (part.getSite().getId().equals(IDebugUIConstants.ID_MEMORY_VIEW)) - { - if (part == getMemoryRenderingSite().getSite().getPart()) - { + // pick empty tab folder as the memory view is no longer + // displaying anything + if (part.getSite().getId().equals(IDebugUIConstants.ID_MEMORY_VIEW)) { + if (part == getMemoryRenderingSite().getSite().getPart()) { IMemoryViewTab lastViewTab = getTopMemoryTab(); - - if (lastViewTab != null) + + if (lastViewTab != null) { lastViewTab.setEnabled(false); - + } + emptyFolder(); } } - + // do not do anything if there is no selection - // In the case when a debug adpater fires a debug event incorrectly, Launch View sets - // selection to nothing. If the view tab is disabled, it erases all the "delta" information - // in the content. This may not be desirable as it will cause memory to show up as - // unchanged when it's actually changed. Do not disable the view tab until there is a + // In the case when a debug adpater fires a debug event + // incorrectly, Launch View sets + // selection to nothing. If the view tab is disabled, it + // erases all the "delta" information + // in the content. This may not be desirable as it will + // cause memory to show up as + // unchanged when it's actually changed. Do not disable + // the view tab until there is a // valid selection. - + return Status.OK_STATUS; } - + // back up current view tab IMemoryViewTab lastViewTab = getTopMemoryTab(); - - if (!(selection instanceof IStructuredSelection)) + + if (!(selection instanceof IStructuredSelection)) { return Status.OK_STATUS; + } - Object elem = ((IStructuredSelection)selection).getFirstElement(); - - if (elem instanceof IMemoryBlock) - { + Object elem = ((IStructuredSelection) selection).getFirstElement(); + + if (elem instanceof IMemoryBlock) { // if the selection event comes from this view - if (part == getMemoryRenderingSite()) - { - // find the folder associated with the given IMemoryBlockRetrieval - IMemoryBlock memBlock = (IMemoryBlock)elem; - + if (part == getMemoryRenderingSite()) { + // find the folder associated with the given + // IMemoryBlockRetrieval + IMemoryBlock memBlock = (IMemoryBlock) elem; + // should never get here... added code for safety - if (fTabFolderForMemoryBlock == null) - { - if (lastViewTab != null) + if (fTabFolderForMemoryBlock == null) { + if (lastViewTab != null) { lastViewTab.setEnabled(false); - + } + emptyFolder(); - return Status.OK_STATUS; + return Status.OK_STATUS; } - + handleMemoryBlockSelection(lastViewTab, memBlock); } } - } - catch(SWTException se) - { + } catch (SWTException se) { DebugUIPlugin.log(se); } return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } - + public void handleMemoryBlockSelection(final IMemoryViewTab lastViewTab, final IMemoryBlock memBlock) { // Do not check if the debug target of mb is removed - // We should not get into this method if the debug target of the memory block is terminated - // Memory Block Manager gets the terminate event and would have removed all memory blocks + // We should not get into this method if the debug target of the memory + // block is terminated + // Memory Block Manager gets the terminate event and would have removed + // all memory blocks // associated with the debug target - // Therefore, we will never try to set a selection to a memory block whose target is terminated + // Therefore, we will never try to set a selection to a memory block + // whose target is terminated // check current memory block CTabFolder currentFolder = (CTabFolder) fStackLayout.topControl; if (currentFolder != null && !currentFolder.isDisposed()) { - IMemoryBlock currentBlk = (IMemoryBlock) fMemoryBlockFromTabFolder.get(currentFolder); + IMemoryBlock currentBlk = fMemoryBlockFromTabFolder.get(currentFolder); if (currentBlk != null) { - if (currentBlk == memBlock) + if (currentBlk == memBlock) { return; + } } } @@ -360,26 +376,26 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory // if we've got a tabfolder to go with the IMemoryBlock, display // it if (fTabFolderForMemoryBlock.containsKey(memBlock)) { - if (fStackLayout.topControl != (CTabFolder) fTabFolderForMemoryBlock.get(memBlock)) { - setTabFolder((CTabFolder) fTabFolderForMemoryBlock.get(memBlock)); + if (fStackLayout.topControl != fTabFolderForMemoryBlock.get(memBlock)) { + setTabFolder(fTabFolderForMemoryBlock.get(memBlock)); fViewPaneCanvas.layout(); } } else { // otherwise, add a new one CTabFolder folder = createTabFolder(fViewPaneCanvas); - + fTabFolderForMemoryBlock.put(memBlock, folder); fMemoryBlockFromTabFolder.put(folder, memBlock); - setTabFolder((CTabFolder) fTabFolderForMemoryBlock.get(memBlock)); + setTabFolder(fTabFolderForMemoryBlock.get(memBlock)); fViewPaneCanvas.layout(); fAddedMemoryBlocks.add(memBlock); - + newCreateRenderingForFolder(memBlock, folder); } // restore view tabs IMemoryRendering[] renderings = fRenderingMgr.getRenderingsFromMemoryBlock(memBlock); CTabFolder toDisplay = (CTabFolder) fStackLayout.topControl; - + // if only CreateRendering is present, restore renderings if (isRestoreViewTabs(toDisplay)) { restoreViewTabs(renderings); @@ -403,80 +419,81 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory } IMemoryViewTab viewTab = getTopMemoryTab(); - if (viewTab != null) + if (viewTab != null) { setRenderingSelection(viewTab.getRendering()); + } - //set toolbar actions enabled/disabled + // set toolbar actions enabled/disabled updateToolBarActionsEnablement(); } - - private boolean isRestoreViewTabs(CTabFolder folder) - { - if (canAddRendering()) + + private boolean isRestoreViewTabs(CTabFolder folder) { + if (canAddRendering()) { return (folder.getItemCount() == 1 && getTopMemoryTab().getRendering() instanceof CreateRendering); - else + } else { return (folder.getItemCount() == 0); + } } - - private int getIndexOfCreateRenderingTab(CTabFolder folder) - { - for(int i = 0; i < folder.getItemCount(); i++) - if(folder.getItem(i).getData() instanceof MemoryViewTab && - ((MemoryViewTab) folder.getItem(i).getData()).getRendering() instanceof CreateRendering) + + private int getIndexOfCreateRenderingTab(CTabFolder folder) { + for (int i = 0; i < folder.getItemCount(); i++) { + if (folder.getItem(i).getData() instanceof MemoryViewTab && ((MemoryViewTab) folder.getItem(i).getData()).getRendering() instanceof CreateRendering) { return i; - + } + } + return -1; } public void memoryBlockRenderingAdded(final IMemoryRendering rendering) { - + Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { - - if (isDisposed()) + + if (isDisposed()) { return; - - if (fAddedRenderings.contains(rendering)) + } + + if (fAddedRenderings.contains(rendering)) { return; + } IMemoryBlock memoryblk = rendering.getMemoryBlock(); - CTabFolder tabFolder = (CTabFolder) fTabFolderForMemoryBlock.get(memoryblk); - - if (tabFolder == null) - { + CTabFolder tabFolder = fTabFolderForMemoryBlock.get(memoryblk); + + if (tabFolder == null) { tabFolder = createFolderForMemoryBlock(memoryblk); } - - if (tabFolder == fStackLayout.topControl) - { + + if (tabFolder == fStackLayout.topControl) { // disable current view tab if (getTopMemoryTab() != null) { deactivateRendering(getTopMemoryTab()); getTopMemoryTab().setEnabled(false); - } + } } fAddedRenderings.add(rendering); - + int index = getIndexOfCreateRenderingTab(tabFolder); - if (index < 0) - index = 0; + if (index < 0) { + index = 0; + } CTabItem tab = createTab(tabFolder, index); - - MemoryViewTab viewTab = new MemoryViewTab(tab, rendering,getInstance()); + + MemoryViewTab viewTab = new MemoryViewTab(tab, rendering, getInstance()); tabFolder.setSelection(tabFolder.indexOf(tab)); - - if (tabFolder == fStackLayout.topControl) - { + + if (tabFolder == fStackLayout.topControl) { setRenderingSelection(viewTab.getRendering()); // disable top view tab if the view pane is not visible IMemoryViewTab top = getTopMemoryTab(); - if (top != null) + if (top != null) { top.setEnabled(fVisible); - } - else - { + } + } else { deactivateRendering(viewTab); viewTab.setEnabled(false); } @@ -486,67 +503,64 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory }); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.core.memory.IMemoryRenderingListener#MemoryBlockRenderingRemoved(org.eclipse.debug.internal.core.memory.IMemoryRendering) + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.core.memory.IMemoryRenderingListener# + * MemoryBlockRenderingRemoved + * (org.eclipse.debug.internal.core.memory.IMemoryRendering) */ public void memoryBlockRenderingRemoved(final IMemoryRendering rendering) { final IMemoryBlock memory = rendering.getMemoryBlock(); - - // need to run the following code on the UI Thread to avoid invalid thread access exception - Display.getDefault().asyncExec(new Runnable() - { - public void run() - { - if (!fAddedRenderings.contains(rendering)) + + // need to run the following code on the UI Thread to avoid invalid + // thread access exception + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + if (!fAddedRenderings.contains(rendering)) { return; - + } + fAddedRenderings.remove(rendering); - + CTabFolder tabFolder = (CTabFolder) fStackLayout.topControl; - - if (tabFolder.isDisposed()) + + if (tabFolder.isDisposed()) { return; - + } + CTabItem[] tabs = tabFolder.getItems(); boolean foundTab = false; - for (int i = 0; i < tabs.length; i++) - { + for (int i = 0; i < tabs.length; i++) { IMemoryViewTab viewTab = (IMemoryViewTab) tabs[i].getData(); - - if (tabs[i].isDisposed()) + + if (tabs[i].isDisposed()) { continue; - + } - if (viewTab.getRendering().getMemoryBlock() == memory) - { - if (viewTab.getRendering() == rendering) - { + if (viewTab.getRendering().getMemoryBlock() == memory) { + if (viewTab.getRendering() == rendering) { foundTab = true; disposeTab(tabs[i]); break; } - + } } // if a tab is not found in the current top control // this deletion is a result of a debug target termination // find memory from other folder and dispose the view tab - if (!foundTab) - { - Enumeration enumeration = fTabFolderForMemoryBlock.elements(); - while (enumeration.hasMoreElements()) - { - CTabFolder otherTabFolder = (CTabFolder) enumeration.nextElement(); + if (!foundTab) { + Enumeration<CTabFolder> enumeration = fTabFolderForMemoryBlock.elements(); + while (enumeration.hasMoreElements()) { + CTabFolder otherTabFolder = enumeration.nextElement(); tabs = otherTabFolder.getItems(); IMemoryViewTab viewTab = null; - for (int i = 0; i < tabs.length; i++) - { + for (int i = 0; i < tabs.length; i++) { viewTab = (IMemoryViewTab) tabs[i].getData(); - if (viewTab.getRendering().getMemoryBlock() == memory) - { - if (viewTab.getRendering() == rendering) - { + if (viewTab.getRendering().getMemoryBlock() == memory) { + if (viewTab.getRendering() == rendering) { foundTab = true; disposeTab(tabs[i]); break; @@ -556,199 +570,206 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory } } IMemoryViewTab top = getTopMemoryTab(); - + // update selection - if (top != null) + if (top != null) { setRenderingSelection(top.getRendering()); - + } + updateToolBarActionsEnablement(); } }); - - } - + + } + /** * @param viewTab */ protected void setRenderingSelection(IMemoryRendering rendering) { - if (rendering != null) - { - fSelectionProvider.setSelection(new StructuredSelection(rendering)); - } + if (rendering != null) { + fSelectionProvider.setSelection(new StructuredSelection(rendering)); + } } - - private void restoreViewTabs(IMemoryRendering[] renderings) - { - for (int i=0; i<renderings.length; i++) - { + + private void restoreViewTabs(IMemoryRendering[] renderings) { + for (int i = 0; i < renderings.length; i++) { memoryBlockRenderingAdded(renderings[i]); } } - - private void handleDebugElementSelection(final IMemoryViewTab lastViewTab, final IAdaptable element) - { + + private void handleDebugElementSelection(final IMemoryViewTab lastViewTab, final IAdaptable element) { // get current memory block retrieval and debug target IMemoryBlockRetrieval currentRetrieve = null; - + // get tab folder CTabFolder tabFolder = (CTabFolder) fStackLayout.topControl; - + // get memory block - IMemoryBlock currentBlock = (IMemoryBlock)fMemoryBlockFromTabFolder.get(tabFolder); - - if (currentBlock != null) - { + IMemoryBlock currentBlock = fMemoryBlockFromTabFolder.get(tabFolder); + + if (currentBlock != null) { currentRetrieve = MemoryViewUtil.getMemoryBlockRetrieval(currentBlock); - + // backup current retrieve and tab folder - if (currentRetrieve != null && tabFolder != null) - { + if (currentRetrieve != null && tabFolder != null) { fTabFolderForDebugView.put(MemoryViewUtil.getHashCode(currentRetrieve), tabFolder); } } - + // find the folder associated with the given IMemoryBlockRetrieval IMemoryBlockRetrieval retrieve = MemoryViewUtil.getMemoryBlockRetrieval(element); // if debug target has changed // switch to that tab folder - if (retrieve != null && retrieve != currentRetrieve) - { + if (retrieve != null && retrieve != currentRetrieve) { Integer key = MemoryViewUtil.getHashCode(retrieve); - CTabFolder folder = (CTabFolder)fTabFolderForDebugView.get(key); - - if (folder != null) - { + CTabFolder folder = fTabFolderForDebugView.get(key); + + if (folder != null) { setTabFolder(folder); fTabFolderForDebugView.put(key, folder); fViewPaneCanvas.layout(); - } - else - { + } else { // find out if there is any memory block for this debug target // and set up tab folder for the memory blocks IMemoryBlock blocks[] = MemoryViewUtil.getMemoryBlockManager().getMemoryBlocks(retrieve); - - if (blocks.length > 0) - { + + if (blocks.length > 0) { handleMemoryBlockSelection(null, blocks[0]); - } - else - { + } else { emptyFolder(); fTabFolderForDebugView.put(key, fEmptyTabFolder); fViewPaneCanvas.layout(); } } } - + // disable last view tab as it becomes hidden IMemoryViewTab newViewTab = getTopMemoryTab(); - if (lastViewTab != null && lastViewTab != newViewTab) - { + if (lastViewTab != null && lastViewTab != newViewTab) { lastViewTab.setEnabled(false); } - if (newViewTab != null) - { + if (newViewTab != null) { // if new view tab is not already enabled, enable it - if (!newViewTab.isEnabled()) - { + if (!newViewTab.isEnabled()) { // if the view tab is visible, enable it - if (fVisible) - { + if (fVisible) { newViewTab.setEnabled(fVisible); - } + } } - + // should only change selection if the new view tab is different - if (lastViewTab != newViewTab) + if (lastViewTab != newViewTab) { setRenderingSelection(newViewTab.getRendering()); - } - //set toolbar actions enabled/disabled + } + } + // set toolbar actions enabled/disabled updateToolBarActionsEnablement(); } - + + @Override protected void addListeners() { super.addListeners(); - - // must directly listen for selection events from parent's selection provider - // to ensure that we get the selection event from the tree viewer pane even + + // must directly listen for selection events from parent's selection + // provider + // to ensure that we get the selection event from the tree viewer pane + // even // if the view does not have focuse fParent.getSite().getSelectionProvider().addSelectionChangedListener(this); } + + @Override protected void removeListeners() { super.removeListeners(); fParent.getSite().getSelectionProvider().removeSelectionChangedListener(this); } - /* (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt + * .events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { - - if (getTopMemoryTab() == null) + + if (getTopMemoryTab() == null) { return; - + } + IMemoryRendering rendering = getTopMemoryTab().getRendering(); - - if (rendering != null) - { + + if (rendering != null) { fSelectionProvider.setSelection(new StructuredSelection(rendering)); } - + } - /* (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse + * .swt.events.SelectionEvent) */ + @Override public void widgetDefaultSelected(SelectionEvent e) { } - + + @Override public Object getCurrentSelection() { - if (getTopMemoryTab() != null) - if (getTopMemoryTab().getRendering() != null) + if (getTopMemoryTab() != null) { + if (getTopMemoryTab().getRendering() != null) { return getTopMemoryTab().getRendering(); + } + } return null; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see com.ibm.debug.extended.ui.IMemoryView#getAllViewTabs() */ + @Override public IMemoryViewTab[] getAllViewTabs() { - + // otherwise, find the view tab to display CTabFolder folder = (CTabFolder) fStackLayout.topControl; CTabItem[] items = folder.getItems(); - + IMemoryViewTab[] viewTabs = new IMemoryViewTab[folder.getItemCount()]; - - for(int i=0; i<items.length; i++){ - viewTabs[i] = (IMemoryViewTab)items[i].getData(); + + for (int i = 0; i < items.length; i++) { + viewTabs[i] = (IMemoryViewTab) items[i].getData(); } - + return viewTabs; } - /* (non-Javadoc) - * @see com.ibm.debug.extended.ui.IMemoryView#moveToTop(com.ibm.debug.extended.ui.IMemoryViewTab) + /* + * (non-Javadoc) + * @see + * com.ibm.debug.extended.ui.IMemoryView#moveToTop(com.ibm.debug.extended + * .ui.IMemoryViewTab) */ + @Override public void moveToTop(IMemoryViewTab viewTab) { - + IMemoryViewTab lastViewTab = getTopMemoryTab(); - - if (viewTab == lastViewTab) + + if (viewTab == lastViewTab) { return; - + } + // otherwise, find the view tab to display CTabFolder folder = (CTabFolder) fStackLayout.topControl; CTabItem[] items = folder.getItems(); for (int i = 0; i < items.length; i++) { - IMemoryViewTab tab = - (IMemoryViewTab) items[i].getData(); + IMemoryViewTab tab = (IMemoryViewTab) items[i].getData(); if (viewTab == tab) { boolean isEnabled = lastViewTab.isEnabled(); @@ -756,166 +777,166 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory // switch to that viewTab lastViewTab.setEnabled(false); folder.setSelection(i); - + setRenderingSelection(tab.getRendering()); - + getTopMemoryTab().setEnabled(isEnabled && fVisible); break; } } } - - private CTabFolder createTabFolder(Composite parent) - { + + private CTabFolder createTabFolder(Composite parent) { CTabFolder folder = new CTabFolder(parent, SWT.NO_REDRAW_RESIZE | SWT.NO_TRIM | SWT.FLAT); - + ColorRegistry reg = JFaceResources.getColorRegistry(); Color c1 = reg.get("org.eclipse.ui.workbench.ACTIVE_TAB_BG_START"), //$NON-NLS-1$ - c2 = reg.get("org.eclipse.ui.workbench.ACTIVE_TAB_BG_END"); //$NON-NLS-1$ - folder.setSelectionBackground(new Color[] {c1, c2}, new int[] {100}, true); + c2 = reg.get("org.eclipse.ui.workbench.ACTIVE_TAB_BG_END"); //$NON-NLS-1$ + folder.setSelectionBackground(new Color[] { c1, c2 }, new int[] { 100 }, true); folder.setSelectionForeground(reg.get("org.eclipse.ui.workbench.ACTIVE_TAB_TEXT_COLOR")); //$NON-NLS-1$ folder.setSimple(PlatformUI.getPreferenceStore().getBoolean(IWorkbenchPreferenceConstants.SHOW_TRADITIONAL_STYLE_TABS)); folder.setBorderVisible(true); folder.setFont(fViewPaneCanvas.getFont()); - + folder.addCTabFolder2Listener(new CTabFolder2Adapter() { + @Override public void close(CTabFolderEvent event) { - if(event.item.getData() instanceof MemoryViewTab) + if (event.item.getData() instanceof MemoryViewTab) { RenderingViewPane.this.removeMemoryRendering(((MemoryViewTab) event.item.getData()).getRendering()); + } event.doit = false; } }); return folder; } + @Override public void restoreViewPane() { - + // get current selection from memory view - + ISelection selection = null; - if (fParent.getSite().getSelectionProvider() != null) + if (fParent.getSite().getSelectionProvider() != null) { selection = fParent.getSite().getSelectionProvider().getSelection(); - + } + IMemoryBlock memoryBlock = null; - if (selection != null) - { + if (selection != null) { memoryBlock = getMemoryBlock(selection); } - - if (memoryBlock == null) - { + + if (memoryBlock == null) { // get selection from this view selection = fSelectionProvider.getSelection(); - - if (MemoryViewUtil.isValidSelection(selection)) - { - Object elem = ((IStructuredSelection)selection).getFirstElement(); - if (!(elem instanceof IMemoryBlock)) + if (MemoryViewUtil.isValidSelection(selection)) { + Object elem = ((IStructuredSelection) selection).getFirstElement(); + + if (!(elem instanceof IMemoryBlock)) { return; - - memoryBlock = (IMemoryBlock)elem; + } + + memoryBlock = (IMemoryBlock) elem; } } - - if (memoryBlock == null) - { + + if (memoryBlock == null) { // get a memory block from current debug context IAdaptable context = DebugUITools.getPartDebugContext(fParent.getSite()); - if (context != null) - { + if (context != null) { IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(context); - if (retrieval != null) - { + if (retrieval != null) { IMemoryBlock[] blocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(retrieval); - if (blocks.length > 0) + if (blocks.length > 0) { memoryBlock = blocks[0]; + } } } } - - if (memoryBlock != null) - { - if (!fTabFolderForMemoryBlock.containsKey(memoryBlock)) - { + + if (memoryBlock != null) { + if (!fTabFolderForMemoryBlock.containsKey(memoryBlock)) { // create tab folder if a tab folder does not already exist // for the memory block CTabFolder folder = createTabFolder(fViewPaneCanvas); - + fTabFolderForMemoryBlock.put(memoryBlock, folder); fMemoryBlockFromTabFolder.put(folder, memoryBlock); - setTabFolder((CTabFolder)fTabFolderForMemoryBlock.get(memoryBlock)); + setTabFolder(fTabFolderForMemoryBlock.get(memoryBlock)); IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(memoryBlock); - if (retrieval != null) + if (retrieval != null) { fTabFolderForDebugView.put(MemoryViewUtil.getHashCode(retrieval), fTabFolderForMemoryBlock.get(memoryBlock)); - else + } else { DebugUIPlugin.logErrorMessage("Memory block retrieval for memory block is null."); //$NON-NLS-1$ - + } + fViewPaneCanvas.layout(); fAddedMemoryBlocks.add(memoryBlock); - - // every time we create a folder, we have to create a CreateRendering + + // every time we create a folder, we have to create a + // CreateRendering newCreateRenderingForFolder(memoryBlock, folder); } - - if (fTabFolderForMemoryBlock.containsKey(memoryBlock)) - { - CTabFolder toDisplay = (CTabFolder)fTabFolderForMemoryBlock.get(memoryBlock); - - if (toDisplay != null) - { + + if (fTabFolderForMemoryBlock.containsKey(memoryBlock)) { + CTabFolder toDisplay = fTabFolderForMemoryBlock.get(memoryBlock); + + if (toDisplay != null) { setTabFolder(toDisplay); IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(memoryBlock); - - if (retrieval != null) + + if (retrieval != null) { fTabFolderForDebugView.put(MemoryViewUtil.getHashCode(retrieval), toDisplay); - else + } else { DebugUIPlugin.logErrorMessage("Memory block retrieval is null for memory block."); //$NON-NLS-1$ - + } + fViewPaneCanvas.layout(); - + // restore view tabs IMemoryRendering[] renderings = fRenderingMgr.getRenderingsFromMemoryBlock(memoryBlock); - + // if only CreateRendering is present, restore renderings - if (isRestoreViewTabs(toDisplay)) - { + if (isRestoreViewTabs(toDisplay)) { restoreViewTabs(renderings); } } } - + // disable current storag block - + IMemoryViewTab top = getTopMemoryTab(); - - if (top != null) + + if (top != null) { top.setEnabled(fVisible); + } } } - + + @Override public void dispose() { super.dispose(); - + fTabFolderForMemoryBlock.clear(); fTabFolderForMemoryBlock = null; - + fMemoryBlockFromTabFolder.clear(); fMemoryBlockFromTabFolder = null; - + fRenderingMgr.dispose(); fRenderingMgr = null; - + fAddedMemoryBlocks.clear(); fAddedRenderings.clear(); - } - + } + public Control createViewPane(Composite parent, String paneId, String label, boolean canAddRendering, boolean canRemoveRendering) { return doCreateViewPane(parent, paneId, label, canAddRendering, canRemoveRendering); } - - public Control createViewPane(Composite parent, String paneId, String label) { + + @Override + public Control createViewPane(Composite parent, String paneId, String label) { return doCreateViewPane(parent, paneId, label, true, true); } @@ -927,266 +948,298 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory * @param canRemoveRendering * @return */ - private Control doCreateViewPane(Composite parent, String paneId, String label, boolean canAddRendering, - boolean canRemoveRendering) { - Control control = super.createViewPane(parent, paneId, label); + private Control doCreateViewPane(Composite parent, String paneId, String label, boolean canAddRendering, boolean canRemoveRendering) { + Control control = super.createViewPane(parent, paneId, label); fCanAddRendering = canAddRendering; fCanRemoveRendering = canRemoveRendering; fRenderingMgr = new ViewPaneRenderingMgr(this); PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugUIConstants.PLUGIN_ID + ".MemoryRenderingView_context"); //$NON-NLS-1$ return control; } - + + @Override public IAction[] getActions() { return new IAction[0]; } - - // enable/disable toolbar action - protected void updateToolBarActionsEnablement() - { + + // enable/disable toolbar action + protected void updateToolBarActionsEnablement() { } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.AbstractMemoryViewPane#emptyFolder() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.AbstractMemoryViewPane#emptyFolder + * () */ + @Override protected void emptyFolder() { super.emptyFolder(); updateToolBarActionsEnablement(); fSelectionProvider.setSelection(AbstractMemoryViewPane.EMPTY); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IRenderingViewPane#addMemoryRendering(org.eclipse.debug.internal.ui.views.memory.IMemoryRendering) + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.ui.views.memory.IRenderingViewPane# + * addMemoryRendering + * (org.eclipse.debug.internal.ui.views.memory.IMemoryRendering) */ + @Override public void addMemoryRendering(IMemoryRendering rendering) { - - if (rendering == null) + + if (rendering == null) { return; + } memoryBlockRenderingAdded(rendering); fRenderingMgr.addMemoryBlockRendering(rendering); - + } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IRenderingViewPane#removeMemoryRendering(org.eclipse.debug.internal.ui.views.memory.IMemoryRendering) + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.ui.views.memory.IRenderingViewPane# + * removeMemoryRendering + * (org.eclipse.debug.internal.ui.views.memory.IMemoryRendering) */ + @Override public void removeMemoryRendering(IMemoryRendering rendering) { - - if (rendering == null) + + if (rendering == null) { return; - + } + memoryBlockRenderingRemoved(rendering); - - if (fRenderingMgr != null) + + if (fRenderingMgr != null) { fRenderingMgr.removeMemoryBlockRendering(rendering); - + } + } - - private RenderingViewPane getInstance() - { + + private RenderingViewPane getInstance() { return this; } - - private IMemoryBlock getMemoryBlock(ISelection selection) - { - if (!(selection instanceof IStructuredSelection)) + + private IMemoryBlock getMemoryBlock(ISelection selection) { + if (!(selection instanceof IStructuredSelection)) { return null; + } - //only single selection of PICLDebugElements is allowed for this action - if (selection.isEmpty() || ((IStructuredSelection)selection).size() > 1) - { + // only single selection of PICLDebugElements is allowed for this action + if (selection.isEmpty() || ((IStructuredSelection) selection).size() > 1) { return null; } - Object elem = ((IStructuredSelection)selection).getFirstElement(); - - if (elem instanceof IMemoryBlock) - return (IMemoryBlock)elem; - else if (elem instanceof IMemoryRendering) - return ((IMemoryRendering)elem).getMemoryBlock(); - else + Object elem = ((IStructuredSelection) selection).getFirstElement(); + + if (elem instanceof IMemoryBlock) { + return (IMemoryBlock) elem; + } else if (elem instanceof IMemoryRendering) { + return ((IMemoryRendering) elem).getMemoryBlock(); + } else { return null; + } } - - private void deactivateRendering(IMemoryViewTab viewTab) - { - if (viewTab == null) + + private void deactivateRendering(IMemoryViewTab viewTab) { + if (viewTab == null) { return; + } - if (!viewTab.isDisposed()) - { + if (!viewTab.isDisposed()) { viewTab.getRendering().deactivated(); } } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.IRenderingViewPane#getMemoryRenderingSite() + /* + * (non-Javadoc) + * @see org.eclipse.debug.internal.ui.views.memory.IRenderingViewPane# + * getMemoryRenderingSite() */ + @Override public IMemoryRenderingSite getMemoryRenderingSite() { return fRenderingSite; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingContainer#getId() */ + @Override public String getId() { return getPaneId(); } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingContainer#getRenderings() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.memory.IMemoryRenderingContainer#getRenderings() */ + @Override public IMemoryRendering[] getRenderings() { return fRenderingMgr.getRenderings(); } - /* (non-Javadoc) - * @see org.eclipse.debug.ui.memory.IMemoryRenderingContainer#getActiveRendering() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.memory.IMemoryRenderingContainer#getActiveRendering + * () */ + @Override public IMemoryRendering getActiveRendering() { - if (getTopMemoryTab() == null) + if (getTopMemoryTab() == null) { return null; + } return getTopMemoryTab().getRendering(); } - + /** * Reset the memory renderings within this view pane. - * @param memoryBlock - reset renderings associated with the given memory block - * @param resetVisible - reset what's currently visible if the parameter is true. - * Otherwise, the view pane will reset all renderings associated with the given - * memory block. + * + * @param memoryBlock - reset renderings associated with the given memory + * block + * @param resetVisible - reset what's currently visible if the parameter is + * true. Otherwise, the view pane will reset all renderings + * associated with the given memory block. */ - public void resetRenderings(IMemoryBlock memoryBlock, boolean resetVisible) - { + public void resetRenderings(IMemoryBlock memoryBlock, boolean resetVisible) { // if we only reset what's visible and the view pane is not visible // do nothing. - if (resetVisible && !isVisible()) + if (resetVisible && !isVisible()) { return; - - if(resetVisible) - { + } + + if (resetVisible) { IMemoryRendering rendering = getActiveRendering(); - if (rendering != null) - { - if (rendering.getMemoryBlock() == memoryBlock) - { - if (rendering instanceof IResettableMemoryRendering) - { - IResettableMemoryRendering resettableRendering = (IResettableMemoryRendering)rendering; + if (rendering != null) { + if (rendering.getMemoryBlock() == memoryBlock) { + if (rendering instanceof IResettableMemoryRendering) { + IResettableMemoryRendering resettableRendering = (IResettableMemoryRendering) rendering; try { resettableRendering.resetRendering(); } catch (DebugException e) { // do not pop up error message - // error message is annoying where there are multiple rendering + // error message is annoying where there are + // multiple rendering // panes and renderings to reset } } } } - } - else - { + } else { // get all renderings associated with the given memory block IMemoryRendering[] renderings = fRenderingMgr.getRenderingsFromMemoryBlock(memoryBlock); - + // back up current synchronization provider IMemoryRendering originalProvider = null; IMemoryRenderingSynchronizationService service = getMemoryRenderingSite().getSynchronizationService(); - if (service != null) + if (service != null) { originalProvider = service.getSynchronizationProvider(); - - for (int i=0; i<renderings.length; i++) - { - if (renderings[i] instanceof IResettableMemoryRendering) - { + } + + for (int i = 0; i < renderings.length; i++) { + if (renderings[i] instanceof IResettableMemoryRendering) { try { - - // This is done to allow user to select multiple memory monitors and + + // This is done to allow user to select multiple memory + // monitors and // reset their renderings. - // In this case, a hidden rendering will not be the sync provider to the sync - // service. When the reset happens, the top visible address and selected - // address is not updated in the sync service. When the rendering later - // becomes visible, the rendering gets the sync info from the sync service - // and will try to sync up with old information, giving user the impression - // that the rendering was never reset. By forcing the rendering that we - // are trying to reset as the synchronization provider, we ensure that - // the rendering is able to update its sync info even though the rendering + // In this case, a hidden rendering will not be the sync + // provider to the sync + // service. When the reset happens, the top visible + // address and selected + // address is not updated in the sync service. When the + // rendering later + // becomes visible, the rendering gets the sync info + // from the sync service + // and will try to sync up with old information, giving + // user the impression + // that the rendering was never reset. By forcing the + // rendering that we + // are trying to reset as the synchronization provider, + // we ensure that + // the rendering is able to update its sync info even + // though the rendering // is currently hidden. - if (service != null) + if (service != null) { service.setSynchronizationProvider(renderings[i]); - ((IResettableMemoryRendering)renderings[i]).resetRendering(); + } + ((IResettableMemoryRendering) renderings[i]).resetRendering(); } catch (DebugException e) { // do not pop up error message - // error message is annoying where there are multiple rendering + // error message is annoying where there are multiple + // rendering // panes and renderings to reset } } } - + // restore synchronization provider - if (service != null) + if (service != null) { service.setSynchronizationProvider(originalProvider); + } } } - - - public void showCreateRenderingTab() - { + public void showCreateRenderingTab() { IMemoryRendering activeRendering = RenderingViewPane.this.getActiveRendering(); - if(activeRendering == null) + if (activeRendering == null) { return; - + } + IMemoryBlock memoryblk = activeRendering.getMemoryBlock(); - final CTabFolder tabFolder = (CTabFolder) fTabFolderForMemoryBlock.get(memoryblk); - if (tabFolder != null) - { + final CTabFolder tabFolder = fTabFolderForMemoryBlock.get(memoryblk); + if (tabFolder != null) { Display.getDefault().asyncExec(new Runnable() { - public void run() - { + @Override + public void run() { int index = getIndexOfCreateRenderingTab(tabFolder); - if (index >= 0) + if (index >= 0) { tabFolder.setSelection(index); + } } }); } } public void contextActivated(final ISelection selection) { - - UIJob job = new UIJob("contextActivated"){ //$NON-NLS-1$ - public IStatus runInUIThread(IProgressMonitor monitor) - { - if (isDisposed()) + + UIJob job = new UIJob("contextActivated") { //$NON-NLS-1$ + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { + if (isDisposed()) { return Status.OK_STATUS; - + } + IMemoryViewTab lastViewTab = getTopMemoryTab(); - - if (MemoryViewUtil.isValidSelection(selection)) - { - if (!(selection instanceof IStructuredSelection)) + + if (MemoryViewUtil.isValidSelection(selection)) { + if (!(selection instanceof IStructuredSelection)) { return Status.OK_STATUS; + } - Object elem = ((IStructuredSelection)selection).getFirstElement(); - - if (elem instanceof IAdaptable) - { - handleDebugElementSelection(lastViewTab, (IAdaptable)elem); + Object elem = ((IStructuredSelection) selection).getFirstElement(); + + if (elem instanceof IAdaptable) { + handleDebugElementSelection(lastViewTab, (IAdaptable) elem); } - } - else - { - if (lastViewTab != null) + } else { + if (lastViewTab != null) { lastViewTab.setEnabled(false); - - if (fStackLayout.topControl != fEmptyTabFolder) + } + + if (fStackLayout.topControl != fEmptyTabFolder) { emptyFolder(); - + } + } return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } @@ -1195,31 +1248,29 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory * @param memory */ private CTabFolder createFolderForMemoryBlock(IMemoryBlock memory) { - CTabFolder folder = createTabFolder(fViewPaneCanvas); - - fTabFolderForMemoryBlock.put(memory, folder); - fMemoryBlockFromTabFolder.put(folder, memory); - - IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(memory); - if (retrieval != null) - { - fTabFolderForDebugView.put(MemoryViewUtil.getHashCode(retrieval), folder); - } - else { - DebugUIPlugin.logErrorMessage("Memory block retrieval for memory block is null"); //$NON-NLS-1$ - } - - newCreateRenderingForFolder(memory, folder); - - return folder; + CTabFolder folder = createTabFolder(fViewPaneCanvas); + + fTabFolderForMemoryBlock.put(memory, folder); + fMemoryBlockFromTabFolder.put(folder, memory); + + IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(memory); + if (retrieval != null) { + fTabFolderForDebugView.put(MemoryViewUtil.getHashCode(retrieval), folder); + } else { + DebugUIPlugin.logErrorMessage("Memory block retrieval for memory block is null"); //$NON-NLS-1$ + } + + newCreateRenderingForFolder(memory, folder); + + return folder; } - private void newCreateRenderingForFolder(IMemoryBlock memory, - CTabFolder folder) { - - if (!canAddRendering()) + private void newCreateRenderingForFolder(IMemoryBlock memory, CTabFolder folder) { + + if (!canAddRendering()) { return; - + } + CTabItem newItem = new CTabItem(folder, SWT.NONE); CreateRendering rendering = new CreateRendering(getInstance()); rendering.init(getInstance(), memory); @@ -1227,30 +1278,33 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory folder.setSelection(0); } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener#contextEvent(org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener + * #contextEvent + * (org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { contextActivated(event.getContext()); - } + } } - + /** * @return whether this container allows user to add rendering manually * @since 3.4 */ - public boolean canAddRendering() - { + public boolean canAddRendering() { return fCanAddRendering; } - + /** * @return whether this container allows user to remove rendering manually * @since 3.4 */ - public boolean canRemoveRendering() - { + public boolean canRemoveRendering() { return fCanRemoveRendering; } @@ -1261,8 +1315,9 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory */ private CTabItem createTab(CTabFolder tabFolder, int index) { int swtStyle = SWT.CLOSE; - if (!canRemoveRendering()) + if (!canRemoveRendering()) { swtStyle = SWT.NONE; + } CTabItem tab = new CTabItem(tabFolder, swtStyle, index); return tab; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java index ebcb6801f..04cb9bba0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java @@ -26,26 +26,30 @@ import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; /** - * The popup menu action for a memory rendering used to reset the current selection - * to the default first memory position + * The popup menu action for a memory rendering used to reset the current + * selection to the default first memory position * * @since 3.2.0 */ -public class ResetMemoryBlockAction implements IViewActionDelegate{ +public class ResetMemoryBlockAction implements IViewActionDelegate { private IViewPart fView; - private ArrayList fSelectedMB = new ArrayList(); + private ArrayList<Object> fSelectedMB = new ArrayList<Object>(); - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fView = view; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fSelectedMB.isEmpty()) { return; @@ -55,25 +59,29 @@ public class ResetMemoryBlockAction implements IViewActionDelegate{ if (resetPref.equals(IDebugPreferenceConstants.RESET_VISIBLE)) { resetVisible = true; } - Iterator iter = fSelectedMB.iterator(); - while(iter.hasNext()) { - IMemoryBlock mb = (IMemoryBlock)iter.next(); + Iterator<Object> iter = fSelectedMB.iterator(); + while (iter.hasNext()) { + IMemoryBlock mb = (IMemoryBlock) iter.next(); if (fView instanceof MemoryView) { - MemoryView memView = (MemoryView)fView; + MemoryView memView = (MemoryView) fView; IMemoryRenderingContainer[] containers = memView.getMemoryRenderingContainers(); - - for (int i=0; i<containers.length; i++) { + + for (int i = 0; i < containers.length; i++) { if (containers[i] instanceof RenderingViewPane) { - ((RenderingViewPane)containers[i]).resetRenderings(mb, resetVisible); + ((RenderingViewPane) containers[i]).resetRenderings(mb, resetVisible); } } } } } - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action + * .IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { action.setEnabled(!selection.isEmpty()); if (selection instanceof IStructuredSelection) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockPreferencePage.java index 1aa89987e..01dc1515b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockPreferencePage.java @@ -21,21 +21,27 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.PlatformUI; -public class ResetMemoryBlockPreferencePage extends FieldEditorPreferencePage{ - - public ResetMemoryBlockPreferencePage() - { +public class ResetMemoryBlockPreferencePage extends FieldEditorPreferencePage { + + public ResetMemoryBlockPreferencePage() { super(FieldEditorPreferencePage.GRID); setPreferenceStore(DebugUITools.getPreferenceStore()); setTitle(DebugUIMessages.ResetMemoryBlockPreferencePage_0); } - + @Override protected void createFieldEditors() { - RadioGroupFieldEditor editor = new RadioGroupFieldEditor(IDebugPreferenceConstants.PREF_RESET_MEMORY_BLOCK, DebugUIMessages.ResetMemoryBlockPreferencePage_1, 1, new String[][] {{DebugUIMessages.ResetMemoryBlockPreferencePage_2, IDebugPreferenceConstants.RESET_VISIBLE},{DebugUIMessages.ResetMemoryBlockPreferencePage_3, IDebugPreferenceConstants.RESET_ALL}}, getFieldEditorParent()); + RadioGroupFieldEditor editor = new RadioGroupFieldEditor(IDebugPreferenceConstants.PREF_RESET_MEMORY_BLOCK, DebugUIMessages.ResetMemoryBlockPreferencePage_1, 1, new String[][] { + { + DebugUIMessages.ResetMemoryBlockPreferencePage_2, + IDebugPreferenceConstants.RESET_VISIBLE }, + { + DebugUIMessages.ResetMemoryBlockPreferencePage_3, + IDebugPreferenceConstants.RESET_ALL } }, getFieldEditorParent()); addField(editor); } - + + @Override protected Control createContents(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugUIConstants.PLUGIN_ID + ".resetMemoryMonitor_preference_page_context"); //$NON-NLS-1$ return super.createContents(parent); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RetargetAddMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RetargetAddMemoryBlockAction.java index a0667815d..6eaed8d30 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RetargetAddMemoryBlockAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RetargetAddMemoryBlockAction.java @@ -21,94 +21,79 @@ import org.eclipse.debug.ui.actions.IAddMemoryBlocksTarget; import org.eclipse.debug.ui.memory.IMemoryRenderingSite; /** - * This is the retargettable add memory block action in the Memory View. - * All AddMemoryBlock actions in the view will use this action to make sure - * that clients can override the "Add Memory Monitor" dialog. - * + * This is the retargettable add memory block action in the Memory View. All + * AddMemoryBlock actions in the view will use this action to make sure that + * clients can override the "Add Memory Monitor" dialog. + * */ public class RetargetAddMemoryBlockAction extends AddMemoryBlockAction { - public RetargetAddMemoryBlockAction(IMemoryRenderingSite site) - { + public RetargetAddMemoryBlockAction(IMemoryRenderingSite site) { super(site); } - - public RetargetAddMemoryBlockAction(IMemoryRenderingSite site, boolean addDefaultRenderings) - { + + public RetargetAddMemoryBlockAction(IMemoryRenderingSite site, boolean addDefaultRenderings) { super(site, addDefaultRenderings); } - - public RetargetAddMemoryBlockAction(String text, int style, IMemoryRenderingSite site) - { + + public RetargetAddMemoryBlockAction(String text, int style, IMemoryRenderingSite site) { super(text, style, site); } + @Override public void run() { - // get current selection from Debug View + // get current selection from Debug View Object debugContext = DebugUITools.getPartDebugContext(fSite.getSite()); IAddMemoryBlocksTarget target = getAddMemoryBlocksTarget(debugContext); - - if (target != null) - { + + if (target != null) { try { - if (target.supportsAddMemoryBlocks(getMemoryView())) - { + if (target.supportsAddMemoryBlocks(getMemoryView())) { target.addMemoryBlocks(getMemoryView(), getMemoryView().getSite().getSelectionProvider().getSelection()); - } - else + } else super.run(); } catch (CoreException e) { DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.RetargetAddMemoryBlockAction_0, ActionMessages.RetargetAddMemoryBlockAction_1, e); } - } - else - { + } else { super.run(); } } + @Override protected void updateAction(Object debugContext) { - + try { IAddMemoryBlocksTarget target = getAddMemoryBlocksTarget(debugContext); - - if (target != null) - { - if (target.supportsAddMemoryBlocks(getMemoryView())) - { + + if (target != null) { + if (target.supportsAddMemoryBlocks(getMemoryView())) { if (getMemoryView().getSite().getSelectionProvider() != null) setEnabled(target.canAddMemoryBlocks(getMemoryView(), getMemoryView().getSite().getSelectionProvider().getSelection())); else super.updateAction(debugContext); - } - else + } else super.updateAction(debugContext); - } - else - { + } else { super.updateAction(debugContext); } } catch (CoreException e) { DebugUIPlugin.log(e); } } - - private IAddMemoryBlocksTarget getAddMemoryBlocksTarget(Object debugContext) - { + + private IAddMemoryBlocksTarget getAddMemoryBlocksTarget(Object debugContext) { IMemoryBlockRetrieval standardMemRetrieval = MemoryViewUtil.getMemoryBlockRetrieval(debugContext); - + if (standardMemRetrieval == null) return null; - + IAddMemoryBlocksTarget target = null; - - if (standardMemRetrieval instanceof IAddMemoryBlocksTarget) - { + + if (standardMemRetrieval instanceof IAddMemoryBlocksTarget) { target = (IAddMemoryBlocksTarget) standardMemRetrieval; - } - else if (standardMemRetrieval instanceof IAdaptable) - { - target = (IAddMemoryBlocksTarget)((IAdaptable)standardMemRetrieval).getAdapter(IAddMemoryBlocksTarget.class); + } else if (standardMemRetrieval instanceof IAdaptable) { + target = (IAddMemoryBlocksTarget) ((IAdaptable) standardMemRetrieval).getAdapter(IAddMemoryBlocksTarget.class); } return target; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SetPaddedStringPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SetPaddedStringPreferencePage.java index 559c20c63..8cd837bd7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SetPaddedStringPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SetPaddedStringPreferencePage.java @@ -9,7 +9,6 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.debug.internal.ui.views.memory; import org.eclipse.debug.internal.ui.DebugUIMessages; @@ -24,17 +23,17 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.ui.PlatformUI; public class SetPaddedStringPreferencePage extends FieldEditorPreferencePage { - + private StringFieldEditor fPaddedString; - public SetPaddedStringPreferencePage() - { + public SetPaddedStringPreferencePage() { super(FieldEditorPreferencePage.GRID); setPreferenceStore(DebugUITools.getPreferenceStore()); setTitle(DebugUIMessages.SetPaddedStringDialog_0); - + } + @Override protected void createFieldEditors() { fPaddedString = new StringFieldEditor(IDebugUIConstants.PREF_PADDED_STR, DebugUIMessages.SetPaddedStringPreferencePage_0, getFieldEditorParent()); fPaddedString.setEmptyStringAllowed(false); @@ -42,12 +41,14 @@ public class SetPaddedStringPreferencePage extends FieldEditorPreferencePage { addField(fPaddedString); } + @Override protected Label createDescriptionLabel(Composite parent) { Label label = new Label(parent, SWT.NONE); label.setText(DebugUIMessages.SetPaddedStringDialog_1); return label; } + @Override protected Control createContents(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugUIConstants.PLUGIN_ID + ".SetPaddedStrDialog_context"); //$NON-NLS-1$ return super.createContents(parent); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java index 3ce617599..8a07ecf15 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java @@ -50,12 +50,13 @@ import org.eclipse.ui.progress.UIJob; import org.eclipse.ui.progress.WorkbenchJob; /** - * The switch memory block action, used + * The switch memory block action, used */ public class SwitchMemoryBlockAction extends Action implements IViewActionDelegate, IActionDelegate2 { /** - * A job that updates the enablement of the of the backing action delegate in the UI thread + * A job that updates the enablement of the of the backing action delegate + * in the UI thread * * @since 3.3.0 */ @@ -69,24 +70,27 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega setSystem(true); } - /* (non-Javadoc) - * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime + * .IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (fAction != null) { IAdaptable context = getDebugContext(); if (context != null) { IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(context); - + if (retrieval != null) { IMemoryBlock[] memoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(retrieval); fAction.setEnabled(memoryBlocks.length > 0); return Status.OK_STATUS; - } - else if (getViewer() != null) { + } else if (getViewer() != null) { Object input = getViewer().getInput(); if (input instanceof IMemoryBlockRetrieval) { - retrieval = (IMemoryBlockRetrieval)input; + retrieval = (IMemoryBlockRetrieval) input; IMemoryBlock[] memoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(retrieval); fAction.setEnabled(memoryBlocks.length > 0); return Status.OK_STATUS; @@ -98,49 +102,54 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega return Status.CANCEL_STATUS; } } - + private IViewPart fView; private MenuCreator fMenuCreator; private IAction fAction; private UpdateActionEnablementJob fUpdateJob = new UpdateActionEnablementJob(); - + /** * Memoryblock listener to update action delegate enablement */ private IMemoryBlockListener fListener = new IMemoryBlockListener() { + @Override public void memoryBlocksAdded(IMemoryBlock[] memory) { if (fAction != null) { fUpdateJob.schedule(); } } + @Override public void memoryBlocksRemoved(IMemoryBlock[] memory) { if (fAction != null) { fUpdateJob.schedule(); } } }; - + /** * Listens for debug context changes and updates action delegate enablement */ private IDebugContextListener fDebugContextListener = new IDebugContextListener() { + @Override public void debugContextChanged(DebugContextEvent event) { - if (fAction != null) { + if (fAction != null) { fUpdateJob.schedule(); } } }; - + /** * Switch tab folder for fMemoryBlock to the top in Memory Rendering View */ class SwitchToAction extends Action { private IMemoryBlock fMemoryblock; - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { if (fView == null) { return; @@ -153,89 +162,98 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega super(); if (buildLabel) { setText(DebugUIMessages.SwitchMemoryBlockAction_4); - Job job = new Job("SwtichToAction"){ //$NON-NLS-1$ + Job job = new Job("SwtichToAction") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { getLabels(memBlk); return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } fMemoryblock = memBlk; } - + public SwitchToAction(final IMemoryBlock memBlk, String label) { super(label); fMemoryblock = memBlk; } - + private void getLabels(final IMemoryBlock memBlk) { StringBuffer text = new StringBuffer(IInternalDebugCoreConstants.EMPTY_STRING); String label = new String(IInternalDebugCoreConstants.EMPTY_STRING); if (memBlk instanceof IMemoryBlockExtension) { - String expression = ((IMemoryBlockExtension)memBlk).getExpression(); + String expression = ((IMemoryBlockExtension) memBlk).getExpression(); if (expression == null) { expression = DebugUIMessages.SwitchMemoryBlockAction_0; } text.append(expression); - } - else { + } else { long address = memBlk.getStartAddress(); text.append(Long.toHexString(address)); } - + label = text.toString(); label = decorateLabel(memBlk, label); final String finalLabel = label; WorkbenchJob job = new WorkbenchJob("SwtichToAction Update Label") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { SwitchToAction.super.setText(finalLabel); return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); job.schedule(); } } - + /** * Menu creator for the action */ class MenuCreator implements IMenuCreator { Menu dropdown; - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#dispose() */ + @Override public void dispose() { if (dropdown != null) dropdown.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets + * .Control) */ + @Override public Menu getMenu(Control parent) { - if (dropdown != null) { + if (dropdown != null) { dropdown.dispose(); dropdown = null; } - if (dropdown == null) { - dropdown = new Menu(parent); + if (dropdown == null) { + dropdown = new Menu(parent); // get all memory blocks from tree viewer IMemoryBlock[] allMemoryBlocks = null; - + // get selection from memory view IMemoryBlock memoryBlock = getCurrentMemoryBlock(); - + Object context = getDebugContext(); - IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(context); + IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(context); if (retrieval != null) { allMemoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(retrieval); } if (allMemoryBlocks != null) { - for (int i=0; i<allMemoryBlocks.length; i++) { + for (int i = 0; i < allMemoryBlocks.length; i++) { SwitchToAction action = new SwitchToAction(allMemoryBlocks[i], true); if (allMemoryBlocks[i] == memoryBlock) { action.setChecked(true); @@ -249,59 +267,70 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega return dropdown; } - /* (non-Javadoc) - * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets + * .Menu) */ + @Override public Menu getMenu(Menu parent) { return null; } - - } - - /* (non-Javadoc) + + } + + /* + * (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fView = view; DebugUITools.getDebugContextManager().getContextService(fView.getViewSite().getWorkbenchWindow()).addDebugContextListener(fDebugContextListener); DebugPlugin.getDefault().getMemoryBlockManager().addListener(fListener); fUpdateJob.runInUIThread(new NullProgressMonitor()); } - + /** * Returns the current memory blocks tree viewer, or <code>null</code> + * * @return the memory blocks tree viewer or <code>null</code> */ private StructuredViewer getViewer() { if (fView instanceof MemoryView) { - MemoryView memView = (MemoryView)fView; + MemoryView memView = (MemoryView) fView; IMemoryViewPane pane = memView.getViewPane(MemoryBlocksTreeViewPane.PANE_ID); if (pane instanceof MemoryBlocksTreeViewPane) { - StructuredViewer viewer = ((MemoryBlocksTreeViewPane)pane).getViewer(); + StructuredViewer viewer = ((MemoryBlocksTreeViewPane) pane).getViewer(); return viewer; } } return null; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { switchToNext(); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { switchToNext(); } - private void switchToNext() { + private void switchToNext() { IAdaptable context = getDebugContext(); if (context instanceof IDebugElement) { - IDebugElement debugContext = (IDebugElement)context; + IDebugElement debugContext = (IDebugElement) context; IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(debugContext); if (retrieval != null) { @@ -320,13 +349,13 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega IMemoryBlock current = getCurrentMemoryBlock(); int next = 0; if (current != null) { - for (int i=0; i<memoryBlocks.length; i++) { + for (int i = 0; i < memoryBlocks.length; i++) { if (memoryBlocks[i] == current) { - next = i+1; + next = i + 1; } } } - if (next > memoryBlocks.length-1) { + if (next > memoryBlocks.length - 1) { next = 0; } SwitchToAction switchAction = new SwitchToAction(memoryBlocks[next], false); @@ -334,14 +363,22 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega } } - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action + * .IAction, org.eclipse.jface.viewers.ISelection) */ - public void selectionChanged(IAction action, ISelection selection) {} + @Override + public void selectionChanged(IAction action, ISelection selection) { + } - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; fUpdateJob.runInUIThread(new NullProgressMonitor()); @@ -349,9 +386,11 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega action.setMenuCreator(fMenuCreator); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { fAction = null; DebugPlugin.getDefault().getMemoryBlockManager().removeListener(fListener); @@ -361,15 +400,20 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega } } - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action + * .IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { switchToNext(); } /** * Returns the current memory block + * * @return the current memory block or <code>null</code> */ private IMemoryBlock getCurrentMemoryBlock() { @@ -378,15 +422,14 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega } ISelection memBlkSelection = fView.getSite().getSelectionProvider().getSelection(); IMemoryBlock memoryBlock = null; - - if (memBlkSelection != null) { - if (!memBlkSelection.isEmpty() && memBlkSelection instanceof IStructuredSelection) { - Object obj = ((IStructuredSelection)memBlkSelection).getFirstElement(); - if (obj instanceof IMemoryBlock) { - memoryBlock = (IMemoryBlock)obj; - } - else if (obj instanceof IMemoryRendering) { - memoryBlock = ((IMemoryRendering)obj).getMemoryBlock(); + + if (memBlkSelection != null) { + if (!memBlkSelection.isEmpty() && memBlkSelection instanceof IStructuredSelection) { + Object obj = ((IStructuredSelection) memBlkSelection).getFirstElement(); + if (obj instanceof IMemoryBlock) { + memoryBlock = (IMemoryBlock) obj; + } else if (obj instanceof IMemoryRendering) { + memoryBlock = ((IMemoryRendering) obj).getMemoryBlock(); } } } @@ -395,12 +438,13 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega /** * Decorate the label for the specified <code>IMemoryBlock</code> + * * @param memBlk * @param label * @return the decorated label for the specified <code>IMemoryBlock</code> */ private String decorateLabel(final IMemoryBlock memBlk, String label) { - ILabelDecorator decorator = (ILabelDecorator)memBlk.getAdapter(ILabelDecorator.class); + ILabelDecorator decorator = (ILabelDecorator) memBlk.getAdapter(ILabelDecorator.class); if (decorator != null) { label = decorator.decorateText(label, memBlk); } @@ -408,10 +452,10 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega } private IAdaptable getDebugContext() { - if (fView != null) { - return DebugUITools.getPartDebugContext(fView.getSite()); - } else { - return DebugUITools.getDebugContext(); - } + if (fView != null) { + return DebugUITools.getPartDebugContext(fView.getSite()); + } else { + return DebugUITools.getDebugContext(); + } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java index 974b876eb..80ea1e47e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java @@ -16,99 +16,94 @@ import java.util.Hashtable; import org.eclipse.debug.core.model.IMemoryBlock; - /** - * Stores synchronization information for a memory block - * Each object of synchronization information contains a memory block, - * a list of views to be synchronized and a list of properties to be syncrhonized. - * The views are responsible for defining properties to be synchronized and notifying - * the synchronizer of properties changes. This is only for keeping track of - * values of synchronized properties and firing events when properties are changed. + * Stores synchronization information for a memory block Each object of + * synchronization information contains a memory block, a list of views to be + * synchronized and a list of properties to be syncrhonized. The views are + * responsible for defining properties to be synchronized and notifying the + * synchronizer of properties changes. This is only for keeping track of values + * of synchronized properties and firing events when properties are changed. * - * Memory block serves as a key for synchronization. Views displaying the same - * memory block can be synchronized. Views displaying different memory block + * Memory block serves as a key for synchronization. Views displaying the same + * memory block can be synchronized. Views displaying different memory block * cannot be synchronized. * * @since 3.0 */ -public class SynchronizeInfo -{ - private IMemoryBlock fBlock; // memory block blocked by the views - private Hashtable fProperties; // list of properties to be synchronized +public class SynchronizeInfo { + private IMemoryBlock fBlock; // memory block blocked by the views + private Hashtable<String, Object> fProperties; // list of properties to be + // synchronized /** * Create a new synchronization info object for the memory block + * * @param block */ - public SynchronizeInfo(IMemoryBlock block) - { + public SynchronizeInfo(IMemoryBlock block) { fBlock = block; - fProperties = new Hashtable(); + fProperties = new Hashtable<String, Object>(); } - - + /** * Set a property and its value to the info object + * * @param propertyId * @param value */ - public void setProperty(String propertyId, Object value) - { + public void setProperty(String propertyId, Object value) { if (propertyId == null) return; - + if (value == null) return; - + fProperties.put(propertyId, value); } - + /** * Returns the value of the property from the info object + * * @param propertyId * @return value of the property */ - public Object getProperty(String propertyId) - { + public Object getProperty(String propertyId) { if (propertyId == null) return null; - + Object value = fProperties.get(propertyId); - - return value; + + return value; } - + /** * @return all the property ids stored in this sync info object */ - public String[] getPropertyIds() - { + public String[] getPropertyIds() { if (fProperties == null) return new String[0]; - - Enumeration enumeration = fProperties.keys(); - ArrayList ids = new ArrayList(); - - while (enumeration.hasMoreElements()) - { + + Enumeration<String> enumeration = fProperties.keys(); + ArrayList<String> ids = new ArrayList<String>(); + + while (enumeration.hasMoreElements()) { ids.add(enumeration.nextElement()); } - - return (String[])ids.toArray(new String[ids.size()]); + + return ids.toArray(new String[ids.size()]); } - + /** * Clean up the synchronization info object */ - public void delete() - { - - if (fProperties != null){ + public void delete() { + + if (fProperties != null) { fProperties.clear(); fProperties = null; } - - if (fBlock != null){ + + if (fBlock != null) { fBlock = null; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleMemoryMonitorsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleMemoryMonitorsAction.java index 8595c838f..429b22e29 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleMemoryMonitorsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleMemoryMonitorsAction.java @@ -10,17 +10,21 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.views.memory; - /** * Toggles the visiblity of a view pane. + * * @since 3.1 - * + * */ public class ToggleMemoryMonitorsAction extends ToggleViewPaneAction { - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.ToggleViewPaneAction#getPaneId() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.ToggleViewPaneAction#getPaneId + * () */ + @Override public String getPaneId() { return MemoryBlocksTreeViewPane.PANE_ID; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleSplitPaneAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleSplitPaneAction.java index 68d1474c6..bd99fa281 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleSplitPaneAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleSplitPaneAction.java @@ -14,14 +14,19 @@ import org.eclipse.debug.ui.IDebugUIConstants; /** * Toggles the visibility of the rendering view pane 2. + * * @since 3.1 - * + * */ public class ToggleSplitPaneAction extends ToggleViewPaneAction { - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.memory.ToggleViewPaneAction#getPaneId() + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.internal.ui.views.memory.ToggleViewPaneAction#getPaneId + * () */ + @Override public String getPaneId() { return IDebugUIConstants.ID_RENDERING_VIEW_PANE_2; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleViewPaneAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleViewPaneAction.java index 645c2d706..c340b3b76 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleViewPaneAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleViewPaneAction.java @@ -24,49 +24,56 @@ import org.eclipse.ui.IViewPart; /** * @since 3.1 */ -abstract public class ToggleViewPaneAction extends Action implements IViewActionDelegate, IActionDelegate2, IPropertyChangeListener { +abstract public class ToggleViewPaneAction extends Action implements IViewActionDelegate, IActionDelegate2, IPropertyChangeListener { MemoryView fView; IAction fAction; - - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { - if (view instanceof MemoryView) - { - fView = (MemoryView)view; + if (view instanceof MemoryView) { + fView = (MemoryView) view; } } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { - + if (fView == null) return; - + fView.showViewPane(!fView.isViewPaneVisible(getPaneId()), getPaneId()); - + if (fView.isViewPaneVisible(getPaneId())) action.setChecked(true); else action.setChecked(false); - + } - + + @Override public void run() { if (fView == null) return; - + fView.showViewPane(!fView.isViewPaneVisible(getPaneId()), getPaneId()); } - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action + * .IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (fView.isViewPaneVisible(getPaneId())) action.setChecked(true); @@ -74,28 +81,31 @@ abstract public class ToggleViewPaneAction extends Action implements IViewActio action.setChecked(false); } + @Override public void dispose() { DebugUITools.getPreferenceStore().removePropertyChangeListener(this); } + @Override public void init(IAction action) { fAction = action; DebugUITools.getPreferenceStore().addPropertyChangeListener(this); } + @Override public void runWithEvent(IAction action, Event event) { run(action); } + @Override public void propertyChange(PropertyChangeEvent event) { - if (fView != null && fAction != null) - { + if (fView != null && fAction != null) { if (fView.isViewPaneVisible(getPaneId())) fAction.setChecked(true); else fAction.setChecked(false); } } - - abstract public String getPaneId(); + + abstract public String getPaneId(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java index 5c7f26f37..ce31a0cb5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java @@ -19,39 +19,37 @@ import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.action.Action; import org.eclipse.ui.PlatformUI; -class ViewPaneOrientationAction extends Action -{ - private MemoryView fView; - private int fOrientation; +class ViewPaneOrientationAction extends Action { + private MemoryView fView; + private int fOrientation; - ViewPaneOrientationAction(MemoryView view, int orientation) - { - super(IInternalDebugCoreConstants.EMPTY_STRING, AS_RADIO_BUTTON); - fView = view; - fOrientation = orientation; - - if (orientation == MemoryView.HORIZONTAL_VIEW_ORIENTATION) { - setText(DebugUIMessages.ViewPaneOrientationAction_0); - setToolTipText(DebugUIMessages.ViewPaneOrientationAction_1); - setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_RIGHT)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_RIGHT)); - setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_RIGHT)); - } else if (orientation == MemoryView.VERTICAL_VIEW_ORIENTATION) { - setText(DebugUIMessages.ViewPaneOrientationAction_2); - setToolTipText(DebugUIMessages.ViewPaneOrientationAction_3); - setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_UNDER)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_UNDER)); - setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_UNDER)); - } - PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.MEMORY_VIEW_PANE_ORIENTATION_ACTION); - } + ViewPaneOrientationAction(MemoryView view, int orientation) { + super(IInternalDebugCoreConstants.EMPTY_STRING, AS_RADIO_BUTTON); + fView = view; + fOrientation = orientation; - public void run() { - fView.setViewPanesOrientation(fOrientation); - } - - public int getOrientation() - { - return fOrientation; + if (orientation == MemoryView.HORIZONTAL_VIEW_ORIENTATION) { + setText(DebugUIMessages.ViewPaneOrientationAction_0); + setToolTipText(DebugUIMessages.ViewPaneOrientationAction_1); + setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_RIGHT)); + setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_RIGHT)); + setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_RIGHT)); + } else if (orientation == MemoryView.VERTICAL_VIEW_ORIENTATION) { + setText(DebugUIMessages.ViewPaneOrientationAction_2); + setToolTipText(DebugUIMessages.ViewPaneOrientationAction_3); + setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_UNDER)); + setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_UNDER)); + setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_UNDER)); } + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.MEMORY_VIEW_PANE_ORIENTATION_ACTION); + } + + @Override + public void run() { + fView.setViewPanesOrientation(fOrientation); + } + + public int getOrientation() { + return fOrientation; } +} diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java index e20a18ee3..b16085334 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java @@ -43,185 +43,159 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; /** - * A View Pane Rendering Manager manages all the rendering from a view pane. - * It is responsible for handling debug events and removing renderings - * from the view pane as a debug session is terminated. - * In addition, the rendering manager is responsible for persisting memory renderings. - * Renderings need to be persisted when the memory view is disposed. If the view is - * opened again, the same set of renderings will be created in the view pane if - * the renderings are still valid. + * A View Pane Rendering Manager manages all the rendering from a view pane. It + * is responsible for handling debug events and removing renderings from the + * view pane as a debug session is terminated. In addition, the rendering + * manager is responsible for persisting memory renderings. Renderings need to + * be persisted when the memory view is disposed. If the view is opened again, + * the same set of renderings will be created in the view pane if the renderings + * are still valid. + * * @since 3.1 */ -public class ViewPaneRenderingMgr implements IDebugEventSetListener{ +public class ViewPaneRenderingMgr implements IDebugEventSetListener { - private final ArrayList fRenderings = new ArrayList(); + private final ArrayList<IMemoryRendering> fRenderings = new ArrayList<IMemoryRendering>(); private final IMemoryRenderingContainer fViewPane; - + private static final String RENDERINGS_TAG = "persistedMemoryRenderings"; //$NON-NLS-1$ private static final String MEMORY_RENDERING_TAG = "memoryRendering"; //$NON-NLS-1$ private static final String MEMORY_BLOCK = "memoryBlock"; //$NON-NLS-1$ private static final String RENDERING_ID = "renderingId"; //$NON-NLS-1$ - - public ViewPaneRenderingMgr(IMemoryRenderingContainer viewPane) - { + + public ViewPaneRenderingMgr(IMemoryRenderingContainer viewPane) { fViewPane = viewPane; loadPersistedRenderings(getPrefId()); } - public void removeMemoryBlockRendering(IMemoryBlock mem, String renderingId) - { - if(fRenderings == null) { + public void removeMemoryBlockRendering(IMemoryBlock mem, String renderingId) { + if (fRenderings == null) { return; } - + IMemoryRendering[] toRemove = getRenderings(mem, renderingId); - - for (int i=0; i<toRemove.length; i++) - { + + for (int i = 0; i < toRemove.length; i++) { fRenderings.remove(toRemove[i]); - + // remove listener after the last memory block has been removed - if (fRenderings.size() == 0) - { + if (fRenderings.size() == 0) { DebugPlugin.getDefault().removeDebugEventListener(this); } } - + storeRenderings(); } - public void addMemoryBlockRendering(IMemoryRendering rendering) { - + // do not allow duplicated objects if (fRenderings.contains(rendering)) { return; } - + fRenderings.add(rendering); - + // add listener for the first memory block added - if (fRenderings.size() == 1) - { + if (fRenderings.size() == 1) { DebugPlugin.getDefault().addDebugEventListener(this); } - + storeRenderings(); } - public void removeMemoryBlockRendering(IMemoryRendering rendering) { - if(rendering == null) { + if (rendering == null) { return; } - - if(!fRenderings.contains(rendering)) { + + if (!fRenderings.contains(rendering)) { return; } - + fRenderings.remove(rendering); - + // remove listener after the last memory block has been removed - if (fRenderings.size() == 0) - { + if (fRenderings.size() == 0) { DebugPlugin.getDefault().removeDebugEventListener(this); } - + storeRenderings(); } - public IMemoryRendering[] getRenderings(IMemoryBlock mem, String renderingId) - { - if (renderingId == null) - { + public IMemoryRendering[] getRenderings(IMemoryBlock mem, String renderingId) { + if (renderingId == null) { return getRenderingsFromMemoryBlock(mem); } - - ArrayList ret = new ArrayList(); - for (int i=0; i<fRenderings.size(); i++) - { - if (fRenderings.get(i) instanceof IMemoryRendering) - { - IMemoryRendering rendering = (IMemoryRendering)fRenderings.get(i); - if (rendering.getMemoryBlock() == mem && renderingId.equals(rendering.getRenderingId())) - { + + ArrayList<IMemoryRendering> ret = new ArrayList<IMemoryRendering>(); + for (int i = 0; i < fRenderings.size(); i++) { + if (fRenderings.get(i) != null) { + IMemoryRendering rendering = fRenderings.get(i); + if (rendering.getMemoryBlock() == mem && renderingId.equals(rendering.getRenderingId())) { ret.add(rendering); } } } - - return (IMemoryRendering[])ret.toArray(new IMemoryRendering[ret.size()]); + + return ret.toArray(new IMemoryRendering[ret.size()]); } - - public IMemoryRendering[] getRenderings() - { - return (IMemoryRendering[])fRenderings.toArray(new IMemoryRendering[fRenderings.size()]); + + public IMemoryRendering[] getRenderings() { + return fRenderings.toArray(new IMemoryRendering[fRenderings.size()]); } - public IMemoryRendering[] getRenderingsFromDebugTarget(IDebugTarget target) - { - ArrayList ret = new ArrayList(); - for (int i=0; i<fRenderings.size(); i++) - { - if (fRenderings.get(i) instanceof IMemoryRendering) - { - IMemoryRendering rendering = (IMemoryRendering)fRenderings.get(i); - if (rendering.getMemoryBlock().getDebugTarget() == target) - { + public IMemoryRendering[] getRenderingsFromDebugTarget(IDebugTarget target) { + ArrayList<IMemoryRendering> ret = new ArrayList<IMemoryRendering>(); + for (int i = 0; i < fRenderings.size(); i++) { + if (fRenderings.get(i) != null) { + IMemoryRendering rendering = fRenderings.get(i); + if (rendering.getMemoryBlock().getDebugTarget() == target) { ret.add(rendering); } } } - - return (IMemoryRendering[])ret.toArray(new IMemoryRendering[ret.size()]); + + return ret.toArray(new IMemoryRendering[ret.size()]); } - - - public IMemoryRendering[] getRenderingsFromMemoryBlock(IMemoryBlock block) - { - ArrayList ret = new ArrayList(); - for (int i=0; i<fRenderings.size(); i++) - { - if (fRenderings.get(i) instanceof IMemoryRendering) - { - IMemoryRendering rendering = (IMemoryRendering)fRenderings.get(i); - if (rendering.getMemoryBlock() == block) - { + + public IMemoryRendering[] getRenderingsFromMemoryBlock(IMemoryBlock block) { + ArrayList<IMemoryRendering> ret = new ArrayList<IMemoryRendering>(); + for (int i = 0; i < fRenderings.size(); i++) { + if (fRenderings.get(i) != null) { + IMemoryRendering rendering = fRenderings.get(i); + if (rendering.getMemoryBlock() == block) { ret.add(rendering); } } } - - return (IMemoryRendering[])ret.toArray(new IMemoryRendering[ret.size()]); - } - - + return ret.toArray(new IMemoryRendering[ret.size()]); + } + + @Override public void handleDebugEvents(DebugEvent[] events) { - - for (int i=0; i < events.length; i++) { + + for (int i = 0; i < events.length; i++) { handleDebugEvent(events[i]); } - + } - + public void handleDebugEvent(DebugEvent event) { Object obj = event.getSource(); IDebugTarget dt = null; - - if (event.getKind() == DebugEvent.TERMINATE) - { + + if (event.getKind() == DebugEvent.TERMINATE) { // a terminate event could happen from an IThread or IDebugTarget // Only handle terminate event from debug target - if (obj instanceof IDebugTarget) - { - dt = ((IDebugTarget)obj); - + if (obj instanceof IDebugTarget) { + dt = ((IDebugTarget) obj); + // returns empty array if dt == null IMemoryRendering[] deletedrendering = getRenderingsFromDebugTarget(dt); - - for (int i=0; i<deletedrendering.length; i++) - { + + for (int i = 0; i < deletedrendering.length; i++) { removeMemoryBlockRendering(deletedrendering[i].getMemoryBlock(), deletedrendering[i].getRenderingId()); fViewPane.removeMemoryRendering(deletedrendering[i]); } @@ -229,11 +203,10 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ } } - public void dispose() - { + public void dispose() { // remove all renderings fRenderings.clear(); - + String secondaryId = getViewSiteSecondaryId(); if (secondaryId != null) { // do not save renderings if this is not the primary rendering view @@ -248,19 +221,18 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ } } } - + DebugPlugin.getDefault().removeDebugEventListener(this); } - + /** - * Store renderings as preferences. If renderings are stored, renderings - * can be persisted even after the memory view is closed. + * Store renderings as preferences. If renderings are stored, renderings can + * be persisted even after the memory view is closed. */ - private void storeRenderings() - { - String renderingsStr= IInternalDebugCoreConstants.EMPTY_STRING; + private void storeRenderings() { + String renderingsStr = IInternalDebugCoreConstants.EMPTY_STRING; try { - renderingsStr= getRenderingsAsXML(); + renderingsStr = getRenderingsAsXML(); } catch (IOException e) { DebugUIPlugin.log(e); } catch (ParserConfigurationException e) { @@ -268,16 +240,15 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ } catch (TransformerException e) { DebugUIPlugin.log(e); } - + String prefid = getPrefId(); IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); - if(node != null) { + if (node != null) { if (renderingsStr != null) { node.put(prefid, renderingsStr); - } - else { + } else { IEclipsePreferences def = DefaultScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); - if(def != null) { + if (def != null) { node.put(prefid, def.get(prefid, IInternalDebugCoreConstants.EMPTY_STRING)); } } @@ -290,47 +261,47 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ } private String getPrefId() { - // constructs id based on memory view's secondary id + the rendering view pane id - // format: secondaryId:viewPaneId + // constructs id based on memory view's secondary id + the rendering + // view pane id + // format: secondaryId:viewPaneId StringBuffer id = new StringBuffer(); IMemoryRenderingSite renderingSite = fViewPane.getMemoryRenderingSite(); IWorkbenchPartSite ps = renderingSite.getSite(); - if (ps instanceof IViewSite) - { - IViewSite vs = (IViewSite)ps; + if (ps instanceof IViewSite) { + IViewSite vs = (IViewSite) ps; String secondaryId = vs.getSecondaryId(); - if (secondaryId != null) - { + if (secondaryId != null) { id.append(secondaryId); id.append(":"); //$NON-NLS-1$ } - + } id.append(fViewPane.getId()); String prefId = id.toString(); return prefId; } - + /** * Convert renderings to xml text + * * @return * @throws IOException * @throws ParserConfigurationException * @throws TransformerException */ private String getRenderingsAsXML() throws IOException, ParserConfigurationException, TransformerException { - IMemoryRendering[] renderings= (IMemoryRendering[])fRenderings.toArray(new IMemoryRendering[fRenderings.size()]); - + IMemoryRendering[] renderings = fRenderings.toArray(new IMemoryRendering[fRenderings.size()]); + if (renderings.length == 0) { return null; } - - Document document= LaunchManager.getDocument(); - Element rootElement= document.createElement(RENDERINGS_TAG); + + Document document = LaunchManager.getDocument(); + Element rootElement = document.createElement(RENDERINGS_TAG); document.appendChild(rootElement); for (int i = 0; i < renderings.length; i++) { - IMemoryRendering rendering= renderings[i]; - Element element= document.createElement(MEMORY_RENDERING_TAG); + IMemoryRendering rendering = renderings[i]; + Element element = document.createElement(MEMORY_RENDERING_TAG); element.setAttribute(MEMORY_BLOCK, Integer.toString(rendering.getMemoryBlock().hashCode())); element.setAttribute(RENDERING_ID, rendering.getRenderingId()); rootElement.appendChild(element); @@ -342,11 +313,8 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ * Load renderings currently stored. */ private void loadPersistedRenderings(String prefId) { - String renderingsStr = Platform.getPreferencesService().getString( - DebugUIPlugin.getUniqueIdentifier(), - prefId, - "", //$NON-NLS-1$ - null); + String renderingsStr = Platform.getPreferencesService().getString(DebugUIPlugin.getUniqueIdentifier(), prefId, "", //$NON-NLS-1$ + null); if (renderingsStr.length() == 0) { return; } @@ -361,53 +329,48 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ DebugUIPlugin.logErrorMessage("Invalid format encountered while loading memory renderings."); //$NON-NLS-1$ return; } - NodeList list= root.getChildNodes(); - boolean renderingsAdded= false; - for (int i= 0, numItems= list.getLength(); i < numItems; i++) { - Node node= list.item(i); + NodeList list = root.getChildNodes(); + boolean renderingsAdded = false; + for (int i = 0, numItems = list.getLength(); i < numItems; i++) { + Node node = list.item(i); if (node.getNodeType() == Node.ELEMENT_NODE) { - Element element= (Element) node; + Element element = (Element) node; if (!element.getNodeName().equals(MEMORY_RENDERING_TAG)) { DebugUIPlugin.logErrorMessage("Invalid XML element encountered while loading memory rendering."); //$NON-NLS-1$ continue; } - String memoryBlockHashCode= element.getAttribute(MEMORY_BLOCK); + String memoryBlockHashCode = element.getAttribute(MEMORY_BLOCK); String renderingId = element.getAttribute(RENDERING_ID); - + IMemoryBlock[] memoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(); IMemoryBlock memoryBlock = null; - for (int j=0; j<memoryBlocks.length; j++) - { + for (int j = 0; j < memoryBlocks.length; j++) { if (Integer.toString(memoryBlocks[j].hashCode()).equals(memoryBlockHashCode)) { memoryBlock = memoryBlocks[j]; } } - - if (memoryBlock != null) - { - IMemoryRenderingType[] types = DebugUITools.getMemoryRenderingManager().getRenderingTypes(memoryBlock); + + if (memoryBlock != null) { + IMemoryRenderingType[] types = DebugUITools.getMemoryRenderingManager().getRenderingTypes(memoryBlock); IMemoryRenderingType type = null; - for (int k=0; k<types.length; k++) - { + for (int k = 0; k < types.length; k++) { if (types[k].getId().equals(renderingId)) { type = types[k]; } } - - // if memory block is not found, the rendering is no longer valid + + // if memory block is not found, the rendering is no longer + // valid // simply ignore the rendering - if (type != null) - { + if (type != null) { try { - + IMemoryRendering rendering = type.createRendering(); - if (rendering != null) - { + if (rendering != null) { rendering.init(fViewPane, memoryBlock); - if (!fRenderings.contains(rendering)) - { - fRenderings.add(rendering); - renderingsAdded= true; + if (!fRenderings.contains(rendering)) { + fRenderings.add(rendering); + renderingsAdded = true; } } } catch (CoreException e1) { @@ -420,18 +383,16 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ if (renderingsAdded) { DebugPlugin.getDefault().addDebugEventListener(this); } - } - + } + /** * @return secondary id, or null if not available */ - private String getViewSiteSecondaryId() - { + private String getViewSiteSecondaryId() { IMemoryRenderingSite renderingSite = fViewPane.getMemoryRenderingSite(); IWorkbenchPartSite ps = renderingSite.getSite(); - if (ps instanceof IViewSite) - { - IViewSite vs = (IViewSite)ps; + if (ps instanceof IViewSite) { + IViewSite vs = (IViewSite) ps; String secondaryId = vs.getSecondaryId(); return secondaryId; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneSelectionProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneSelectionProvider.java index c375da726..8e8c7795c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneSelectionProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneSelectionProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ - + package org.eclipse.debug.internal.ui.views.memory; import java.util.ArrayList; @@ -18,60 +18,67 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; - /** * Handles selection changes in a rendering view pane. + * * @since 3.1 - * + * */ -public class ViewPaneSelectionProvider implements ISelectionProvider -{ - ArrayList fListeners = new ArrayList(); +public class ViewPaneSelectionProvider implements ISelectionProvider { + ArrayList<ISelectionChangedListener> fListeners = new ArrayList<ISelectionChangedListener>(); ISelection fSelection; - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener + * (org.eclipse.jface.viewers.ISelectionChangedListener) */ - public void addSelectionChangedListener(ISelectionChangedListener listener) - { + @Override + public void addSelectionChangedListener(ISelectionChangedListener listener) { if (!fListeners.contains(listener)) fListeners.add(listener); - + } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() */ - public ISelection getSelection() - { + @Override + public ISelection getSelection() { return fSelection; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener + * (org.eclipse.jface.viewers.ISelectionChangedListener) */ - public void removeSelectionChangedListener(ISelectionChangedListener listener) - { + @Override + public void removeSelectionChangedListener(ISelectionChangedListener listener) { if (fListeners.contains(listener)) fListeners.remove(listener); - + } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse + * .jface.viewers.ISelection) */ - public void setSelection(ISelection selection) - { + @Override + public void setSelection(ISelection selection) { fSelection = selection; fireChanged(); } - - public void fireChanged() - { + + public void fireChanged() { SelectionChangedEvent evt = new SelectionChangedEvent(this, getSelection()); - for (int i=0; i<fListeners.size(); i++) - { - ((ISelectionChangedListener)fListeners.get(i)).selectionChanged(evt); + for (int i = 0; i < fListeners.size(); i++) { + fListeners.get(i).selectionChanged(evt); } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java index 13631cd25..f129ae23c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java @@ -24,78 +24,72 @@ import org.eclipse.swt.events.SelectionListener; */ public class ViewTabEnablementManager implements SelectionListener { - /* (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt + * .events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { - if (e.getSource() instanceof CTabFolder) - { + if (e.getSource() instanceof CTabFolder) { handleTabFolderSelection(e); } } - /* (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse + * .swt.events.SelectionEvent) */ + @Override public void widgetDefaultSelected(SelectionEvent e) { - - + } - - private void handleTabFolderSelection(SelectionEvent event) - { - CTabFolder folder = (CTabFolder)event.getSource(); - + + private void handleTabFolderSelection(SelectionEvent event) { + CTabFolder folder = (CTabFolder) event.getSource(); + CTabItem selectedItem = folder.getSelection(); IMemoryViewTab selectedViewTab; - + // get selected view tab - if (selectedItem != null) - { + if (selectedItem != null) { Object obj = selectedItem.getData(); - - if (obj instanceof IMemoryViewTab) - { - selectedViewTab = (IMemoryViewTab)obj; - } - else - { + + if (obj instanceof IMemoryViewTab) { + selectedViewTab = (IMemoryViewTab) obj; + } else { return; } - } - else - { + } else { return; } - + // get all tabs CTabItem[] allTabs = folder.getItems(); - + // check all tabs to make sure they are enabled/disabled properly - for (int i=0; i<allTabs.length; i++) - { + for (int i = 0; i < allTabs.length; i++) { IMemoryViewTab viewTab; Object obj = allTabs[i].getData(); - - if (obj instanceof IMemoryViewTab) - { - viewTab = (IMemoryViewTab)obj; - + + if (obj instanceof IMemoryViewTab) { + viewTab = (IMemoryViewTab) obj; + // if view tab matches the selected item - if (viewTab == selectedViewTab && !viewTab.isEnabled() ) - { + if (viewTab == selectedViewTab && !viewTab.isEnabled()) { // if the item has been selected and this tab is not enabled // enable it. viewTab.setEnabled(true); viewTab.getRendering().activated(); - - } - else if (viewTab != selectedViewTab && viewTab.isEnabled()) - { + + } else if (viewTab != selectedViewTab && viewTab.isEnabled()) { // if the tab is not selected, disable it viewTab.setEnabled(false); viewTab.getRendering().deactivated(); - } + } } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRendering.java index 4d2b01e90..946a2c5ad 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRendering.java @@ -37,6 +37,7 @@ public class ASCIIRendering extends AbstractAsyncTextRendering{ setCodePage(codepage); } + @Override public void dispose() { super.dispose(); } @@ -44,6 +45,7 @@ public class ASCIIRendering extends AbstractAsyncTextRendering{ /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.AbstractMemoryRendering#getNumCharsPerByte() */ + @Override public int getNumCharsPerByte() { return numCharsPerByte; } @@ -52,6 +54,7 @@ public class ASCIIRendering extends AbstractAsyncTextRendering{ /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.AbstractTableRendering#getBytes(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String) */ + @Override public byte[] getBytes( String renderingId, BigInteger address, @@ -76,6 +79,7 @@ public class ASCIIRendering extends AbstractAsyncTextRendering{ /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.AbstractTableRendering#getString(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[]) */ + @Override public String getString( String renderingId, BigInteger address, @@ -105,6 +109,7 @@ public class ASCIIRendering extends AbstractAsyncTextRendering{ /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { // handle code page changed event diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRenderingTypeDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRenderingTypeDelegate.java index 73c01e051..d242860a6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRenderingTypeDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRenderingTypeDelegate.java @@ -23,6 +23,7 @@ public class ASCIIRenderingTypeDelegate implements IMemoryRenderingTypeDelegate /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate#createRendering(java.lang.String) */ + @Override public IMemoryRendering createRendering(String id) throws CoreException { return new ASCIIRendering(id); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractBaseTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractBaseTableRendering.java index 7eb33d120..dda837e40 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractBaseTableRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractBaseTableRendering.java @@ -87,6 +87,7 @@ public abstract class AbstractBaseTableRendering extends AbstractMemoryRendering /** * @return the label of this rendering */ + @Override abstract public String getLabel(); /** @@ -102,6 +103,7 @@ public abstract class AbstractBaseTableRendering extends AbstractMemoryRendering * @param address address to position cursor at * @throws DebugException if an exception occurrs */ + @Override abstract public void goToAddress(BigInteger address) throws DebugException; /** @@ -109,6 +111,7 @@ public abstract class AbstractBaseTableRendering extends AbstractMemoryRendering * * @return the currently selected address in this rendering */ + @Override abstract public BigInteger getSelectedAddress(); /** @@ -124,6 +127,7 @@ public abstract class AbstractBaseTableRendering extends AbstractMemoryRendering * @return the currently selected content in array of MemoryByte. * Returns an empty array if the selected address is out of buffered range. */ + @Override abstract public MemoryByte[] getSelectedAsBytes(); /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractIntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractIntegerRendering.java index 9f11c9779..a8cab1aaa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractIntegerRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractIntegerRendering.java @@ -29,6 +29,7 @@ public abstract class AbstractIntegerRendering extends AbstractAsyncTableRenderi super(renderingId); } + @Override public void init(IMemoryRenderingContainer container, IMemoryBlock block) { super.init(container, block); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractTableRenderingLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractTableRenderingLabelProvider.java index 8fcbf331a..b48978798 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractTableRenderingLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractTableRenderingLabelProvider.java @@ -44,6 +44,7 @@ abstract public class AbstractTableRenderingLabelProvider extends LabelProvider /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { fRendering = null; super.dispose(); @@ -52,6 +53,7 @@ abstract public class AbstractTableRenderingLabelProvider extends LabelProvider /** * @see ITableLabelProvider#getColumnImage(Object, int) */ + @Override public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) @@ -78,6 +80,7 @@ abstract public class AbstractTableRenderingLabelProvider extends LabelProvider /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) */ + @Override public String getColumnText(Object element, int columnIndex) { String columnLabel = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java index c366b2dcc..a4f056241 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,70 +16,62 @@ import org.eclipse.debug.internal.ui.viewers.AsynchronousTableModel; import org.eclipse.debug.internal.ui.viewers.AsynchronousViewer; import org.eclipse.debug.internal.ui.viewers.ModelNode; -abstract public class AbstractVirtualContentTableModel extends AsynchronousTableModel{ +abstract public class AbstractVirtualContentTableModel extends AsynchronousTableModel { public AbstractVirtualContentTableModel(AsynchronousViewer viewer) { super(viewer); } - public Object[] getElements() - { + public Object[] getElements() { ModelNode[] nodes = getNodes(getRootNode().getElement()); - ArrayList result = new ArrayList(); - if (nodes != null) - { - for (int i=0; i<nodes.length; i++) - { + ArrayList<Object> result = new ArrayList<Object>(); + if (nodes != null) { + for (int i = 0; i < nodes.length; i++) { ModelNode[] children = nodes[i].getChildrenNodes(); - if (children != null) - { - for (int j=0; j<children.length; j++) - { + if (children != null) { + for (int j = 0; j < children.length; j++) { result.add(children[j].getElement()); } } } - + return result.toArray(); } return new Object[0]; } - - public Object getElement(int idx) - { + + public Object getElement(int idx) { Object[] elements = getElements(); - if (idx >=0 && idx < elements.length) + if (idx >= 0 && idx < elements.length) { return elements[idx]; + } return null; } - - public int indexOfElement(Object element) - { + public int indexOfElement(Object element) { Object[] elements = getElements(); - - for (int i=0; i<elements.length; i++) - { - if (elements[i] == element) + + for (int i = 0; i < elements.length; i++) { + if (elements[i] == element) { return i; + } } return -1; } - + abstract public int indexOfKey(Object key); - + abstract public int columnOf(Object element, Object key); - + abstract public Object getKey(int idx); - + abstract public Object getKey(Object element); - + abstract public Object getKey(int idx, int col); - - public void handleViewerChanged() - { - + + public void handleViewerChanged() { + } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncCopyTableRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncCopyTableRenderingAction.java index 18593a7d4..854148932 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncCopyTableRenderingAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncCopyTableRenderingAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,40 +18,39 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; /** - * Copy action for <code>AbstractAsyncTableRendering</code>. Only copy what is visible in the view. - * + * Copy action for <code>AbstractAsyncTableRendering</code>. Only copy what is + * visible in the view. + * */ -public class AsyncCopyTableRenderingAction extends - CopyTableRenderingToClipboardAction { +public class AsyncCopyTableRenderingAction extends CopyTableRenderingToClipboardAction { public AsyncCopyTableRenderingAction(AbstractBaseTableRendering rendering, StructuredViewer viewer) { super(rendering, viewer); } + @Override protected String concatenateTableAsString(TableItem[] itemList) { - + Table table = null; if (itemList.length > 0) { table = itemList[0].getParent(); - + int topIndex = table.getTopIndex(); int itemCount = table.getItemCount(); - int numVisibleLines = Math.min((table.getBounds().height / table.getItemHeight()) + 2, itemCount - topIndex); - - ArrayList items = new ArrayList(); - + int numVisibleLines = Math.min((table.getBounds().height / table.getItemHeight()) + 2, itemCount - topIndex); + + ArrayList<TableItem> items = new ArrayList<TableItem>(); + // start at top index until there is no more data in the table - for (int i=topIndex; i< topIndex + numVisibleLines; i++) - { - if (itemList[i].getData() != null) - { + for (int i = topIndex; i < topIndex + numVisibleLines; i++) { + if (itemList[i].getData() != null) { items.add(itemList[i]); - } - else + } else { break; + } } - - return super.concatenateTableAsString((TableItem[]) items.toArray(new TableItem[items.size()])); + + return super.concatenateTableAsString(items.toArray(new TableItem[items.size()])); } return IInternalDebugCoreConstants.EMPTY_STRING; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncPrintTableRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncPrintTableRenderingAction.java index ed3b15f22..d132fbedc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncPrintTableRenderingAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncPrintTableRenderingAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -20,8 +20,9 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; /** - * Print action for <code>AbstractAsyncTableRendering</code>. Only print what is visible in the view. - * + * Print action for <code>AbstractAsyncTableRendering</code>. Only print what is + * visible in the view. + * */ public class AsyncPrintTableRenderingAction extends PrintTableRenderingAction { @@ -29,29 +30,28 @@ public class AsyncPrintTableRenderingAction extends PrintTableRenderingAction { super(rendering, viewer); } + @Override protected void printTable(TableItem[] itemList, GC printGC, Printer printer) { Table table = null; if (itemList.length > 0) { table = itemList[0].getParent(); - + int topIndex = table.getTopIndex(); int itemCount = table.getItemCount(); - int numVisibleLines = Math.min((table.getBounds().height / table.getItemHeight()) + 2, itemCount - topIndex); - - ArrayList items = new ArrayList(); - + int numVisibleLines = Math.min((table.getBounds().height / table.getItemHeight()) + 2, itemCount - topIndex); + + ArrayList<TableItem> items = new ArrayList<TableItem>(); + // start at top index until there is no more data in the table - for (int i=topIndex; i< topIndex + numVisibleLines; i++) - { - if (itemList[i].getData() != null) - { + for (int i = topIndex; i < topIndex + numVisibleLines; i++) { + if (itemList[i].getData() != null) { items.add(itemList[i]); - } - else + } else { break; + } } - - super.printTable((TableItem[])items.toArray(new TableItem[items.size()]), printGC, printer); + + super.printTable(items.toArray(new TableItem[items.size()]), printGC, printer); } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java index b893ef4a8..8cc3feea2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java @@ -48,6 +48,7 @@ public class AsyncTableRenderingCellModifier implements ICellModifier { Job job = new Job("AsyncTableRenderingCellModifier"){ //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { fMBSupportsValueModification = fRendering.getMemoryBlock().supportsValueModification(); return Status.OK_STATUS; @@ -62,7 +63,8 @@ public class AsyncTableRenderingCellModifier implements ICellModifier { * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, * java.lang.String) */ - public boolean canModify(Object element, String property) { + @Override + public boolean canModify(Object element, String property) { boolean canModify = true; try { if (!(element instanceof MemorySegment)) @@ -122,7 +124,8 @@ public class AsyncTableRenderingCellModifier implements ICellModifier { * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, * java.lang.String) */ - public Object getValue(Object element, String property) { + @Override + public Object getValue(Object element, String property) { // give back the value of the column @@ -160,7 +163,8 @@ public class AsyncTableRenderingCellModifier implements ICellModifier { * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, * java.lang.String, java.lang.Object) */ - public void modify(Object element, final String property, final Object value) { + @Override + public void modify(Object element, final String property, final Object value) { MemorySegment segment = null; if (element instanceof TableItem) { @@ -179,6 +183,7 @@ public class AsyncTableRenderingCellModifier implements ICellModifier { Job job = new Job("Set Values"){ //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { try { // calculate offset to update diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java index e27c07344..3d568e8c1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java @@ -35,6 +35,7 @@ import org.eclipse.ui.progress.UIJob; */ public class AsyncTableRenderingUpdatePolicy extends TableUpdatePolicy { + @Override public void modelChanged(IModelDelta node, IModelProxy proxy) { // clear current cache as it becomes invalid when the memory block is changed @@ -123,6 +124,7 @@ public class AsyncTableRenderingUpdatePolicy extends TableUpdatePolicy descriptor.updateContentBaseAddress(); UIJob job = new UIJob("go to address"){ //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { try { rendering.goToAddress(address); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java index 1b8736878..64c70baae 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java @@ -91,15 +91,18 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { fCol = col; } + @Override public void applyEditorValue() { fEditor.removeListener(this); modifyValue(fRow, fCol, fEditor.getValue()); } + @Override public void cancelEditor() { fEditor.removeListener(this); } + @Override public void editorValueChanged(boolean oldValidState, boolean newValidState) { } @@ -123,6 +126,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { fRendering = rendering; getTable().addMouseListener(new MouseAdapter() { + @Override public void mouseDown(MouseEvent e) { handleTableMouseEvent(e); }}); @@ -130,6 +134,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { createCursor(getTable()); } + @Override public AbstractUpdatePolicy createUpdatePolicy() { return new AsyncTableRenderingUpdatePolicy(); } @@ -152,6 +157,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { fTableCursor.setFont(JFaceResources.getFont(IInternalDebugUIConstants.FONT_NAME)); fCursorKeyAdapter = new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { handleCursorKeyPressed(e); @@ -161,6 +167,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { fTableCursor.addKeyListener(fCursorKeyAdapter); fCursorTraverseListener = new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { handleCursorTraverseEvt(e); }}; @@ -168,6 +175,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { fTableCursor.addTraverseListener(fCursorTraverseListener); fCursorMouseListener = new MouseAdapter() { + @Override public void mouseDown(MouseEvent e) { handleCursorMouseEvent(e); }}; @@ -176,6 +184,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { // cursor may be disposed before disposed is called // remove listeners whenever the cursor is disposed fTableCursor.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (fTableCursor == null) return; @@ -186,6 +195,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { }}); fCursorSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleCursorMoved(); } @@ -321,6 +331,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { UIJob uiJob = new UIJob("Set Cursor Selection"){ //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { try { if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { @@ -465,6 +476,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { } + @Override protected synchronized void preservingSelection(Runnable updateCode) { Object oldTopIndexKey = null; @@ -536,6 +548,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { } } + @Override public void dispose() { super.dispose(); @@ -571,6 +584,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { { UIJob job = new UIJob("show table cursor"){ //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (!fTableCursor.isDisposed()) { @@ -725,6 +739,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { private void addListeners(Control control) { fEditorKeyListener = new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { handleKeyEventInEditor(e); } @@ -741,6 +756,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { final KeyEvent e = event; Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { Object obj = e.getSource(); @@ -884,13 +900,16 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { * This is not a real table labe provider, only goes to the table * to get the text at the specified row and column. */ + @Override public IBaseLabelProvider getLabelProvider() { return new ITableLabelProvider() { + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } + @Override public String getColumnText(Object element, int columnIndex) { int idx = getVirtualContentModel().indexOfElement(element); if (idx >= 0 ) @@ -901,16 +920,20 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { return IInternalDebugCoreConstants.EMPTY_STRING; } + @Override public void addListener(ILabelProviderListener listener) { } + @Override public void dispose() { } + @Override public boolean isLabelProperty(Object element, String property) { return false; } + @Override public void removeListener(ILabelProviderListener listener) { }}; } @@ -932,6 +955,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { fPendingFormatViewer = false; preservingSelection(new Runnable() { + @Override public void run() { // causes the content of the table viewer to be replaced // without asking content adapter for content @@ -952,10 +976,12 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { } } + @Override public void handlePresentationFailure(IStatusMonitor monitor, IStatus status) { super.handlePresentationFailure(monitor, status); } + @Override public void refresh(boolean getContent) { if (getContent) @@ -964,6 +990,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { { preservingSelection(new Runnable() { + @Override public void run() { AbstractVirtualContentTableModel model = getVirtualContentModel(); if (model != null) @@ -976,6 +1003,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { } } + @Override protected void tableTopIndexSetComplete() { if (!fTableCursor.isDisposed()) @@ -993,15 +1021,18 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousViewer#getModel() */ + @Override public AsynchronousModel getModel() { return super.getModel(); } // TODO: need pluggable model to be truly flexible + @Override protected AbstractVirtualContentTableModel createVirtualContentTableModel() { return new TableRenderingModel(this); } + @Override protected void updateComplete(IStatusMonitor monitor) { super.updateComplete(monitor); @@ -1016,6 +1047,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { { preservingSelection(new Runnable() { + @Override public void run() { int[] coordinates = getCoordinatesFromKey(getSelectionKey()); @@ -1034,6 +1066,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { } } + @Override protected void clear(Widget item) { super.clear(item); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java index f1759b003..46ea5d76d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -40,8 +40,8 @@ import org.eclipse.ui.progress.UIJob; abstract public class AsyncVirtualContentTableViewer extends AsynchronousTableViewer { private Object fPendingTopIndexKey; - private ArrayList fTopIndexQueue = new ArrayList(); - + private ArrayList<Object> fTopIndexQueue = new ArrayList<Object>(); + private boolean fPendingResizeColumns; private ListenerList fVirtualContentListeners; private SelectionListener fScrollSelectionListener; @@ -54,57 +54,52 @@ abstract public class AsyncVirtualContentTableViewer extends AsynchronousTableVi fPresentationErrorListeners = new ListenerList(); initScrollBarListener(); } - - private void initScrollBarListener() - { + + private void initScrollBarListener() { ScrollBar scroll = getTable().getVerticalBar(); fScrollSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleScrollBarSelection(); - }}; + } + }; scroll.addSelectionListener(fScrollSelectionListener); } - public void setTopIndex(Object key) - { + public void setTopIndex(Object key) { fPendingTopIndexKey = key; attemptSetTopIndex(); } - - protected Object getPendingSetTopIndexKey() - { + + protected Object getPendingSetTopIndexKey() { return fPendingTopIndexKey; } - + + @Override protected void handlePresentationFailure(IStatusMonitor monitor, IStatus status) { notifyPresentationError(monitor, status); } - - public void disposeColumns() - { + + public void disposeColumns() { // clean up old columns TableColumn[] oldColumns = getTable().getColumns(); - - for (int i=0; i<oldColumns.length; i++) - { + + for (int i = 0; i < oldColumns.length; i++) { oldColumns[i].dispose(); } } - - public void disposeCellEditors() - { + + public void disposeCellEditors() { // clean up old cell editors CellEditor[] oldCellEditors = getCellEditors(); - - if (oldCellEditors != null) - { - for (int i=0; i<oldCellEditors.length; i++) - { + + if (oldCellEditors != null) { + for (int i = 0; i < oldCellEditors.length; i++) { oldCellEditors[i].dispose(); } } } - + /** * Resize column to the preferred size. */ @@ -112,197 +107,183 @@ abstract public class AsyncVirtualContentTableViewer extends AsynchronousTableVi fPendingResizeColumns = true; fPendingResizeColumns = attemptResizeColumnsToPreferredSize(); } - - private boolean attemptResizeColumnsToPreferredSize() - { - if (fPendingResizeColumns) - { - if(!hasPendingUpdates()) { - UIJob job = new UIJob("packcolumns"){ //$NON-NLS-1$ + private boolean attemptResizeColumnsToPreferredSize() { + if (fPendingResizeColumns) { + if (!hasPendingUpdates()) { + UIJob job = new UIJob("packcolumns") { //$NON-NLS-1$ + + @Override public IStatus runInUIThread(IProgressMonitor monitor) { Table table = getTable(); - - if (!table.isDisposed()) - { - // if table size is zero, the rendering has not been made visible + + if (!table.isDisposed()) { + // if table size is zero, the rendering has not been + // made visible // cannot pack until the rendering is visible - if (table.getSize().x > 0) - { + if (table.getSize().x > 0) { TableColumn[] columns = table.getColumns(); - for (int i=0 ;i<columns.length-1; i++) - { + for (int i = 0; i < columns.length - 1; i++) { columns[i].pack(); - } - } - else - { + } + } else { fPendingResizeColumns = true; } } return Status.OK_STATUS; - }}; + } + }; job.setSystem(true); - job.schedule(); + job.schedule(); return false; } } return fPendingResizeColumns; } - + /** * Attempts to update any pending setTopIndex */ protected synchronized void attemptSetTopIndex() { if (fPendingTopIndexKey != null) { - Object remaining = doAttemptSetTopIndex(fPendingTopIndexKey); - if (remaining == null) - { - fPendingTopIndexKey = remaining; - } + Object remaining = doAttemptSetTopIndex(fPendingTopIndexKey); + if (remaining == null) { + fPendingTopIndexKey = remaining; + } } } - - private synchronized Object doAttemptSetTopIndex(final Object topIndexKey) - { + + private synchronized Object doAttemptSetTopIndex(final Object topIndexKey) { final int i = getVirtualContentModel().indexOfKey(topIndexKey); - if (i >= 0) - { - UIJob job = new UIJob("set top index"){ //$NON-NLS-1$ - - public IStatus runInUIThread(IProgressMonitor monitor) { - if (getTable().isDisposed()) - { - fTopIndexQueue.clear(); - return Status.OK_STATUS; + if (i >= 0) { + UIJob job = new UIJob("set top index") { //$NON-NLS-1$ + + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { + if (getTable().isDisposed()) { + fTopIndexQueue.clear(); + return Status.OK_STATUS; + } + + int idx = getVirtualContentModel().indexOfKey(topIndexKey); + if (idx >= 0) { + if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { + DebugUIPlugin.trace("actual set top index: " + ((BigInteger) topIndexKey).toString(16)); //$NON-NLS-1$ } - - int idx = getVirtualContentModel().indexOfKey(topIndexKey); - if (idx >= 0) - { + fPendingTopIndexKey = null; + setTopIndexKey(topIndexKey); + getTable().setTopIndex(idx); + tableTopIndexSetComplete(); + + if (getTable().getTopIndex() != idx) { if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { - DebugUIPlugin.trace("actual set top index: " + ((BigInteger)topIndexKey).toString(16)); //$NON-NLS-1$ + DebugUIPlugin.trace(">>> FAILED set top index : " + ((BigInteger) topIndexKey).toString(16)); //$NON-NLS-1$ } - fPendingTopIndexKey = null; - setTopIndexKey(topIndexKey); - getTable().setTopIndex(idx); - tableTopIndexSetComplete(); - - if (getTable().getTopIndex() != idx ) - { + + // only retry if we have pending updates + if (hasPendingUpdates()) { if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { - DebugUIPlugin.trace(">>> FAILED set top index : " + ((BigInteger)topIndexKey).toString(16)); //$NON-NLS-1$ + DebugUIPlugin.trace(">>> Retry top index: " + ((BigInteger) topIndexKey).toString(16)); //$NON-NLS-1$ } - // only retry if we have pending updates - if (hasPendingUpdates()) - { - if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { - DebugUIPlugin.trace(">>> Retry top index: " + ((BigInteger)topIndexKey).toString(16)); //$NON-NLS-1$ - } - - fPendingTopIndexKey = topIndexKey; - } - } - } - else - { - if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { - DebugUIPlugin.trace("cannot find key, put it back to the queue: " + topIndexKey); //$NON-NLS-1$ + fPendingTopIndexKey = topIndexKey; } - fPendingTopIndexKey = topIndexKey; } - - // remove the top index key from queue when it is processed - removeKeyFromQueue(topIndexKey); - + } else { + if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { + DebugUIPlugin.trace("cannot find key, put it back to the queue: " + topIndexKey); //$NON-NLS-1$ + } + fPendingTopIndexKey = topIndexKey; + } + + // remove the top index key from queue when it is processed + removeKeyFromQueue(topIndexKey); + return Status.OK_STATUS; - }}; - + } + }; + // set top index does not happen immediately, keep track of // all pending set top index addKeyToQueue(topIndexKey); - + job.setSystem(true); job.schedule(); return topIndexKey; } return topIndexKey; } - - protected void tableTopIndexSetComplete() - { - - } - - public void addVirtualContentListener(IVirtualContentListener listener) - { - fVirtualContentListeners.add(listener); - } - - public void removeVirtualContentListener(IVirtualContentListener listener) - { - fVirtualContentListeners.remove(listener); - } - - protected void notifyListenersAtBufferStart() - { - int topIdx = getTable().getTopIndex(); - Object[] listeners = fVirtualContentListeners.getListeners(); - + + protected void tableTopIndexSetComplete() { + + } + + public void addVirtualContentListener(IVirtualContentListener listener) { + fVirtualContentListeners.add(listener); + } + + public void removeVirtualContentListener(IVirtualContentListener listener) { + fVirtualContentListeners.remove(listener); + } + + protected void notifyListenersAtBufferStart() { + int topIdx = getTable().getTopIndex(); + Object[] listeners = fVirtualContentListeners.getListeners(); + for (int i = 0; i < listeners.length; i++) { final IVirtualContentListener listener = (IVirtualContentListener) listeners[i]; - if (topIdx < listener.getThreshold(IVirtualContentListener.BUFFER_START)) - { + if (topIdx < listener.getThreshold(IVirtualContentListener.BUFFER_START)) { SafeRunner.run(new ISafeRunnable() { - public void run() throws Exception { + @Override + public void run() throws Exception { listener.handledAtBufferStart(); } + + @Override public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } }); } } - } - - protected void notifyListenersAtBufferEnd() - { + } + + protected void notifyListenersAtBufferEnd() { Object[] listeners = fVirtualContentListeners.getListeners(); int topIdx = getTable().getTopIndex(); int bottomIdx = topIdx + getNumberOfVisibleLines(); int elementsCnt = getVirtualContentModel().getElements().length; int numLinesLeft = elementsCnt - bottomIdx; - + for (int i = 0; i < listeners.length; i++) { final IVirtualContentListener listener = (IVirtualContentListener) listeners[i]; - if (numLinesLeft <= listener.getThreshold(IVirtualContentListener.BUFFER_END)) - { + if (numLinesLeft <= listener.getThreshold(IVirtualContentListener.BUFFER_END)) { SafeRunner.run(new ISafeRunnable() { + @Override public void run() throws Exception { listener.handleAtBufferEnd(); } + + @Override public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } }); } } - } - - protected void handleScrollBarSelection() - { -// ignore event if there is pending set top index in the queue - if (!fTopIndexQueue.isEmpty()) + } + + protected void handleScrollBarSelection() { + // ignore event if there is pending set top index in the queue + if (!fTopIndexQueue.isEmpty()) { return; + } topIndexChanged(); } - - public void topIndexChanged() - { - if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) - { - MemorySegment a = (MemorySegment)getTable().getItem(getTable().getTopIndex()).getData(); + + public void topIndexChanged() { + if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { + MemorySegment a = (MemorySegment) getTable().getItem(getTable().getTopIndex()).getData(); DebugUIPlugin.trace(Thread.currentThread().getName() + " " + this + " handle scroll bar moved: top index: " + a.getAddress().toString(16)); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -311,64 +292,59 @@ abstract public class AsyncVirtualContentTableViewer extends AsynchronousTableVi notifyListenersAtBufferStart(); notifyListenersAtBufferEnd(); } - - protected void setTopIndexKey(Object key) - { + + protected void setTopIndexKey(Object key) { fTopIndexKey = key; } - - protected Object getTopIndexKey() - { + + protected Object getTopIndexKey() { return fTopIndexKey; } + @Override protected synchronized void preservingSelection(Runnable updateCode) { Object oldTopIndexKey = null; if (fPendingTopIndexKey == null) { // preserve selection oldTopIndexKey = getTopIndexKey(); - } - else - { + } else { oldTopIndexKey = fPendingTopIndexKey; } - + try { // perform the update updateCode.run(); - } finally { - if (oldTopIndexKey != null) - { + } finally { + if (oldTopIndexKey != null) { setTopIndex(oldTopIndexKey); } } } - - public void addPresentationErrorListener(IPresentationErrorListener errorListener) - { + + public void addPresentationErrorListener(IPresentationErrorListener errorListener) { fPresentationErrorListeners.add(errorListener); } - - public void removePresentationErrorListener(IPresentationErrorListener errorListener) - { + + public void removePresentationErrorListener(IPresentationErrorListener errorListener) { fPresentationErrorListeners.remove(errorListener); } - - private void notifyPresentationError(final IStatusMonitor monitor, final IStatus status) - { + + private void notifyPresentationError(final IStatusMonitor monitor, final IStatus status) { Object[] listeners = fPresentationErrorListeners.getListeners(); - + for (int i = 0; i < listeners.length; i++) { - - if (listeners[i] instanceof IPresentationErrorListener) - { - final IPresentationErrorListener listener = (IPresentationErrorListener)listeners[i]; + + if (listeners[i] instanceof IPresentationErrorListener) { + final IPresentationErrorListener listener = (IPresentationErrorListener) listeners[i]; SafeRunner.run(new ISafeRunnable() { + @Override public void run() throws Exception { listener.handlePresentationFailure(monitor, status); } + + @Override public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } @@ -377,108 +353,104 @@ abstract public class AsyncVirtualContentTableViewer extends AsynchronousTableVi } } + @Override protected AsynchronousModel createModel() { return createVirtualContentTableModel(); } - + abstract protected AbstractVirtualContentTableModel createVirtualContentTableModel(); - - private void addKeyToQueue(Object topIndexKey) - { - synchronized(fTopIndexQueue){ + + private void addKeyToQueue(Object topIndexKey) { + synchronized (fTopIndexQueue) { if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { - DebugUIPlugin.trace(" >>> add to top index queue: " + ((BigInteger)topIndexKey).toString(16)); //$NON-NLS-1$ + DebugUIPlugin.trace(" >>> add to top index queue: " + ((BigInteger) topIndexKey).toString(16)); //$NON-NLS-1$ } fTopIndexQueue.add(topIndexKey); } } - - private void removeKeyFromQueue(Object topIndexKey) - { - synchronized(fTopIndexQueue){ + + private void removeKeyFromQueue(Object topIndexKey) { + synchronized (fTopIndexQueue) { if (DebugUIPlugin.DEBUG_DYNAMIC_LOADING) { - DebugUIPlugin.trace(" >>> remove frome top index queue: " + ((BigInteger)topIndexKey).toString(16)); //$NON-NLS-1$ + DebugUIPlugin.trace(" >>> remove frome top index queue: " + ((BigInteger) topIndexKey).toString(16)); //$NON-NLS-1$ } fTopIndexQueue.remove(topIndexKey); } } - - public AbstractVirtualContentTableModel getVirtualContentModel() - { - if (getModel() instanceof AbstractVirtualContentTableModel) + + public AbstractVirtualContentTableModel getVirtualContentModel() { + if (getModel() instanceof AbstractVirtualContentTableModel) { return (AbstractVirtualContentTableModel) getModel(); + } return null; } - - private int getNumberOfVisibleLines() - { + + private int getNumberOfVisibleLines() { Table table = getTable(); int height = table.getSize().y; - + // when table is not yet created, height is zero - if (height == 0) - { + if (height == 0) { // make use of the table viewer to estimate table size height = table.getParent().getSize().y; } - + // height of border int border = table.getHeaderHeight(); - + // height of scroll bar int scroll = table.getHorizontalBar().getSize().y; - // height of table is table's area minus border and scroll bar height - height = height-border-scroll; + // height of table is table's area minus border and scroll bar height + height = height - border - scroll; // calculate number of visible lines int lineHeight = getMinTableItemHeight(table); - - int numberOfLines = height/lineHeight; - - if (numberOfLines <= 0) + + int numberOfLines = height / lineHeight; + + if (numberOfLines <= 0) { return 20; - - return numberOfLines; + } + + return numberOfLines; } - - private int getMinTableItemHeight(Table table){ - + + private int getMinTableItemHeight(Table table) { + // Hack to get around Linux GTK problem. // On Linux GTK, table items have variable item height as - // carriage returns are actually shown in a cell. Some rows will be - // taller than others. When calculating number of visible lines, we - // need to find the smallest table item height. Otherwise, the rendering - // underestimates the number of visible lines. As a result the rendering + // carriage returns are actually shown in a cell. Some rows will be + // taller than others. When calculating number of visible lines, we + // need to find the smallest table item height. Otherwise, the rendering + // underestimates the number of visible lines. As a result the rendering // will not be able to get more memory as needed. - if (MemoryViewUtil.isLinuxGTK()) - { + if (MemoryViewUtil.isLinuxGTK()) { // check each of the items and find the minimum TableItem[] items = table.getItems(); int minHeight = table.getItemHeight(); - for (int i=0; i<items.length; i++) - { - if (items[i].getData() != null) + for (int i = 0; i < items.length; i++) { + if (items[i].getData() != null) { minHeight = Math.min(items[i].getBounds(0).height, minHeight); + } } - + return minHeight; - + } return table.getItemHeight(); } + @Override protected void updateComplete(IStatusMonitor monitor) { super.updateComplete(monitor); attemptSetTopIndex(); - if (monitor instanceof ILabelRequestMonitor) - { + if (monitor instanceof ILabelRequestMonitor) { fPendingResizeColumns = attemptResizeColumnsToPreferredSize(); } } - - protected boolean hasPendingSetTopIndex() - { + + protected boolean hasPendingSetTopIndex() { return !fTopIndexQueue.isEmpty(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java index 86ef0dbb5..8c16264b0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java @@ -30,6 +30,7 @@ public abstract class BasicDebugViewContentProvider implements IStructuredConten /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { fDisposed= true; } @@ -46,6 +47,7 @@ public abstract class BasicDebugViewContentProvider implements IStructuredConten /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { fViewer= (StructuredViewer) viewer; } @@ -100,6 +102,7 @@ public abstract class BasicDebugViewContentProvider implements IStructuredConten return; } Runnable r= new Runnable() { + @Override public void run() { if (!isDisposed()) { doHandleDebugEvent(event); @@ -113,6 +116,7 @@ public abstract class BasicDebugViewContentProvider implements IStructuredConten /* (non-Javadoc) * @see IDebugEventSetListener#handleDebugEvents(DebugEvent[]) */ + @Override public void handleDebugEvents(DebugEvent[] events) { for (int i=0; i < events.length; i++) handleDebugEvent(events[i]); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BigEndianAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BigEndianAction.java index 94d7d154c..77e707a87 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BigEndianAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BigEndianAction.java @@ -27,12 +27,14 @@ public class BigEndianAction implements IObjectActionDelegate { /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fRendering == null) @@ -47,6 +49,7 @@ public class BigEndianAction implements IObjectActionDelegate { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (selection == null) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java index 43ad789a6..3c5d3292c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java @@ -158,6 +158,7 @@ public class CopyTableRenderingToClipboardAction extends Action /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { if (fRendering == null) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java index e1f6d8479..afedc2b75 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java @@ -83,6 +83,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { return DebugUIPlugin.getImageDescriptorRegistry().get( DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_MONITOR_EXPRESSION)); @@ -91,6 +92,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { if (element instanceof IMemoryRenderingType) { @@ -103,18 +105,21 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) */ + @Override public boolean isLabelProperty(Object element, String property) { return false; } @@ -122,6 +127,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { } @@ -133,6 +139,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { IMemoryRenderingType[] renderings = DebugUITools.getMemoryRenderingManager().getRenderingTypes((IMemoryBlock)inputElement); return renderings; @@ -141,6 +148,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } @@ -148,6 +156,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -156,6 +165,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public Control createControl(Composite parent) { fCanvas = new Composite(parent, SWT.NONE); GridLayout compositeLayout = new GridLayout(); @@ -205,12 +215,14 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR fViewer.addDoubleClickListener(new IDoubleClickListener (){ + @Override public void doubleClick(DoubleClickEvent event) { addRenderings(); }}); // listen for enter being pressed fViewer.getList().addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.character == SWT.CR) addRenderings(); @@ -225,10 +237,12 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR addButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { addRenderings(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { addRenderings(); }}); @@ -290,6 +304,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#dispose() */ + @Override public void dispose() { fViewer = null; fCanvas = null; @@ -301,14 +316,17 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.memory.AbstractMemoryRendering#getControl() */ + @Override public Control getControl() { return fCanvas; } + @Override public void memoryRenderingBindingsChanged() { if (fViewer != null) fViewer.refresh(); } + @Override public String getLabel() { if (fTabLabel == null) { @@ -319,15 +337,18 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR return fTabLabel; } + @Override public Image getImage() { return DebugUIPlugin.getImageDescriptorRegistry().get( DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_MONITOR_EXPRESSION)); } + @Override public void becomesVisible() { // Do nothing, do not want to connect/disconnect from clients } + @Override public void becomesHidden() { // Do nothing, do not want to connect/disconnect from clients } @@ -336,6 +357,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR { Job job = new Job("Update Rendering Label"){ //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { fLabel = CreateRendering.super.getLabel(); fTabLabel = DebugUIMessages.CreateRenderingTab_label ; @@ -344,6 +366,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR WorkbenchJob wbJob = new WorkbenchJob("Create Rendering Update Label"){ //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor wbMonitor) { if (fMemoryBlockLabel != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/DefaultEndianessAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/DefaultEndianessAction.java index 1c37061ad..0445ba216 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/DefaultEndianessAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/DefaultEndianessAction.java @@ -31,9 +31,11 @@ public class DefaultEndianessAction implements IObjectActionDelegate { super(); } + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { } + @Override public void run(IAction action) { if (fRendering != null) { @@ -50,6 +52,7 @@ public class DefaultEndianessAction implements IObjectActionDelegate { } + @Override public void selectionChanged(IAction action, ISelection selection) { if (selection == null) return; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java index 36743b9cd..721d86c1d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java @@ -48,6 +48,7 @@ public class ErrorRendering extends AbstractMemoryRendering { /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public Control createControl(Composite parent) { fTextViewer = new TextViewer(parent, SWT.READ_ONLY); fTextViewer.setDocument(new Document()); @@ -80,6 +81,7 @@ public class ErrorRendering extends AbstractMemoryRendering { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.memory.AbstractMemoryRendering#getControl() */ + @Override public Control getControl() { return fTextViewer.getControl(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingAction.java index c3ae82db8..5e0c04565 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingAction.java @@ -31,6 +31,7 @@ public class FormatTableRenderingAction extends Action { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".FormatTableRenderingAction_context"); //$NON-NLS-1$ } + @Override public void run() { FormatTableRenderingDialog dialog = new FormatTableRenderingDialog(fRendering, DebugUIPlugin.getShell()); dialog.open(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java index b541a7a94..ed3705a13 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java @@ -76,6 +76,7 @@ public class FormatTableRenderingDialog extends TrayDialog fMsg = DebugUIMessages.FormatTableRenderingAction_1; } + @Override protected Control createDialogArea(Composite parent) { getShell().setText(DebugUIMessages.FormatTableRenderingAction_0); PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugUIConstants.PLUGIN_ID + ".FormatTableRenderingDialog_context"); //$NON-NLS-1$ @@ -111,6 +112,7 @@ public class FormatTableRenderingDialog extends TrayDialog fRowControl.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { if (fCurrentRowIdx != fRowControl.getSelectionIndex()) { @@ -120,6 +122,7 @@ public class FormatTableRenderingDialog extends TrayDialog } } + @Override public void widgetDefaultSelected(SelectionEvent e) { }}); @@ -141,6 +144,7 @@ public class FormatTableRenderingDialog extends TrayDialog fColumnControl.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { if (fCurrentColIdx != fColumnControl.getSelectionIndex()) { @@ -150,6 +154,7 @@ public class FormatTableRenderingDialog extends TrayDialog } } + @Override public void widgetDefaultSelected(SelectionEvent e) { }}); @@ -174,10 +179,12 @@ public class FormatTableRenderingDialog extends TrayDialog fDefaultButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { saveDefaults(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { }}); @@ -243,9 +250,11 @@ public class FormatTableRenderingDialog extends TrayDialog Button restoreButton = new Button(composite, SWT.NONE); restoreButton.setText(DebugUIMessages.FormatTableRenderingAction_6); restoreButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { restoreDefaults(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { }}); data = new GridData(); @@ -258,6 +267,7 @@ public class FormatTableRenderingDialog extends TrayDialog return composite; } + @Override protected void okPressed() { int idx = fColumnControl.getSelectionIndex(); fColumnSize = fColumnSizes[idx]; @@ -521,6 +531,7 @@ public class FormatTableRenderingDialog extends TrayDialog fCurrentRowIdx = populateControl(row, fRowSizes, fRowControl); } + @Override protected Control createButtonBar(Composite parent) { Control ret = super.createButtonBar(parent); if (fDisableCancel) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressAction.java index 690b788ca..bfa245303 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressAction.java @@ -60,6 +60,7 @@ public class GoToAddressAction extends Action /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { try diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java index 59799c034..2803d37b6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2009 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,9 +34,9 @@ import org.eclipse.ui.PlatformUI; * @since 3.0 */ -public class GoToAddressDialog extends TrayDialog implements ModifyListener{ +public class GoToAddressDialog extends TrayDialog implements ModifyListener { - private static Vector history = new Vector(); + private static Vector<String> history = new Vector<String>(); private Combo expressionInput; private String expression; @@ -48,18 +48,22 @@ public class GoToAddressDialog extends TrayDialog implements ModifyListener{ setShellStyle(getShellStyle() | SWT.RESIZE); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets + * .Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite comp = (Composite) super.createDialogArea(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugUIConstants.PLUGIN_ID + ".GoToAddressDialog_context"); //$NON-NLS-1$ comp.setLayout(new GridLayout()); - GridData spec2= new GridData(); - spec2.grabExcessVerticalSpace= true; - spec2.grabExcessHorizontalSpace= true; - spec2.horizontalAlignment= GridData.FILL; - spec2.verticalAlignment= GridData.CENTER; + GridData spec2 = new GridData(); + spec2.grabExcessVerticalSpace = true; + spec2.grabExcessHorizontalSpace = true; + spec2.horizontalAlignment = GridData.FILL; + spec2.verticalAlignment = GridData.CENTER; comp.setLayoutData(spec2); Label textLabel = new Label(comp, SWT.NONE); @@ -67,81 +71,92 @@ public class GoToAddressDialog extends TrayDialog implements ModifyListener{ GridData textLayout = new GridData(); textLayout.widthHint = 280; textLabel.setLayoutData(textLayout); - + expressionInput = new Combo(comp, SWT.BORDER); - GridData spec= new GridData(); - spec.grabExcessVerticalSpace= false; - spec.grabExcessHorizontalSpace= true; - spec.horizontalAlignment= GridData.FILL; - spec.verticalAlignment= GridData.BEGINNING; + GridData spec = new GridData(); + spec.grabExcessVerticalSpace = false; + spec.grabExcessHorizontalSpace = true; + spec.horizontalAlignment = GridData.FILL; + spec.verticalAlignment = GridData.BEGINNING; spec.heightHint = 50; expressionInput.setLayoutData(spec); - + // add history - String[] historyExpression = (String[])history.toArray(new String[history.size()]); - for (int i=0; i<historyExpression.length; i++) - { + String[] historyExpression = history.toArray(new String[history.size()]); + for (int i = 0; i < historyExpression.length; i++) { expressionInput.add(historyExpression[i]); } - + expressionInput.addModifyListener(this); - + return comp; } - /* (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) + + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets + * .Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); - + newShell.setText(DebugUIMessages.GoToAddressDialog_GoToAddress); } - - public String getExpression() - { + + public String getExpression() { return expression; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { expression = expressionInput.getText(); // add to history list - if (!history.contains(expression)) + if (!history.contains(expression)) { history.insertElementAt(expression, 0); + } super.okPressed(); } - /* (non-Javadoc) - * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) + /* + * (non-Javadoc) + * @see + * org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events + * .ModifyEvent) */ + @Override public void modifyText(ModifyEvent e) { String input = expressionInput.getText(); - - if (input == null || input.equals(IInternalDebugCoreConstants.EMPTY_STRING)) - { - getButton(IDialogConstants.OK_ID).setEnabled(false); - } - else - { + + if (input == null || input.equals(IInternalDebugCoreConstants.EMPTY_STRING)) { + getButton(IDialogConstants.OK_ID).setEnabled(false); + } else { getButton(IDialogConstants.OK_ID).setEnabled(true); - } + } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets.Composite) + /* + * (non-Javadoc) + * @see + * org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets + * .Composite) */ + @Override protected Control createButtonBar(Composite parent) { - - Control ret = super.createButtonBar(parent); + + Control ret = super.createButtonBar(parent); getButton(IDialogConstants.OK_ID).setEnabled(false); - + return ret; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java index 07242208b..fa2c7b7de 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java @@ -30,6 +30,7 @@ public class HexIntegerRendering extends AbstractIntegerRendering { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.memory.AbstractTableRendering#getString(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String) */ + @Override public String getString(String dataType, BigInteger address, MemoryByte[] data) { StringBuffer strBuffer = new StringBuffer(); @@ -78,6 +79,7 @@ public class HexIntegerRendering extends AbstractIntegerRendering { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.memory.AbstractTableRendering#getBytes(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String) */ + @Override public byte[] getBytes(String dataType, BigInteger address, MemoryByte[] currentValues, String data) { @@ -96,6 +98,7 @@ public class HexIntegerRendering extends AbstractIntegerRendering { return bytes; } + @Override public int getNumCharsPerByte() { return 2; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRenderingDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRenderingDelegate.java index 8ccbde884..72218e37b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRenderingDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRenderingDelegate.java @@ -19,6 +19,7 @@ public class HexIntegerRenderingDelegate implements IMemoryRenderingTypeDelegate public HexIntegerRenderingDelegate() { } + @Override public IMemoryRendering createRendering(String id) throws CoreException { return new HexIntegerRendering(id); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java index cfc2efc49..9e994e303 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java @@ -31,6 +31,7 @@ public class HexRendering extends AbstractAsyncTableRendering { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.memory.AbstractTableRendering#getString(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String) */ + @Override public String getString(String dataType, BigInteger address, MemoryByte[] data) { StringBuffer strBuffer = new StringBuffer(); @@ -56,6 +57,7 @@ public class HexRendering extends AbstractAsyncTableRendering { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.memory.AbstractTableRendering#getBytes(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String) */ + @Override public byte[] getBytes(String dataType, BigInteger address, MemoryByte[] currentValues, String data) { byte[] bytes = RenderingsUtil.convertHexStringToByteArray(data, currentValues.length, getNumCharsPerByte()); @@ -63,6 +65,7 @@ public class HexRendering extends AbstractAsyncTableRendering { return bytes; } + @Override public int getNumCharsPerByte() { return 2; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRenderingTypeDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRenderingTypeDelegate.java index 22ddebbd4..9d9ab492b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRenderingTypeDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRenderingTypeDelegate.java @@ -23,6 +23,7 @@ public class HexRenderingTypeDelegate implements IMemoryRenderingTypeDelegate { /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate#createRendering(java.lang.String) */ + @Override public IMemoryRendering createRendering(String id) throws CoreException { HexRendering rendering = new HexRendering(id); return rendering; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/LittleEndianAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/LittleEndianAction.java index 9bf917eb4..fa4a3e1e6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/LittleEndianAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/LittleEndianAction.java @@ -29,12 +29,14 @@ public class LittleEndianAction implements IObjectActionDelegate { /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fRendering == null) @@ -49,6 +51,7 @@ public class LittleEndianAction implements IObjectActionDelegate { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (selection == null) return; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/MemorySegment.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/MemorySegment.java index ddb69da43..f9fe71143 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/MemorySegment.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/MemorySegment.java @@ -72,13 +72,13 @@ public class MemorySegment extends PlatformObject { if (start + length > fBytes.length) return new MemoryByte[0]; - ArrayList ret = new ArrayList(); + ArrayList<MemoryByte> ret = new ArrayList<MemoryByte>(); for (int i=start; i< start+length; i++) { ret.add(fBytes[i]); } - return (MemoryByte[]) ret.toArray(new MemoryByte[ret.size()]); + return ret.toArray(new MemoryByte[ret.size()]); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java index 1cb64e414..71ebac1d2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java @@ -171,6 +171,7 @@ public class PrintTableRenderingAction extends Action /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { if (!(fViewer.getControl() instanceof Table)) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ReformatAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ReformatAction.java index 0324df3a5..7b4e1a53f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ReformatAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ReformatAction.java @@ -34,6 +34,7 @@ public class ReformatAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { fRendering.resizeColumnsToPreferredSize(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java index 23373ebc3..1dabe2ed9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -30,36 +30,37 @@ import org.eclipse.ui.PlatformUI; */ public class ResetToBaseAddressAction extends Action { - private AbstractBaseTableRendering fRendering; + private AbstractBaseTableRendering fRendering; - public ResetToBaseAddressAction(AbstractBaseTableRendering rendering) { - fRendering = rendering; - setText(DebugUIMessages.ResetMemoryBlockAction_title); - setToolTipText(DebugUIMessages.ResetMemoryBlockAction_tootip); + public ResetToBaseAddressAction(AbstractBaseTableRendering rendering) { + fRendering = rendering; + setText(DebugUIMessages.ResetMemoryBlockAction_title); + setToolTipText(DebugUIMessages.ResetMemoryBlockAction_tootip); - setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESET_MEMORY)); - setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_RESET_MEMORY)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESET_MEMORY)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".ResetBaseAddressContextAction_context"); //$NON-NLS-1$ - } + setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESET_MEMORY)); + setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_RESET_MEMORY)); + setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESET_MEMORY)); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".ResetBaseAddressContextAction_context"); //$NON-NLS-1$ + } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.action.IAction#run() - */ - public void run() { - - // check if client has overrode the #reset method - // if client has overrode #reset method, call old method - // otherwise, call new #resetRendering method - // This is done to ensure that client's code will continue to be executed until - // they have migrated to the new #resetRendering API - Class renderingClass = fRendering.getClass(); - try { - Method method = renderingClass.getMethod("reset", new Class[]{}); //$NON-NLS-1$ - if (method.getDeclaringClass().equals(AbstractTableRendering.class)) - { + /* + * (non-Javadoc) + * @see org.eclipse.jface.action.IAction#run() + */ + @SuppressWarnings("deprecation") + @Override + public void run() { + + // check if client has overrode the #reset method + // if client has overrode #reset method, call old method + // otherwise, call new #resetRendering method + // This is done to ensure that client's code will continue to be + // executed until + // they have migrated to the new #resetRendering API + Class<? extends AbstractBaseTableRendering> renderingClass = fRendering.getClass(); + try { + Method method = renderingClass.getMethod("reset", new Class[] {}); //$NON-NLS-1$ + if (method.getDeclaringClass().equals(AbstractTableRendering.class)) { // client has not overrode, call new method try { fRendering.resetRendering(); @@ -77,11 +78,10 @@ public class ResetToBaseAddressAction extends Action { MemoryViewUtil.openError(DebugUIMessages.AbstractTableRendering_12, DebugUIMessages.AbstractTableRendering_13, e); // } } - - if(fRendering instanceof AbstractTableRendering) - { + + if (fRendering instanceof AbstractTableRendering) { // call old method - ((AbstractTableRendering)fRendering).reset(); + ((AbstractTableRendering) fRendering).reset(); } - } + } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java index 9e79fba74..522f27eab 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java @@ -136,6 +136,7 @@ public class SignedIntegerRendering extends AbstractIntegerRendering { /* (non-Javadoc) * @see com.ibm.debug.extended.ui.AbstractMemoryRenderer#getString(java.lang.String, java.math.BigInteger, byte[]) */ + @Override public String getString(String dataType, BigInteger address, MemoryByte[] data) { boolean invalid = false; @@ -189,6 +190,7 @@ public class SignedIntegerRendering extends AbstractIntegerRendering { /* (non-Javadoc) * @see com.ibm.debug.extended.ui.AbstractMemoryRenderer#getBytes(java.lang.String, java.math.BigInteger, java.lang.String) */ + @Override public byte[] getBytes(String dataType, BigInteger address, MemoryByte[] currentValues, String data) { int columnSize = getBytesPerColumn(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRenderingTypeDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRenderingTypeDelegate.java index 9651f7ed6..4d829d340 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRenderingTypeDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRenderingTypeDelegate.java @@ -24,6 +24,7 @@ public class SignedIntegerRenderingTypeDelegate implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate#createRendering(java.lang.String) */ + @Override public IMemoryRendering createRendering(String id) throws CoreException { return new SignedIntegerRendering(id); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingCellModifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingCellModifier.java index 0cdaa4b38..0328cfe7e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingCellModifier.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingCellModifier.java @@ -44,7 +44,8 @@ public class TableRenderingCellModifier implements ICellModifier { * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, * java.lang.String) */ - public boolean canModify(Object element, String property) { + @Override + public boolean canModify(Object element, String property) { boolean canModify = true; try { if (!(element instanceof TableRenderingLine)) @@ -104,7 +105,8 @@ public class TableRenderingCellModifier implements ICellModifier { * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, * java.lang.String) */ - public Object getValue(Object element, String property) { + @Override + public Object getValue(Object element, String property) { // give back the value of the column if (!(element instanceof TableRenderingLine)) @@ -143,7 +145,8 @@ public class TableRenderingCellModifier implements ICellModifier { * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, * java.lang.String, java.lang.Object) */ - public void modify(Object element, String property, Object value) { + @Override + public void modify(Object element, String property, Object value) { TableRenderingLine line = null; if (!(element instanceof TableRenderingLine)) { line = (TableRenderingLine) ((TableItem) element).getData(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentInput.java index ae9c5bf33..62bd36369 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentInput.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentInput.java @@ -188,6 +188,7 @@ public class TableRenderingContentInput extends PlatformObject { fNumLines = numLines; } + @Override public Object getAdapter(Class adapter) { if (adapter == AbstractTableRendering.class) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java index 5a7402e27..51d14a938 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java @@ -45,12 +45,12 @@ import org.eclipse.jface.viewers.Viewer; public class TableRenderingContentProvider extends BasicDebugViewContentProvider { // lines currently being displayed by the table rendering - protected Vector lineCache; + protected Vector<TableRenderingLine> lineCache; // Cache to allow the content provider to comppute change information // Cache is taken by copying the lineCache after a suspend event // or change event from the the memory block. - protected Hashtable contentCache; + protected Hashtable<String, TableRenderingLine> contentCache; // cache in the form of MemoryByte // needed for reorganizing cache when the row size changes @@ -70,8 +70,8 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider */ public TableRenderingContentProvider() { - lineCache = new Vector(); - contentCache = new Hashtable(); + lineCache = new Vector<TableRenderingLine>(); + contentCache = new Hashtable<String, TableRenderingLine>(); initializeDynamicLoad(); DebugPlugin.getDefault().addDebugEventListener(this); @@ -88,6 +88,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer v, Object oldInput, Object newInput) { try { if (newInput instanceof TableRenderingContentInput) @@ -106,6 +107,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider } } + @Override public void dispose() { DebugPlugin.getDefault().removeDebugEventListener(this); super.dispose(); @@ -114,6 +116,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object parent) { // if cache is empty, get memory @@ -132,7 +135,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider return lineCache.toArray(); // check to see if the row size has changed - TableRenderingLine line = (TableRenderingLine)lineCache.get(0); + TableRenderingLine line = lineCache.get(0); int currentRowSize = line.getByteArray().length; int renderingRowSize = getTableRendering(fInput).getBytesPerLine(); @@ -435,7 +438,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider // if debug adapter did not return enough memory, create dummy memory if (memoryBuffer.length < reqNumBytes) { - ArrayList newBuffer = new ArrayList(); + ArrayList<MemoryByte> newBuffer = new ArrayList<MemoryByte>(); for (int i=0; i<memoryBuffer.length; i++) { @@ -451,7 +454,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider newBuffer.add(mb); } - memoryBuffer = (MemoryByte[])newBuffer.toArray(new MemoryByte[newBuffer.size()]); + memoryBuffer = newBuffer.toArray(new MemoryByte[newBuffer.size()]); } @@ -537,7 +540,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider TableRenderingLine newLine = new TableRenderingLine(tmpAddress, memory, lineCache.size(), paddedString); - TableRenderingLine oldLine = (TableRenderingLine)contentCache.get(newLine.getAddress()); + TableRenderingLine oldLine = contentCache.get(newLine.getAddress()); if (manageDelta) { @@ -620,6 +623,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider /* (non-Javadoc) * @see org.eclipse.debug.ui.internal.views.BasicDebugViewContentProvider#doHandleDebugEvent(org.eclipse.debug.core.DebugEvent) */ + @Override protected void doHandleDebugEvent(DebugEvent event) { if (getTableRendering(fInput).isVisible()) @@ -695,7 +699,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider public void takeContentSnapshot() { // cache content before getting new ones - TableRenderingLine[] lines =(TableRenderingLine[]) lineCache.toArray(new TableRenderingLine[lineCache.size()]); + TableRenderingLine[] lines =lineCache.toArray(new TableRenderingLine[lineCache.size()]); fContentCacheInBytes = convertLinesToBytes(lines); fContentCacheStartAddress = lines[0].getAddress(); @@ -784,11 +788,11 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider */ public void resetDeltas() { - Enumeration enumeration = contentCache.elements(); + Enumeration<TableRenderingLine> enumeration = contentCache.elements(); while (enumeration.hasMoreElements()) { - TableRenderingLine line = (TableRenderingLine)enumeration.nextElement(); + TableRenderingLine line = enumeration.nextElement(); line.unmarkDeltas(); } } @@ -802,8 +806,8 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider { if (lineCache != null && !lineCache.isEmpty()) { - TableRenderingLine first = (TableRenderingLine)lineCache.firstElement(); - TableRenderingLine last = (TableRenderingLine) lineCache.lastElement(); + TableRenderingLine first = lineCache.firstElement(); + TableRenderingLine last = lineCache.lastElement(); if (first == null ||last == null) return true; @@ -869,7 +873,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider fDynamicLoad = dynamicLoad; } - private void reorganizeLines(Vector lines, int numBytesPerLine) throws DebugException + private void reorganizeLines(Vector<TableRenderingLine> lines, int numBytesPerLine) throws DebugException { if (lines == null || lines.isEmpty()) return; @@ -878,7 +882,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider if (objs.length > 0) { - TableRenderingLine[] renderingLines = (TableRenderingLine[])lines.toArray(new TableRenderingLine[lines.size()]); + TableRenderingLine[] renderingLines = lines.toArray(new TableRenderingLine[lines.size()]); MemoryByte[] buffer = convertLinesToBytes(renderingLines); BigInteger lineAddress = new BigInteger(renderingLines[0].getAddress(), 16); int numberOfLines = buffer.length / numBytesPerLine; @@ -948,7 +952,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider DebugUIPlugin.log(e); addressLength = 4 * IInternalDebugUIConstants.CHAR_PER_BYTE; } - ArrayList lines = new ArrayList(); + ArrayList<TableRenderingLine> lines = new ArrayList<TableRenderingLine>(); String paddedString = DebugUITools.getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR); for (int i=0; i<numOfLines; i++) @@ -975,7 +979,7 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider address = bigInt.add(BigInteger.valueOf(addressableUnit)).toString(16); } - return (TableRenderingLine[])lines.toArray(new TableRenderingLine[lines.size()]); + return lines.toArray(new TableRenderingLine[lines.size()]); } private AbstractTableRendering getTableRendering(TableRenderingContentInput input) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java index 009de7707..5623ba8ef 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java @@ -42,6 +42,7 @@ public class TableRenderingLabelProvider extends AbstractTableRenderingLabelProv /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { if (fTablePresentation != null) { fTablePresentation.dispose(); @@ -53,6 +54,7 @@ public class TableRenderingLabelProvider extends AbstractTableRenderingLabelProv /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) */ + @Override public Color getForeground(Object element) { if (element instanceof TableRenderingLine) { @@ -69,6 +71,7 @@ public class TableRenderingLabelProvider extends AbstractTableRenderingLabelProv /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) */ + @Override public Color getBackground(Object element) { return null; @@ -77,6 +80,7 @@ public class TableRenderingLabelProvider extends AbstractTableRenderingLabelProv /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) */ + @Override public String getColumnText(Object element, int columnIndex) { String label = super.getColumnText(element, columnIndex); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java index 5fe5fbdaa..40f059d7b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java @@ -49,6 +49,7 @@ public class TableRenderingLabelProviderEx extends TableRenderingLabelProvider i * * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { if (fFontProvider != null) { fFontProvider = null; @@ -66,6 +67,7 @@ public class TableRenderingLabelProviderEx extends TableRenderingLabelProvider i /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableColorProvider#getBackground(java.lang.Object, int) */ + @Override public Color getBackground(Object element, int columnIndex) { if (fColorProvider != null && columnIndex > 0) { MemoryRenderingElement renderingElement = getMemoryRenderingElement(element, columnIndex); @@ -81,6 +83,7 @@ public class TableRenderingLabelProviderEx extends TableRenderingLabelProvider i /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableColorProvider#getForeground(java.lang.Object, int) */ + @Override public Color getForeground(Object element, int columnIndex) { if (fColorProvider != null && columnIndex > 0) { MemoryRenderingElement renderingElement = getMemoryRenderingElement(element, columnIndex); @@ -96,6 +99,7 @@ public class TableRenderingLabelProviderEx extends TableRenderingLabelProvider i /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) */ + @Override public Image getColumnImage(Object element, int columnIndex) { if (fLabelProvider != null && columnIndex > 0) { MemoryRenderingElement renderingElement = getMemoryRenderingElement(element, columnIndex); @@ -111,6 +115,7 @@ public class TableRenderingLabelProviderEx extends TableRenderingLabelProvider i /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableFontProvider#getFont(java.lang.Object, int) */ + @Override public Font getFont(Object element, int columnIndex) { if (fFontProvider != null && columnIndex > 0) { MemoryRenderingElement renderingElement = getMemoryRenderingElement(element, columnIndex); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java index 0652248c7..a175e55b8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java @@ -67,13 +67,13 @@ public class TableRenderingLine extends PlatformObject { public MemoryByte[] getBytes(int start, int end) { - ArrayList ret = new ArrayList(); + ArrayList<MemoryByte> ret = new ArrayList<MemoryByte>(); for (int i=start; i<end; i++) { ret.add(fBytes[i]); } - return (MemoryByte[]) ret.toArray(new MemoryByte[ret.size()]); + return ret.toArray(new MemoryByte[ret.size()]); } public String getRawMemoryString() @@ -279,6 +279,7 @@ public class TableRenderingLine extends PlatformObject { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer buf = new StringBuffer(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java index d7c5a4096..6cf038350 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -33,451 +33,409 @@ import org.eclipse.debug.internal.ui.viewers.ModelNode; import org.eclipse.debug.internal.ui.views.memory.MemoryViewUtil; import org.eclipse.debug.ui.memory.IMemoryRendering; +public class TableRenderingModel extends AbstractVirtualContentTableModel implements IContentChangeComputer { -public class TableRenderingModel extends AbstractVirtualContentTableModel - implements IContentChangeComputer { + private Hashtable<Object, Object> fCache; + private Vector<Object> fOrderedCache; // needed to re-organize cache - - private Hashtable fCache; - private Vector fOrderedCache; // needed to re-organize cache - private boolean fMBSupportsChangeManagement; private IMemoryBlock fMemoryBlock; class SupportsChangeMgmtJob extends Job { - - SupportsChangeMgmtJob() - { + + SupportsChangeMgmtJob() { super("Support Change Management"); //$NON-NLS-1$ setSystem(true); } + @Override protected IStatus run(IProgressMonitor monitor) { IMemoryBlock mb = getMemoryBlock(); - if (mb instanceof IMemoryBlockExtension) - { - IMemoryBlockExtension mbExt = (IMemoryBlockExtension)mb; + if (mb instanceof IMemoryBlockExtension) { + IMemoryBlockExtension mbExt = (IMemoryBlockExtension) mb; fMBSupportsChangeManagement = mbExt.supportsChangeManagement(); } return Status.OK_STATUS; } - + } - - + public TableRenderingModel(AsynchronousTableViewer viewer) { super(viewer); - fCache = new Hashtable(); - fOrderedCache = new Vector(); + fCache = new Hashtable<Object, Object>(); + fOrderedCache = new Vector<Object>(); } - - public int indexOfKey(Object key) - { - if (key instanceof BigInteger) - { - BigInteger address = (BigInteger)key; + + @Override + public int indexOfKey(Object key) { + if (key instanceof BigInteger) { + BigInteger address = (BigInteger) key; Object items[] = getElements(); - - for (int i=0; i<items.length; i++){ - if (items[i] != null && items[i] instanceof MemorySegment) - { - MemorySegment line = (MemorySegment)items[i]; - if (line.containsAddress(address)) + + for (int i = 0; i < items.length; i++) { + if (items[i] != null && items[i] instanceof MemorySegment) { + MemorySegment line = (MemorySegment) items[i]; + if (line.containsAddress(address)) { return i; + } } } } - + return -1; } - - public int columnOf(Object element, Object key) - { - if (element instanceof MemorySegment && key instanceof BigInteger) - { - BigInteger address = (BigInteger)key; - MemorySegment line = (MemorySegment)element; - if (line.containsAddress(address)) - { - if (getAddressableUnitsPerColumn() > 0) - { + + @Override + public int columnOf(Object element, Object key) { + if (element instanceof MemorySegment && key instanceof BigInteger) { + BigInteger address = (BigInteger) key; + MemorySegment line = (MemorySegment) element; + if (line.containsAddress(address)) { + if (getAddressableUnitsPerColumn() > 0) { BigInteger offset = address.subtract(line.getAddress()); - + // locate column int colAddressableUnit = getAddressableUnitsPerColumn(); - int col = ((offset.intValue()/colAddressableUnit)+1); - - if (col == 0) + int col = ((offset.intValue() / colAddressableUnit) + 1); + + if (col == 0) { col = 1; - + } + return col; } } } - + return -1; } - - public Object getKey(int idx) - { + + @Override + public Object getKey(int idx) { Object elmt = getElement(idx); - if (elmt instanceof MemorySegment) - { - return ((MemorySegment)elmt).getAddress(); + if (elmt instanceof MemorySegment) { + return ((MemorySegment) elmt).getAddress(); } - + return null; } + @Override public Object getKey(Object element) { int idx = indexOfElement(element); - if (idx >= 0) - { + if (idx >= 0) { return getKey(idx); } return null; } - + + @Override public Object getKey(int idx, int col) { Object element = getElement(idx); - if (element != null && element instanceof MemorySegment) - { - MemorySegment segment = (MemorySegment)element; + if (element != null && element instanceof MemorySegment) { + MemorySegment segment = (MemorySegment) element; BigInteger rowAddress = segment.getAddress(); - + int offset; - if (col > 0) - { - // get address offset + if (col > 0) { + // get address offset int addressableUnit = getAddressableUnitsPerColumn(); - offset = (col-1) * addressableUnit; - } - else - { + offset = (col - 1) * addressableUnit; + } else { offset = 0; } return rowAddress.add(BigInteger.valueOf(offset)); } return null; } - - private int getAddressableUnitsPerColumn() - { + + private int getAddressableUnitsPerColumn() { AsynchronousTableViewer viewer = getTableViewer(); - if (viewer.getPresentationContext() instanceof MemoryViewPresentationContext) - { - MemoryViewPresentationContext context = (MemoryViewPresentationContext)viewer.getPresentationContext(); - if (getTableRendering(context)!= null) - { + if (viewer.getPresentationContext() instanceof MemoryViewPresentationContext) { + MemoryViewPresentationContext context = (MemoryViewPresentationContext) viewer.getPresentationContext(); + if (getTableRendering(context) != null) { return getTableRendering(context).getAddressableUnitPerColumn(); } } return -1; } + @Override public void cache(Object[] elements) { - for (int i=0; i<elements.length; i++) - { + for (int i = 0; i < elements.length; i++) { Object obj = elements[i]; - if (obj instanceof MemorySegment) - { - cache(((MemorySegment)obj).getAddress(), obj); + if (obj instanceof MemorySegment) { + cache(((MemorySegment) obj).getAddress(), obj); } } - + } - - private void cache(Object key, Object element) - { + + private void cache(Object key, Object element) { fCache.put(key, element); fOrderedCache.add(element); } + @Override public Object[] compare(Object[] newElements) { - - if (fCache.isEmpty()) + + if (fCache.isEmpty()) { return newElements; - - for (int j=0; j<newElements.length; j++) - { + } + + for (int j = 0; j < newElements.length; j++) { Object obj = newElements[j]; - if (obj instanceof MemorySegment) - { - MemorySegment newSegment = (MemorySegment)obj; - MemorySegment oldSegment = (MemorySegment)fCache.get(newSegment.getAddress()); - - if (oldSegment != null) - { - if (oldSegment.getNumAddressableUnits() == newSegment.getNumAddressableUnits()) - { + if (obj instanceof MemorySegment) { + MemorySegment newSegment = (MemorySegment) obj; + MemorySegment oldSegment = (MemorySegment) fCache.get(newSegment.getAddress()); + + if (oldSegment != null) { + if (oldSegment.getNumAddressableUnits() == newSegment.getNumAddressableUnits()) { MemoryByte[] newBytes = newSegment.getBytes(); MemoryByte[] oldBytes = oldSegment.getBytes(); - - for (int i=0; i<newBytes.length; i++) - { + + for (int i = 0; i < newBytes.length; i++) { newBytes[i].setHistoryKnown(true); - - if (newBytes[i].isReadable() != oldBytes[i].isReadable()) - { + + if (newBytes[i].isReadable() != oldBytes[i].isReadable()) { newBytes[i].setChanged(true); continue; - } + } - if (newBytes[i].isReadable() && oldBytes[i].isReadable() && - (newBytes[i].getValue() != oldBytes[i].getValue())) + if (newBytes[i].isReadable() && oldBytes[i].isReadable() && (newBytes[i].getValue() != oldBytes[i].getValue())) { newBytes[i].setChanged(true); + } } } } } - } + } return newElements; } - - public void clearCache() - { + + @Override + public void clearCache() { fCache.clear(); fOrderedCache.clear(); } + @Override public boolean isEmpty() { return fCache.isEmpty(); } + @Override public void handleViewerChanged() { // viewer has changed, content manager needs to re-organize the cache rebuildCache(); rebuildContent(); } - - private void rebuildCache() - { - if (isEmpty()) + + private void rebuildCache() { + if (isEmpty()) { return; - - MemoryViewPresentationContext context = (MemoryViewPresentationContext)getTableViewer().getPresentationContext(); + } + + MemoryViewPresentationContext context = (MemoryViewPresentationContext) getTableViewer().getPresentationContext(); AbstractAsyncTableRendering rendering = getTableRendering(context); - - if (rendering == null) + + if (rendering == null) { return; - - ArrayList segments = new ArrayList(); - Enumeration enumeration = fOrderedCache.elements(); - - BigInteger address = ((MemorySegment)fOrderedCache.get(0)).getAddress(); - while (enumeration.hasMoreElements()) - { + } + + ArrayList<Object> segments = new ArrayList<Object>(); + Enumeration<Object> enumeration = fOrderedCache.elements(); + + BigInteger address = ((MemorySegment) fOrderedCache.get(0)).getAddress(); + while (enumeration.hasMoreElements()) { Object element = enumeration.nextElement(); - if (element instanceof MemorySegment) - { - + if (element instanceof MemorySegment) { + segments.add(element); } } - - MemoryByte[] bytes = convertSegmentsToBytes((MemorySegment[])segments.toArray(new MemorySegment[0])); - + + MemoryByte[] bytes = convertSegmentsToBytes(segments.toArray(new MemorySegment[0])); + int bytesPerLine = rendering.getBytesPerLine(); int numAddressableUnitPerLine = rendering.getAddressableUnitPerLine(); - + int addressableSize = rendering.getAddressableSize(); - + clearCache(); - - TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor)rendering.getAdapter(TableRenderingContentDescriptor.class); + + TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor) rendering.getAdapter(TableRenderingContentDescriptor.class); boolean alignAddress = true; - if (descriptor != null && !descriptor.isAlignAddressToBoundary()) - { + if (descriptor != null && !descriptor.isAlignAddressToBoundary()) { alignAddress = descriptor.isAlignAddressToBoundary(); } - + MemorySegment[] newSegments = convertMemoryBytesToSegments(address, bytes, bytesPerLine, numAddressableUnitPerLine, addressableSize, alignAddress); - for (int i=0; i<newSegments.length; i++) - { + for (int i = 0; i < newSegments.length; i++) { cache(newSegments[i].getAddress(), newSegments[i]); } } - - private void rebuildContent() - { - MemoryViewPresentationContext context = (MemoryViewPresentationContext)getTableViewer().getPresentationContext(); + + private void rebuildContent() { + MemoryViewPresentationContext context = (MemoryViewPresentationContext) getTableViewer().getPresentationContext(); AbstractAsyncTableRendering rendering = getTableRendering(context); - - if (rendering == null) + + if (rendering == null) { return; - - ArrayList segments = new ArrayList(); + } + + ArrayList<Object> segments = new ArrayList<Object>(); Object[] elements = getElements(); - for (int i=0; i<elements.length; i++) - { + for (int i = 0; i < elements.length; i++) { Object element = elements[i]; - if (element instanceof MemorySegment) - { + if (element instanceof MemorySegment) { segments.add(element); } } - - MemoryByte[] bytes = convertSegmentsToBytes((MemorySegment[])segments.toArray(new MemorySegment[segments.size()])); - + + MemoryByte[] bytes = convertSegmentsToBytes(segments.toArray(new MemorySegment[segments.size()])); + int bytesPerLine = rendering.getBytesPerLine(); int numAddressableUnitPerLine = rendering.getAddressableUnitPerLine(); - BigInteger address = (BigInteger)getKey(0); + BigInteger address = (BigInteger) getKey(0); int addressableSize = rendering.getAddressableSize(); - - TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor)rendering.getAdapter(TableRenderingContentDescriptor.class); + + TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor) rendering.getAdapter(TableRenderingContentDescriptor.class); boolean alignAddress = true; - if (descriptor != null && !descriptor.isAlignAddressToBoundary()) - { + if (descriptor != null && !descriptor.isAlignAddressToBoundary()) { alignAddress = descriptor.isAlignAddressToBoundary(); } - + MemorySegment[] newSegments = convertMemoryBytesToSegments(address, bytes, bytesPerLine, numAddressableUnitPerLine, addressableSize, alignAddress); remove(getElements()); add(newSegments); } - - private MemoryByte[] convertSegmentsToBytes(MemorySegment[] segments) - { - ArrayList toReturn = new ArrayList(); - for (int i=0; i<segments.length; i++) - { + private MemoryByte[] convertSegmentsToBytes(MemorySegment[] segments) { + ArrayList<MemoryByte> toReturn = new ArrayList<MemoryByte>(); + for (int i = 0; i < segments.length; i++) { MemoryByte[] temp = segments[i].getBytes(); - for (int j=0; j<temp.length; j++) - { + for (int j = 0; j < temp.length; j++) { toReturn.add(temp[j]); } } - return (MemoryByte[])toReturn.toArray(new MemoryByte[0]); + return toReturn.toArray(new MemoryByte[0]); } - + private MemorySegment[] convertMemoryBytesToSegments(BigInteger address, MemoryByte[] bytes, int bytesPerLine, int numAddressableUnitPerLine, int addressableSize, boolean alignAddress) { - + Assert.isTrue(bytesPerLine > 0); Assert.isTrue(numAddressableUnitPerLine > 0); - - ArrayList segments = new ArrayList(); + + ArrayList<MemorySegment> segments = new ArrayList<MemorySegment>(); MemoryByte[] temp = bytes; - - if (alignAddress) - { + + if (alignAddress) { BigInteger alignedAddress = MemoryViewUtil.alignToBoundary(address, numAddressableUnitPerLine); - - // also check that the address is properly aligned and prepend bytes if need to - if (!address.subtract(alignedAddress).equals(BigInteger.ZERO)) - { + + // also check that the address is properly aligned and prepend bytes + // if need to + if (!address.subtract(alignedAddress).equals(BigInteger.ZERO)) { BigInteger unitsToSetBack = address.subtract(alignedAddress); BigInteger tempAddress = address.subtract(unitsToSetBack); // only do this if the resulted address >= 0 // do not want to have negative addresses - if (tempAddress.compareTo(BigInteger.ZERO) >= 0) - { + if (tempAddress.compareTo(BigInteger.ZERO) >= 0) { address = alignedAddress; int numBytesNeeded = unitsToSetBack.intValue() * addressableSize; temp = new MemoryByte[bytes.length + numBytesNeeded]; - - for (int i=0; i<numBytesNeeded; i++) - { + + for (int i = 0; i < numBytesNeeded; i++) { temp[i] = new MemoryByte(); temp[i].setReadable(false); temp[i].setWritable(false); - temp[i].setEndianessKnown(false); - } - + temp[i].setEndianessKnown(false); + } + System.arraycopy(bytes, 0, temp, numBytesNeeded, bytes.length); bytes = temp; } } } - - if (bytes.length % bytesPerLine != 0) - { + + if (bytes.length % bytesPerLine != 0) { int numBytesNeeded = bytesPerLine - (bytes.length % bytesPerLine); temp = new MemoryByte[bytes.length + numBytesNeeded]; System.arraycopy(bytes, 0, temp, 0, bytes.length); - - for (int i=bytes.length; i<temp.length; i++) - { + + for (int i = bytes.length; i < temp.length; i++) { temp[i] = new MemoryByte(); temp[i].setReadable(false); temp[i].setWritable(false); - temp[i].setEndianessKnown(false); - } + temp[i].setEndianessKnown(false); + } bytes = temp; } - + int idx = 0; - while (idx < bytes.length && (idx + bytesPerLine)<= bytes.length) - { + while (idx < bytes.length && (idx + bytesPerLine) <= bytes.length) { MemoryByte[] newBytes = new MemoryByte[bytesPerLine]; System.arraycopy(bytes, idx, newBytes, 0, bytesPerLine); - + MemorySegment segment = new MemorySegment(address, newBytes, numAddressableUnitPerLine); segments.add(segment); - + address = address.add(BigInteger.valueOf(numAddressableUnitPerLine)); idx += bytesPerLine; } - - return (MemorySegment[])segments.toArray(new MemorySegment[segments.size()]); + + return segments.toArray(new MemorySegment[segments.size()]); } - - private AsynchronousTableViewer getTableViewer() - { - return (AsynchronousTableViewer)getViewer(); + + private AsynchronousTableViewer getTableViewer() { + return (AsynchronousTableViewer) getViewer(); } - protected void setChildren(ModelNode parentNode, List kids) { - - if (computeChanges()) - { + @Override + protected void setChildren(ModelNode parentNode, List<Object> kids) { + + if (computeChanges()) { Object[] newContent = compare(kids.toArray()); - ArrayList newList = new ArrayList(); - for (int i=0; i<newContent.length; i++) - { + ArrayList<Object> newList = new ArrayList<Object>(); + for (int i = 0; i < newContent.length; i++) { newList.add(newContent[i]); } super.setChildren(parentNode, newList); - } - else + } else { super.setChildren(parentNode, kids); + } } - - private boolean computeChanges() - { - if (isEmpty()) + + private boolean computeChanges() { + if (isEmpty()) { return false; - - if (fMBSupportsChangeManagement) - { + } + + if (fMBSupportsChangeManagement) { return false; } - + return true; } - - private IMemoryBlock getMemoryBlock() - { + + private IMemoryBlock getMemoryBlock() { return fMemoryBlock; } - + @Override public void init(Object root) { - if (root instanceof IMemoryBlock) - { - fMemoryBlock = (IMemoryBlock)root; + if (root instanceof IMemoryBlock) { + fMemoryBlock = (IMemoryBlock) root; new SupportsChangeMgmtJob().schedule(); } super.init(root); } - - private AbstractAsyncTableRendering getTableRendering(MemoryViewPresentationContext context) - { + + private AbstractAsyncTableRendering getTableRendering(MemoryViewPresentationContext context) { IMemoryRendering memRendering = context.getRendering(); - if (memRendering != null && memRendering instanceof AbstractAsyncTableRendering) - { - return (AbstractAsyncTableRendering)memRendering; + if (memRendering != null && memRendering instanceof AbstractAsyncTableRendering) { + return (AbstractAsyncTableRendering) memRendering; } return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPrefAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPrefAction.java index 43a2840bf..d6dc2c652 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPrefAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPrefAction.java @@ -30,6 +30,7 @@ public class TableRenderingPrefAction extends ActionDelegate implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IPreferencePage page = new TableRenderingPreferencePage(DebugUIMessages.TableRenderingPrefAction_0); showPreferencePage("org.eclipse.debug.ui.tableRenderingPreferencepage", page); //$NON-NLS-1$ @@ -38,6 +39,7 @@ public class TableRenderingPrefAction extends ActionDelegate implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { } @@ -49,6 +51,7 @@ public class TableRenderingPrefAction extends ActionDelegate implements IViewAct final PreferenceDialog dialog = new PreferenceDialog(DebugUIPlugin.getShell(), manager); final boolean [] result = new boolean[] { false }; BusyIndicator.showWhile(DebugUIPlugin.getStandardDisplay(), new Runnable() { + @Override public void run() { dialog.create(); dialog.setMessage(targetNode.getLabelText()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPreferencePage.java index e32593f33..3ac5222c3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPreferencePage.java @@ -49,6 +49,7 @@ public class TableRenderingPreferencePage extends PreferencePage implements super(title); } + @Override protected Control createContents(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugUIConstants.PLUGIN_ID + ".table_renderings_preference_page_context"); //$NON-NLS-1$ @@ -109,6 +110,7 @@ public class TableRenderingPreferencePage extends PreferencePage implements fManual.setSelection(!isAuto); } + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(FieldEditor.VALUE)) { @@ -161,10 +163,12 @@ public class TableRenderingPreferencePage extends PreferencePage implements } } + @Override protected IPreferenceStore doGetPreferenceStore() { return DebugUIPlugin.getDefault().getPreferenceStore(); } + @Override public void dispose() { fAuto.removeSelectionListener(this); fManual.removeSelectionListener(this); @@ -174,14 +178,17 @@ public class TableRenderingPreferencePage extends PreferencePage implements super.dispose(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { // do nothing } + @Override public void widgetSelected(SelectionEvent e) { updateTextEditorsEnablement(); } + @Override public boolean performOk() { boolean auto = fAuto.getSelection(); boolean currentValue = getPreferenceStore().getBoolean(IDebugPreferenceConstants.PREF_DYNAMIC_LOAD_MEM); @@ -194,6 +201,7 @@ public class TableRenderingPreferencePage extends PreferencePage implements return super.performOk(); } + @Override protected void performDefaults() { boolean auto = getPreferenceStore().getDefaultBoolean(IDebugPreferenceConstants.PREF_DYNAMIC_LOAD_MEM); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPropertiesPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPropertiesPage.java index 0f17551fe..7e9408004 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPropertiesPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPropertiesPage.java @@ -31,6 +31,7 @@ public class TableRenderingPropertiesPage extends PropertyPage implements super(); } + @Override protected Control createContents(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugUIConstants.PLUGIN_ID + ".TableRenderingPropertiesPage_context"); //$NON-NLS-1$ noDefaultAndApplyButton(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java index 2d126c515..25dde336f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java @@ -122,6 +122,7 @@ public class UnsignedIntegerRendering extends AbstractIntegerRendering { /* (non-Javadoc) * @see com.ibm.debug.extended.ui.AbstractMemoryRenderer#getString(java.lang.String, java.math.BigInteger, byte[]) */ + @Override public String getString(String dataType, BigInteger address, MemoryByte[] data) { String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR); @@ -173,6 +174,7 @@ public class UnsignedIntegerRendering extends AbstractIntegerRendering { /* (non-Javadoc) * @see com.ibm.debug.extended.ui.AbstractMemoryRenderer#getBytes(java.lang.String, java.math.BigInteger, java.lang.String) */ + @Override public byte[] getBytes(String dataType, BigInteger address, MemoryByte[] currentValues, String data) { int columnSize = getBytesPerColumn(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRenderingTypeDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRenderingTypeDelegate.java index fccbe93a5..805a8f983 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRenderingTypeDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRenderingTypeDelegate.java @@ -24,6 +24,7 @@ public class UnsignedIntegerRenderingTypeDelegate implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate#createRendering(java.lang.String) */ + @Override public IMemoryRendering createRendering(String id) throws CoreException { return new UnsignedIntegerRendering(id); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java index 55047f0e7..ae7f4c411 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java @@ -40,6 +40,7 @@ public class ModulesView extends VariablesView { /** * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.MODULES_VIEW; } @@ -47,6 +48,7 @@ public class ModulesView extends VariablesView { /** * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager) */ + @Override protected void configureToolBar(IToolBarManager tbm) { tbm.add(new Separator(this.getClass().getName())); tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP)); @@ -57,7 +59,8 @@ public class ModulesView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ - protected void fillContextMenu( IMenuManager menu ) { + @Override + protected void fillContextMenu( IMenuManager menu ) { menu.add( new Separator( IDebugUIConstants.EMPTY_MODULES_GROUP ) ); menu.add( new Separator( IDebugUIConstants.MODULES_GROUP ) ); menu.add(getAction(FIND_ACTION)); @@ -74,6 +77,7 @@ public class ModulesView extends VariablesView { /** * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getDetailPanePreferenceKey() */ + @Override protected String getDetailPanePreferenceKey() { return IDebugPreferenceConstants.MODULES_DETAIL_PANE_ORIENTATION; } @@ -81,6 +85,7 @@ public class ModulesView extends VariablesView { /** * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getToggleActionLabel() */ + @Override protected String getToggleActionLabel() { if (getViewer() != null) @@ -103,10 +108,12 @@ public class ModulesView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getPresentationContextId() */ + @Override protected String getPresentationContextId() { return IDebugUIConstants.ID_MODULE_VIEW; } + @Override protected void setViewerInput(Object context) { super.setViewerInput(context); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java index d0fa27aff..d509d4f4f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java @@ -25,6 +25,7 @@ public class RegistersView extends VariablesView { /** * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.REGISTERS_VIEW; } @@ -32,6 +33,7 @@ public class RegistersView extends VariablesView { /** * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager) */ + @Override protected void configureToolBar(IToolBarManager tbm) { super.configureToolBar(tbm); tbm.add(new Separator(IDebugUIConstants.EMPTY_REGISTER_GROUP)); @@ -41,6 +43,7 @@ public class RegistersView extends VariablesView { /** * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getDetailPanePreferenceKey() */ + @Override protected String getDetailPanePreferenceKey() { return IDebugPreferenceConstants.REGISTERS_DETAIL_PANE_ORIENTATION; } @@ -48,6 +51,7 @@ public class RegistersView extends VariablesView { /** * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getToggleActionLabel() */ + @Override protected String getToggleActionLabel() { return RegistersViewMessages.RegistersView_0; } @@ -55,6 +59,7 @@ public class RegistersView extends VariablesView { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getPresentationContextId() */ + @Override protected String getPresentationContextId() { return IDebugUIConstants.ID_REGISTER_VIEW; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java index 62644e211..e21d3784b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java @@ -50,6 +50,7 @@ public class AvailableLogicalStructuresAction extends Action implements IMenuCre /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { } @@ -64,6 +65,7 @@ public class AvailableLogicalStructuresAction extends Action implements IMenuCre /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#dispose() */ + @Override public void dispose() { if (fMenu != null) { fMenu.dispose(); @@ -76,6 +78,7 @@ public class AvailableLogicalStructuresAction extends Action implements IMenuCre /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control) */ + @Override public Menu getMenu(Control parent) { return null; } @@ -88,6 +91,7 @@ public class AvailableLogicalStructuresAction extends Action implements IMenuCre /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu) */ + @Override public Menu getMenu(Menu parent) { if (fMenu != null) { fMenu.dispose(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java index 68b16ba0d..33a0952fb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java @@ -47,6 +47,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IIndexedValue#getSize() */ + @Override public int getSize() { return fLength; } @@ -54,6 +55,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IIndexedValue#getVariable(int) */ + @Override public IVariable getVariable(int offset) throws DebugException { return fValue.getVariable(offset); } @@ -61,6 +63,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#getReferenceTypeName() */ + @Override public String getReferenceTypeName() throws DebugException { return fValue.getReferenceTypeName(); } @@ -68,6 +71,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#getValueString() */ + @Override public String getValueString() { return IInternalDebugCoreConstants.EMPTY_STRING; } @@ -75,6 +79,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#getVariables() */ + @Override public IVariable[] getVariables() throws DebugException { return getVariables(fOffset, fLength); } @@ -82,6 +87,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#hasVariables() */ + @Override public boolean hasVariables() { return fLength > 0; } @@ -89,6 +95,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#isAllocated() */ + @Override public boolean isAllocated() throws DebugException { return fValue.isAllocated(); } @@ -96,6 +103,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget() */ + @Override public IDebugTarget getDebugTarget() { return fValue.getDebugTarget(); } @@ -103,6 +111,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugElement#getLaunch() */ + @Override public ILaunch getLaunch() { return fValue.getLaunch(); } @@ -110,6 +119,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier() */ + @Override public String getModelIdentifier() { return fValue.getModelIdentifier(); } @@ -117,6 +127,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { return fValue.getAdapter(adapter); } @@ -124,6 +135,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IIndexedValue#getVariables(int, int) */ + @Override public IVariable[] getVariables(int offset, int length) throws DebugException { return fValue.getVariables(offset, length); } @@ -131,6 +143,7 @@ public class IndexedValuePartition implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IIndexedValue#getInitialOffset() */ + @Override public int getInitialOffset() { return fOffset; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java index 144f96b7e..4327e4aaf 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java @@ -65,6 +65,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IVariable#getValue() */ + @Override public IValue getValue() { return fValuePartition; } @@ -72,6 +73,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IVariable#getName() */ + @Override public String getName() { if (fName == null) { StringBuffer buf = new StringBuffer(); @@ -88,6 +90,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName() */ + @Override public String getReferenceTypeName() throws DebugException { if (fOriginalVariable instanceof IVariable) { IVariable variable = (IVariable) fOriginalVariable; @@ -99,6 +102,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IVariable#hasValueChanged() */ + @Override public boolean hasValueChanged() { return false; } @@ -106,6 +110,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier() */ + @Override public String getModelIdentifier() { return fOriginalValue.getModelIdentifier(); } @@ -113,6 +118,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget() */ + @Override public IDebugTarget getDebugTarget() { return fOriginalValue.getDebugTarget(); } @@ -120,6 +126,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugElement#getLaunch() */ + @Override public ILaunch getLaunch() { return fOriginalValue.getLaunch(); } @@ -127,6 +134,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValueModification#setValue(java.lang.String) */ + @Override public void setValue(String expression) throws DebugException { throw new DebugException(new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR, "Value modification not supported for indexed partitions.", null)); //$NON-NLS-1$ } @@ -134,6 +142,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValueModification#setValue(org.eclipse.debug.core.model.IValue) */ + @Override public void setValue(IValue value) throws DebugException { throw new DebugException(new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR, "Value modification not supported for indexed partitions.", null)); //$NON-NLS-1$ } @@ -141,6 +150,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValueModification#supportsValueModification() */ + @Override public boolean supportsValueModification() { return false; } @@ -148,6 +158,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValueModification#verifyValue(java.lang.String) */ + @Override public boolean verifyValue(String expression) { return false; } @@ -155,6 +166,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValueModification#verifyValue(org.eclipse.debug.core.model.IValue) */ + @Override public boolean verifyValue(IValue value) { return false; } @@ -162,6 +174,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof IndexedVariablePartition) { IndexedVariablePartition partition = (IndexedVariablePartition)obj; @@ -174,6 +187,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return fOriginalVariable.hashCode() + fOffset; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/LogicalStructureCache.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/LogicalStructureCache.java index dd72ccc30..5765ece18 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/LogicalStructureCache.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/LogicalStructureCache.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,7 +35,7 @@ public class LogicalStructureCache { /** * Maps a ILogicalStructureType to the cache for that type */ - private Map fCacheForType = new HashMap(); + private Map<ILogicalStructureType, LogicalStructureTypeCache> fCacheForType = new HashMap<ILogicalStructureType, LogicalStructureTypeCache>(); /** * Returns the logical value to replace the given value using the specified logical structure. @@ -69,7 +69,7 @@ public class LogicalStructureCache { * @return the cache associated with the logical structure type */ protected LogicalStructureTypeCache getCacheForType(ILogicalStructureType type){ - LogicalStructureTypeCache cache = (LogicalStructureTypeCache)fCacheForType.get(type); + LogicalStructureTypeCache cache = fCacheForType.get(type); if (cache == null){ cache = new LogicalStructureTypeCache(type); fCacheForType.put(type, cache); @@ -88,12 +88,12 @@ public class LogicalStructureCache { /** * Maps a raw IValue to its calculated logical IValue */ - private Map fKnownValues = new HashMap(); + private Map<IValue, IValue> fKnownValues = new HashMap<IValue, IValue>(); /** * Set of raw IValues that logical values are currently being evaluated for. */ - private Set fPendingValues = new HashSet(); + private Set<IValue> fPendingValues = new HashSet<IValue>(); public LogicalStructureTypeCache(ILogicalStructureType type){ fType = type; @@ -110,7 +110,7 @@ public class LogicalStructureCache { public IValue getLogicalStructure(IValue value) throws CoreException { // Check if the value has already been evaluated synchronized (fKnownValues) { - IValue logical = (IValue)fKnownValues.get(value); + IValue logical = fKnownValues.get(value); if (logical != null){ return logical; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectLogicalStructureAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectLogicalStructureAction.java index 80bc7b284..4ef148cf0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectLogicalStructureAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectLogicalStructureAction.java @@ -45,6 +45,7 @@ public class SelectLogicalStructureAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { valueChanged(); } @@ -54,6 +55,7 @@ public class SelectLogicalStructureAction extends Action { return; } BusyIndicator.showWhile(getView().getViewer().getControl().getDisplay(), new Runnable() { + @Override public void run() { // Checking this action sets the type to fType, unchecking it sets the type // to null ("none selected") diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectionDragAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectionDragAdapter.java index f565712a9..5ccaf11cb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectionDragAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectionDragAdapter.java @@ -46,14 +46,16 @@ public class SelectionDragAdapter extends DragSourceAdapter implements TransferD /* (non-Javadoc) * @see org.eclipse.jface.util.TransferDragSourceListener#getTransfer() */ - public Transfer getTransfer() { + @Override + public Transfer getTransfer() { return LocalSelectionTransfer.getTransfer(); } /* (non-Javadoc) * @see org.eclipse.swt.dnd.DragSourceAdapter#dragStart(org.eclipse.swt.dnd.DragSourceEvent) */ - public void dragStart(DragSourceEvent event) { + @Override + public void dragStart(DragSourceEvent event) { ISelection selection = fViewer.getSelection(); LocalSelectionTransfer.getTransfer().setSelection(selection); LocalSelectionTransfer.getTransfer().setSelectionSetTime(event.time & 0xFFFFFFFFL); @@ -63,7 +65,8 @@ public class SelectionDragAdapter extends DragSourceAdapter implements TransferD /* (non-Javadoc) * @see org.eclipse.swt.dnd.DragSourceAdapter#dragSetData(org.eclipse.swt.dnd.DragSourceEvent) */ - public void dragSetData(DragSourceEvent event) { + @Override + public void dragSetData(DragSourceEvent event) { // For consistency set the data to the selection even though // the selection is provided by the LocalSelectionTransfer // to the drop target adapter. @@ -73,7 +76,8 @@ public class SelectionDragAdapter extends DragSourceAdapter implements TransferD /* (non-Javadoc) * @see org.eclipse.swt.dnd.DragSourceAdapter#dragFinished(org.eclipse.swt.dnd.DragSourceEvent) */ - public void dragFinished(DragSourceEvent event) { + @Override + public void dragFinished(DragSourceEvent event) { LocalSelectionTransfer.getTransfer().setSelection(null); LocalSelectionTransfer.getTransfer().setSelectionSetTime(0); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java index dca133d1f..a554d56cd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java @@ -43,12 +43,14 @@ public class ToggleLogicalStructureAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { if (!getView().isAvailable()) { return; } getView().setShowLogicalStructure(isChecked()); BusyIndicator.showWhile(getView().getViewer().getControl().getDisplay(), new Runnable() { + @Override public void run() { getView().getViewer().refresh(); } @@ -58,6 +60,7 @@ public class ToggleLogicalStructureAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#setChecked(boolean) */ + @Override public void setChecked(boolean value) { super.setChecked(value); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleShowColumnsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleShowColumnsAction.java index 7dee94008..a1e7b2c38 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleShowColumnsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleShowColumnsAction.java @@ -43,11 +43,13 @@ public class ToggleShowColumnsAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { if (fViewer.getControl().isDisposed()) { return; } BusyIndicator.showWhile(fViewer.getControl().getDisplay(), new Runnable() { + @Override public void run() { fViewer.setShowColumns(isChecked()); } @@ -57,6 +59,7 @@ public class ToggleShowColumnsAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IUpdate#update() */ + @Override public void update() { setEnabled(fViewer.canToggleColumns()); setChecked(fViewer.isShowColumns()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java index fee97c166..93ec5fd68 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java @@ -38,6 +38,7 @@ public abstract class VariableViewToggleAction implements IViewActionDelegate, I /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fView = view; boolean checked = getPreferenceValue(view); @@ -48,6 +49,7 @@ public abstract class VariableViewToggleAction implements IViewActionDelegate, I /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; } @@ -55,12 +57,14 @@ public abstract class VariableViewToggleAction implements IViewActionDelegate, I /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } @@ -68,6 +72,7 @@ public abstract class VariableViewToggleAction implements IViewActionDelegate, I /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IPreferenceStore store = getPreferenceStore(); String key = getView().getSite().getId() + "." + getPreferenceKey(); //$NON-NLS-1$ @@ -77,6 +82,7 @@ public abstract class VariableViewToggleAction implements IViewActionDelegate, I /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java index a1712a85e..90d76f8ee 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java @@ -25,8 +25,8 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -153,6 +153,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis private static class SelectionProviderWrapper implements ISelectionProvider { private final ListenerList fListenerList = new ListenerList(ListenerList.IDENTITY); private final ISelectionChangedListener fListener = new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { fireSelectionChanged(event); } @@ -193,6 +194,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) */ + @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { fListenerList.add(listener); } @@ -200,6 +202,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() */ + @Override public ISelection getSelection() { if (fActiveProvider != null) { return fActiveProvider.getSelection(); @@ -210,6 +213,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) */ + @Override public void removeSelectionChangedListener(ISelectionChangedListener listener) { fListenerList.remove(listener); } @@ -217,6 +221,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) */ + @Override public void setSelection(ISelection selection) { if (fActiveProvider != null) { fActiveProvider.setSelection(selection); @@ -292,13 +297,14 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis */ private ViewerInputService fInputService; - private Map fGlobalActionMap = new HashMap(); + private Map<String, IAction> fGlobalActionMap = new HashMap<String, IAction>(); /** * Viewer input requester used to update the viewer once the viewer input has been * resolved. */ private IViewerInputRequestor fRequester = new IViewerInputRequestor() { + @Override public void viewerInputComplete(IViewerInputUpdate update) { if (!update.isCanceled()) { viewerInputUpdateComplete(update); @@ -323,7 +329,6 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /** * Presentation context property. - * TODO: make API * @since 3.3 */ public static final String PRESENTATION_SHOW_LOGICAL_STRUCTURES = "PRESENTATION_SHOW_LOGICAL_STRUCTURES"; //$NON-NLS-1$ @@ -357,6 +362,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelDeltaVisitor#visit(org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta, int) */ + @Override public boolean visit(IModelDelta delta, int depth) { if ((delta.getFlags() & IModelDelta.CONTENT) > 0) { fTriggerDetails = true; @@ -384,6 +390,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis */ private Job fTriggerDetailsJob = new UIJob("trigger details") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (monitor.isCanceled()) { return Status.CANCEL_STATUS; @@ -409,6 +416,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis * * @see IWorkbenchPart#dispose() */ + @Override public void dispose() { DebugUITools.removePartDebugContextListener(getSite(), this); @@ -424,7 +432,9 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis fPresentationContext.dispose(); fPresentationContext = null; } - if (fDetailPane != null) fDetailPane.dispose(); + if (fDetailPane != null) { + fDetailPane.dispose(); + } fInputService.dispose(); fSelectionProvider.dispose(); super.dispose(); @@ -470,6 +480,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /** * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { String propertyName= event.getProperty(); if (propertyName.equals(IDebugUIConstants.PREF_CHANGED_DEBUG_ELEMENT_COLOR) || @@ -482,6 +493,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#createViewer(Composite) */ + @Override public Viewer createViewer(Composite parent) { addResizeListener(parent); fParent = parent; @@ -513,6 +525,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis fDetailPane = new DetailPaneProxy(this); fDetailPane.addProperyListener(new IPropertyListener() { + @Override public void propertyChanged(Object source, int propId) { firePropertyChange(propId); } @@ -546,6 +559,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite, org.eclipse.ui.IMemento) */ + @Override public void init(IViewSite site, IMemento memento) throws PartInitException { super.init(site, memento); PREF_STATE_MEMENTO = PREF_STATE_MEMENTO + site.getId(); @@ -601,7 +615,8 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.ui.part.PageBookView#partDeactivated(org.eclipse.ui.IWorkbenchPart) */ - public void partDeactivated(IWorkbenchPart part) { + @Override + public void partDeactivated(IWorkbenchPart part) { String id = part.getSite().getId(); if (id.equals(getSite().getId())) { ByteArrayOutputStream bout = new ByteArrayOutputStream(); @@ -659,12 +674,14 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis final TreeModelViewer variablesViewer = new TreeModelViewer(parent, style, fPresentationContext); variablesViewer.getControl().addFocusListener(new FocusAdapter() { + @Override public void focusGained(FocusEvent e) { fTreeHasFocus = true; fSelectionProvider.setActiveProvider(variablesViewer); setGlobalActions(); } + @Override public void focusLost(FocusEvent e){ // Do not reset the selection provider with the provider proxy. // This should allow toolbar actions to remain active when the view @@ -676,6 +693,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis }); variablesViewer.getPresentationContext().addPropertyChangeListener( new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (IPresentationContext.PROPERTY_COLUMNS.equals(event.getProperty())) { IAction action = getAction("ShowTypeNames"); //$NON-NLS-1$ @@ -693,12 +711,11 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis } private void setGlobalActions() { - for (Iterator entryItr = fGlobalActionMap.entrySet().iterator(); entryItr.hasNext();) { - Map.Entry entry = (Map.Entry)entryItr.next(); - String actionID = (String)entry.getKey(); + for (Entry<String, IAction> entry : fGlobalActionMap.entrySet()) { + String actionID = entry.getKey(); IAction action = getOverrideAction(actionID); if (action == null) { - action = (IAction)entry.getValue(); + action = entry.getValue(); } setAction(actionID, action); } @@ -706,9 +723,10 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis } /** - * Save the global actions from action bar so they are not overriden by - * the detail pane. + * Save the global actions from action bar so they are not overridden by the + * detail pane. */ + @Override protected void createContextMenu(Control menuControl) { super.createContextMenu(menuControl); IActionBars actionBars = getViewSite().getActionBars(); @@ -724,8 +742,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis } private void clearGlobalActions() { - for (Iterator keyItr = fGlobalActionMap.keySet().iterator(); keyItr.hasNext();) { - String id = (String)keyItr.next(); + for (String id : fGlobalActionMap.keySet()) { setAction(id, null); } getViewSite().getActionBars().updateActionBars(); @@ -775,14 +792,17 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.VARIABLE_VIEW; } private void addResizeListener(Composite parent) { parent.addControlListener(new ControlListener() { + @Override public void controlMoved(ControlEvent e) { } + @Override public void controlResized(ControlEvent e) { if (IDebugPreferenceConstants.VARIABLES_DETAIL_PANE_AUTO.equals(fCurrentDetailPaneOrientation)) { setDetailPaneOrientation(IDebugPreferenceConstants.VARIABLES_DETAIL_PANE_AUTO); @@ -799,10 +819,11 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis int computeOrientation() { Point size= fParent.getSize(); if (size.x != 0 && size.y != 0) { - if ((size.x / 3)> size.y) + if ((size.x / 3)> size.y) { return SWT.HORIZONTAL; - else + } else { return SWT.VERTICAL; + } } return SWT.HORIZONTAL; } @@ -941,6 +962,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#createActions() */ + @Override protected void createActions() { IAction action = new ShowTypesAction(this); setAction("ShowTypeNames",action); //$NON-NLS-1$ @@ -978,6 +1000,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis fGlobalActionMap.put(actionID, action); } + @Override public IAction getAction(String actionID) { // Check if model overrides the action. Global action overrides are // checked in setGlobalActions() so skip them here. @@ -1005,6 +1028,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis return null; } + @Override public void updateObjects() { super.updateObjects(); if (fTreeHasFocus) { @@ -1041,6 +1065,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis setAction("ToggleColmns", new ToggleShowColumnsAction(viewer)); //$NON-NLS-1$ layoutSubMenu.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { layoutSubMenu.add(fToggleDetailPaneActions[0]); layoutSubMenu.add(fToggleDetailPaneActions[1]); @@ -1074,6 +1099,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis * * @param tbm The toolbar that will be configured */ + @Override protected void configureToolBar(IToolBarManager tbm) { tbm.add(new Separator(this.getClass().getName())); tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP)); @@ -1088,6 +1114,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis * * @param menu The menu to add the item to. */ + @Override protected void fillContextMenu(IMenuManager menu) { menu.add(new Separator(IDebugUIConstants.EMPTY_VARIABLE_GROUP)); menu.add(new Separator(IDebugUIConstants.VARIABLE_GROUP)); @@ -1119,7 +1146,8 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis protected ISelectionChangedListener getTreeSelectionChangedListener() { if (fTreeSelectionChangedListener == null) { fTreeSelectionChangedListener = new ISelectionChangedListener() { - public void selectionChanged(final SelectionChangedEvent event) { + @Override + public void selectionChanged(final SelectionChangedEvent event) { if (event.getSelectionProvider().equals(getViewer())) { clearStatusLine(); // if the detail pane is not visible, don't waste time retrieving details @@ -1145,6 +1173,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getCurrentPaneID() */ + @Override public String getCurrentPaneID() { return fDetailPane.getCurrentPaneID(); } @@ -1152,6 +1181,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getCurrentSelection() */ + @Override public IStructuredSelection getCurrentSelection() { if (getViewer() != null){ return (IStructuredSelection)getViewer().getSelection(); @@ -1162,6 +1192,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getParentComposite() */ + @Override public Composite getParentComposite() { return fDetailsComposite; } @@ -1169,6 +1200,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getWorkbenchPartSite() */ + @Override public IWorkbenchPartSite getWorkbenchPartSite() { return getSite(); } @@ -1176,6 +1208,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#refreshDetailPaneContents() */ + @Override public void refreshDetailPaneContents() { if (isDetailPaneVisible()) { String currentPaneID = getCurrentPaneID(); @@ -1201,9 +1234,11 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#paneChanged(java.lang.String) */ + @Override public void paneChanged(String newPaneID) { if (fDetailPaneActivatedListener == null){ fDetailPaneActivatedListener = new Listener() { + @Override public void handleEvent(Event event) { fTreeHasFocus = false; } @@ -1225,13 +1260,16 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.ui.part.WorkbenchPart#getAdapter(Class) */ + @Override public Object getAdapter(Class required) { if (IDebugModelPresentation.class.equals(required)) { return getModelPresentation(); } else if (fDetailPane != null){ Object adapter = fDetailPane.getAdapter(required); - if (adapter != null) return adapter; + if (adapter != null) { + return adapter; + } } return super.getAdapter(required); } @@ -1244,7 +1282,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis protected void updateAction(String actionId) { IAction action= getAction(actionId); if (action == null) { - action = (IAction)fGlobalActionMap.get(actionId); + action = fGlobalActionMap.get(actionId); } if (action instanceof IUpdate) { ((IUpdate) action).update(); @@ -1261,6 +1299,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#getDefaultControl() */ + @Override protected Control getDefaultControl() { return fSashForm; } @@ -1268,6 +1307,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.IDebugExceptionHandler#handleException(org.eclipse.debug.core.DebugException) */ + @Override public void handleException(DebugException e) { showMessage(e.getMessage()); } @@ -1275,6 +1315,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener#contextEvent(org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { contextActivated(event.getContext()); @@ -1301,6 +1342,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis * * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(DoubleClickEvent) */ + @Override public void doubleClick(DoubleClickEvent event) { IAction action = getAction(DOUBLE_CLICK_ACTION); if (action != null && action.isEnabled()) { @@ -1329,6 +1371,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugView#getPresentation(String) */ + @Override public IDebugModelPresentation getPresentation(String id) { if (getViewer() instanceof StructuredViewer) { IDebugModelPresentation lp = getModelPresentation(); @@ -1378,6 +1421,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#becomesHidden() */ + @Override protected void becomesHidden() { fInputService.resolveViewerInput(ViewerInputService.NULL_INPUT); super.becomesHidden(); @@ -1386,6 +1430,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#becomesVisible() */ + @Override protected void becomesVisible() { super.becomesVisible(); ISelection selection = getDebugContext(); @@ -1411,11 +1456,13 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {} /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, java.lang.String) */ + @Override public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) { if(changeId.equals(IWorkbenchPage.CHANGE_RESET)) { setLastSashWeights(DEFAULT_SASH_WEIGHTS); @@ -1427,6 +1474,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelChangedListener#modelChanged(org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta) */ + @Override public void modelChanged(IModelDelta delta, IModelProxy proxy) { fVisitor.reset(); delta.accept(fVisitor); @@ -1438,6 +1486,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#updateComplete(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor) */ + @Override public void updateComplete(IViewerUpdate update) { IStatus status = update.getStatus(); if (!update.isCanceled()) { @@ -1456,12 +1505,14 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#updateStarted(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor) */ + @Override public void updateStarted(IViewerUpdate update) { } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#viewerUpdatesBegin() */ + @Override public synchronized void viewerUpdatesBegin() { fTriggerDetailsJob.cancel(); IWorkbenchSiteProgressService progressService = @@ -1474,6 +1525,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#viewerUpdatesComplete() */ + @Override public synchronized void viewerUpdatesComplete() { if (fVisitor.isTriggerDetails()) { fTriggerDetailsJob.schedule(); @@ -1488,6 +1540,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /** * @see org.eclipse.ui.IWorkbenchPart#setFocus() */ + @Override public void setFocus() { boolean success = false; if (!fTreeHasFocus && fDetailPane != null){ @@ -1501,9 +1554,11 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis protected ToggleDetailPaneAction getToggleDetailPaneAction(String orientation) { - for (int i=0; i<fToggleDetailPaneActions.length; i++) - if (fToggleDetailPaneActions[i].getOrientation().equals(orientation)) + for (int i=0; i<fToggleDetailPaneActions.length; i++) { + if (fToggleDetailPaneActions[i].getOrientation().equals(orientation)) { return fToggleDetailPaneActions[i]; + } + } return null; } @@ -1511,6 +1566,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer2#setSelectionProvider(org.eclipse.jface.viewers.ISelectionProvider) */ + @Override public void setSelectionProvider(ISelectionProvider provider) { // Workaround for legacy detail pane implementations (bug 254442) // set selection provider wrapper again in case it got overridden by detail pane @@ -1522,6 +1578,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void doSave(IProgressMonitor monitor) { fDetailPane.doSave(monitor); } @@ -1529,6 +1586,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.ui.ISaveablePart#doSaveAs() */ + @Override public void doSaveAs() { fDetailPane.doSaveAs(); } @@ -1536,6 +1594,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.ui.ISaveablePart#isDirty() */ + @Override public boolean isDirty() { return fDetailPane.isDirty(); } @@ -1543,6 +1602,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed() */ + @Override public boolean isSaveAsAllowed() { return fDetailPane.isSaveAsAllowed(); } @@ -1550,6 +1610,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /* (non-Javadoc) * @see org.eclipse.ui.ISaveablePart#isSaveOnCloseNeeded() */ + @Override public boolean isSaveOnCloseNeeded() { return fDetailPane.isSaveOnCloseNeeded(); } @@ -1558,6 +1619,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis * @see org.eclipse.ui.ISaveablePart2#promptToSaveOnClose() * @since 3.7 */ + @Override public int promptToSaveOnClose() { return ISaveablePart2.YES; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AbstractDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AbstractDetailPane.java index 51394aa3d..2ee374a79 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AbstractDetailPane.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AbstractDetailPane.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.debug.internal.ui.views.variables.details; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -41,16 +40,17 @@ public abstract class AbstractDetailPane implements IDetailPane { * Map of actions. Keys are strings, values * are <code>IAction</code>. */ - private Map fActionMap = new HashMap(); + private Map<String, IAction> fActionMap = new HashMap<String, IAction>(); /** * Collection to track actions that should be updated when selection occurs. */ - private List fSelectionActions = new ArrayList(); + private List<String> fSelectionActions = new ArrayList<String>(); /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#init(org.eclipse.ui.IWorkbenchPartSite) */ + @Override public void init(IWorkbenchPartSite workbench) { fWorkbenchPartSite = workbench; @@ -59,6 +59,7 @@ public abstract class AbstractDetailPane implements IDetailPane { /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#dispose() */ + @Override public void dispose() { fActionMap.clear(); fSelectionActions.clear(); @@ -98,7 +99,9 @@ public abstract class AbstractDetailPane implements IDetailPane { * @param actionID The ID of the action which should be updated */ protected void setSelectionDependantAction(String actionID){ - if (actionID != null) fSelectionActions.add(actionID); + if (actionID != null) { + fSelectionActions.add(actionID); + } } /** @@ -108,7 +111,7 @@ public abstract class AbstractDetailPane implements IDetailPane { * @return The action associated with the ID or null if none is found. */ protected IAction getAction(String actionID) { - return (IAction) fActionMap.get(actionID); + return fActionMap.get(actionID); } /** @@ -133,9 +136,8 @@ public abstract class AbstractDetailPane implements IDetailPane { * before it can be updated by this method. */ protected void updateSelectionDependentActions() { - Iterator iterator= fSelectionActions.iterator(); - while (iterator.hasNext()) { - updateAction((String)iterator.next()); + for (String string : fSelectionActions) { + updateAction(string); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AvailableDetailPanesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AvailableDetailPanesAction.java index eb0700285..ca8e07c50 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AvailableDetailPanesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AvailableDetailPanesAction.java @@ -11,7 +11,6 @@ package org.eclipse.debug.internal.ui.views.variables.details; -import java.util.Iterator; import java.util.Set; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; @@ -32,7 +31,7 @@ import org.eclipse.ui.PlatformUI; public class AvailableDetailPanesAction extends Action implements IMenuCreator { private Menu fMenu; - private Set fAvailableIDs; + private Set<String> fAvailableIDs; private IDetailPaneContainer fDetailPaneContainer; /** @@ -46,14 +45,15 @@ public class AvailableDetailPanesAction extends Action implements IMenuCreator { private class SetDetailPaneAction extends Action { private String fPaneID; - private Set fPossiblePaneIDs; + private Set<String> fPossiblePaneIDs; - public SetDetailPaneAction(String name, String paneID, Set possiblePaneIDs){ + public SetDetailPaneAction(String name, String paneID, Set<String> possiblePaneIDs) { super(name,AS_RADIO_BUTTON); fPaneID = paneID; fPossiblePaneIDs = possiblePaneIDs; } + @Override public void run() { // Don't change panes unless the user is selecting a different pane than the one currently displayed if (isChecked() && !fDetailPaneContainer.getCurrentPaneID().equals(fPaneID)){ @@ -77,12 +77,14 @@ public class AvailableDetailPanesAction extends Action implements IMenuCreator { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { } /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#dispose() */ + @Override public void dispose() { if (fMenu != null) { fMenu.dispose(); @@ -93,6 +95,7 @@ public class AvailableDetailPanesAction extends Action implements IMenuCreator { /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control) */ + @Override public Menu getMenu(Control parent) { return null; } @@ -105,18 +108,14 @@ public class AvailableDetailPanesAction extends Action implements IMenuCreator { /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu) */ + @Override public Menu getMenu(Menu parent) { if (fMenu != null) { fMenu.dispose(); } - fMenu= new Menu(parent); - - Iterator iter = fAvailableIDs.iterator(); int i = 0; - while (iter.hasNext()) { - String currentID = (String) iter.next(); - + for (String currentID : fAvailableIDs) { StringBuffer name = new StringBuffer(); //add the numerical accelerator i++; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java index bde6a9a3a..be0aa7634 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java @@ -150,6 +150,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane public int fValue; + @Override public String toString() { return String.valueOf(fValue); } @@ -185,9 +186,10 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { fMonitor = monitor; - Iterator iterator = fElements.iterator(); + Iterator<?> iterator = fElements.iterator(); String message = null; while (iterator.hasNext()) { if (monitor.isCanceled()) { @@ -256,6 +258,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#canceling() */ + @Override protected void canceling() { super.canceling(); synchronized (this) { @@ -266,6 +269,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.debug.ui.IValueDetailListener#detailComputed(org.eclipse.debug.core.model.IValue, java.lang.String) */ + @Override public void detailComputed(IValue value, final String result) { synchronized (this) { fComputed = true; @@ -281,6 +285,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane final String detail = (valueString != null) ? valueString : DetailMessages.DefaultDetailPane_3; if (!fMonitor.isCanceled()) { WorkbenchJob append = new WorkbenchJob("append details") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (!fMonitor.isCanceled()) { String insert = detail; @@ -371,6 +376,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public Control createControl(Composite parent) { fModelPresentation = new VariablesViewModelPresentation(); @@ -414,7 +420,9 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane // Add a document listener so actions get updated when the document changes getDetailDocument().addDocumentListener(new IDocumentListener() { + @Override public void documentAboutToBeChanged(DocumentEvent event) {} + @Override public void documentChanged(DocumentEvent event) { updateSelectionDependentActions(); } @@ -422,6 +430,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane // Add the selection listener so selection dependent actions get updated. fSourceViewer.getSelectionProvider().addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { updateSelectionDependentActions(); } @@ -429,6 +438,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane // Add a focus listener to update actions when details area gains focus fSourceViewer.getControl().addFocusListener(new FocusAdapter() { + @Override public void focusGained(FocusEvent e) { setGlobalAction(IDebugView.SELECT_ALL_ACTION, getAction(DETAIL_SELECT_ALL_ACTION)); setGlobalAction(IDebugView.CUT_ACTION, getAction(DETAIL_CUT_ACTION)); @@ -446,6 +456,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane fHasFocus = true; } + @Override public void focusLost(FocusEvent e) { setGlobalAction(IDebugView.SELECT_ALL_ACTION, null); setGlobalAction(IDebugView.CUT_ACTION, null); @@ -463,6 +474,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane // disposed controls don't get a FocusOut event, make sure all actions // have been deactivated fSourceViewer.getControl().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (fHasFocus) { setGlobalAction(IDebugView.SELECT_ALL_ACTION, null); @@ -564,6 +576,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane MenuManager menuMgr= new MenuManager(); menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager mgr) { fillDetailContextMenu(mgr); } @@ -607,6 +620,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#display(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public void display(IStructuredSelection selection) { if (selection == null){ @@ -650,6 +664,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#setFocus() */ + @Override public boolean setFocus(){ if (fSourceViewer != null){ fSourceViewer.getTextWidget().setFocus(); @@ -661,11 +676,18 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.AbstractDetailPane#dispose() */ + @Override public void dispose(){ - if (fDetailJob != null) fDetailJob.cancel(); - if (fModelPresentation != null) fModelPresentation.dispose(); + if (fDetailJob != null) { + fDetailJob.cancel(); + } + if (fModelPresentation != null) { + fModelPresentation.dispose(); + } fDebugModelIdentifier = null; // Setting this to null makes sure the source viewer is reconfigured with the model presentation after disposal - if (fSourceViewer != null && fSourceViewer.getControl() != null) fSourceViewer.getControl().dispose(); + if (fSourceViewer != null && fSourceViewer.getControl() != null) { + fSourceViewer.getControl().dispose(); + } if (isInView()){ IAction action = getAction(DETAIL_ASSIGN_VALUE_ACTION); @@ -693,6 +715,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#getDescription() */ + @Override public String getDescription() { return DESCRIPTION; } @@ -700,6 +723,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#getID() */ + @Override public String getID() { return ID; } @@ -707,6 +731,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#getName() */ + @Override public String getName() { return NAME; } @@ -714,6 +739,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class required) { if (IFindReplaceTarget.class.equals(required)) { return fSourceViewer.getFindReplaceTarget(); @@ -804,12 +830,13 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane int lineOffset= document.getLineOffset(line); int tabWidth= styledText.getTabs(); int column= 0; - for (int i= lineOffset; i < caret; i++) + for (int i= lineOffset; i < caret; i++) { if ('\t' == document.getChar(i)) { column += tabWidth - (tabWidth == 0 ? 0 : column % tabWidth); } else { column++; } + } fLineLabel.fValue= line + 1; fColumnLabel.fValue= column + 1; @@ -831,19 +858,24 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane if (fCursorListener == null) { fCursorListener= new ICursorListener() { + @Override public void keyPressed(KeyEvent e) { fStatusLineItem.setText(getCursorPosition()); } + @Override public void keyReleased(KeyEvent e) { } + @Override public void mouseDoubleClick(MouseEvent e) { } + @Override public void mouseDown(MouseEvent e) { } + @Override public void mouseUp(MouseEvent e) { fStatusLineItem.setText(getCursorPosition()); } @@ -929,14 +961,16 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane */ private IUndoContext getUndoContext() { IUndoManager undoManager= fSourceViewer.getUndoManager(); - if (undoManager instanceof IUndoManagerExtension) + if (undoManager instanceof IUndoManagerExtension) { return ((IUndoManagerExtension)undoManager).getUndoContext(); + } return null; } /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { String propertyName= event.getProperty(); if (propertyName.equals(IDebugUIConstants.PREF_DETAIL_PANE_FONT)) { @@ -972,6 +1006,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#canPerformFind() */ + @Override public boolean canPerformFind() { return fTarget.canPerformFind(); } @@ -979,6 +1014,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#findAndSelect(int, java.lang.String, boolean, boolean, boolean) */ + @Override public int findAndSelect(int widgetOffset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord) { int position = fTarget.findAndSelect(widgetOffset, findString, searchForward, caseSensitive, wholeWord); // Explicitly tell the widget to show the selection because the viewer thinks the text is all on one line, even if wrapping is turned on. @@ -994,6 +1030,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#getSelection() */ + @Override public Point getSelection() { return fTarget.getSelection(); } @@ -1001,6 +1038,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#getSelectionText() */ + @Override public String getSelectionText() { return fTarget.getSelectionText(); } @@ -1008,6 +1046,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#isEditable() */ + @Override public boolean isEditable() { return fTarget.isEditable(); } @@ -1015,6 +1054,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#replaceSelection(java.lang.String) */ + @Override public void replaceSelection(String text) { fTarget.replaceSelection(text); } @@ -1023,6 +1063,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane /* * @see org.eclipse.debug.ui.IDetailPane2#getSelectionProvider() */ + @Override public ISelectionProvider getSelectionProvider() { return fSourceViewer.getSelectionProvider(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPaneFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPaneFactory.java index 00275bb41..cb4ee5c0b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPaneFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPaneFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -31,6 +31,7 @@ public class DefaultDetailPaneFactory implements IDetailPaneFactory { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#createDetailsArea(java.lang.String) */ + @Override public IDetailPane createDetailPane(String id) { if (MessageDetailPane.ID.equals(id)) { return new MessageDetailPane(); @@ -39,11 +40,15 @@ public class DefaultDetailPaneFactory implements IDetailPaneFactory { } } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getDetailsTypes(org.eclipse.jface.viewers.IStructuredSelection) + /* + * (non-Javadoc) + * @see + * org.eclipse.debug.ui.IDetailPaneFactory#getDetailPaneTypes(org.eclipse + * .jface.viewers.IStructuredSelection) */ - public Set getDetailPaneTypes(IStructuredSelection selection) { - Set possibleIDs = new HashSet(1); + @Override + public Set<String> getDetailPaneTypes(IStructuredSelection selection) { + Set<String> possibleIDs = new HashSet<String>(1); possibleIDs.add(DefaultDetailPane.ID); return possibleIDs; } @@ -51,6 +56,7 @@ public class DefaultDetailPaneFactory implements IDetailPaneFactory { /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPaneFactory#getDefaultDetailPane(java.util.Set, org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public String getDefaultDetailPane(IStructuredSelection selection) { // Return null so that any contributed detail pane can override the default return null; @@ -59,6 +65,7 @@ public class DefaultDetailPaneFactory implements IDetailPaneFactory { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getName(java.lang.String) */ + @Override public String getDetailPaneName(String id) { if (id.equals(DefaultDetailPane.ID)){ return DefaultDetailPane.NAME; @@ -73,6 +80,7 @@ public class DefaultDetailPaneFactory implements IDetailPaneFactory { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getDescription(java.lang.String) */ + @Override public String getDetailPaneDescription(String id) { if (id.equals(DefaultDetailPane.ID)){ return DefaultDetailPane.DESCRIPTION; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java index 23b1c4002..8089a2e0d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java @@ -11,9 +11,8 @@ package org.eclipse.debug.internal.ui.views.variables.details; import java.util.ArrayList; -import java.util.Collection; +import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; @@ -75,6 +74,7 @@ public class DetailPaneManager { * @param paneID the identifier of the detail pane to create * @return the new detail pane or <code>null</code> if the backing {@link IDetailPaneFactory} is <code>null</code> */ + @Override public IDetailPane createDetailPane(String paneID){ if (getFactory() != null){ return getFactory().createDetailPane(paneID); @@ -88,11 +88,12 @@ public class DetailPaneManager { * @param selection the current view selection * @return the set of detail pane type for the given selection or an empty set, never <code>null</code> */ - public Set getDetailPaneTypes(IStructuredSelection selection){ + @Override + public Set<String> getDetailPaneTypes(IStructuredSelection selection) { if (getFactory() != null){ return getFactory().getDetailPaneTypes(selection); } - return new HashSet(0); + return Collections.EMPTY_SET; } /** @@ -101,6 +102,7 @@ public class DetailPaneManager { * @param selection the current view selection * @return the identifier of the default detail pane or <code>null</code> if the backing {@link IDetailPaneFactory} is <code>null</code> */ + @Override public String getDefaultDetailPane(IStructuredSelection selection) { if (getFactory() != null){ return getFactory().getDefaultDetailPane(selection); @@ -114,6 +116,7 @@ public class DetailPaneManager { * @param paneID the detail pane identifier * @return the name of the detail pane or <code>null</code> if the backing {@link IDetailPaneFactory} is <code>null</code> */ + @Override public String getDetailPaneName(String paneID) { if (getFactory() != null){ return getFactory().getDetailPaneName(paneID); @@ -127,6 +130,7 @@ public class DetailPaneManager { * @param paneID the detail pane identifier * @return the description of the detail pane or <code>null</code> if the backing {@link IDetailPaneFactory} is <code>null</code> */ + @Override public String getDetailPaneDescription(String paneID) { if (getFactory() != null){ return getFactory().getDetailPaneDescription(paneID); @@ -139,7 +143,9 @@ public class DetailPaneManager { * @return the singleton {@link IDetailPaneFactory} */ private IDetailPaneFactory getFactory(){ - if (fFactory != null) return fFactory; + if (fFactory != null) { + return fFactory; + } try{ Object obj = fConfigElement.createExecutableExtension(IConfigurationElementConstants.CLASS); if(obj instanceof IDetailPaneFactory) { @@ -168,7 +174,7 @@ public class DetailPaneManager { } Expression expression = getEnablementExpression(); if (expression != null) { - List list = selection.toList(); + List<?> list = selection.toList(); IEvaluationContext context = DebugUIPlugin.createEvaluationContext(list); context.addVariable("selection", list); //$NON-NLS-1$ enabled = evalEnablementExpression(context, expression); @@ -237,17 +243,17 @@ public class DetailPaneManager { * Maps the IDs of types of detail panes to the factory that can create them. * There can currently only be one factory for a given type of details pane. */ - private Map fFactoriesByPaneID; + private Map<String, IDetailPaneFactory> fFactoriesByPaneID; /** * Maps a Set of detail pane id's to the one detail pane id that is preferred. */ - private Map fPreferredDetailPanes; + private Map<Set<String>, String> fPreferredDetailPanes; /** * The set of all factories that have been loaded from the extension point. */ - private Collection fKnownFactories; + private List<DetailPaneFactoryExtension> fKnownFactories; /** * Preference key for storing the preferred detail panes map. @@ -257,12 +263,14 @@ public class DetailPaneManager { public static final String PREF_DETAIL_AREAS = "preferredDetailPanes"; //$NON-NLS-1$ private DetailPaneManager(){ - fFactoriesByPaneID = new HashMap(); + fFactoriesByPaneID = new HashMap<String, IDetailPaneFactory>(); fFactoriesByPaneID.put(MessageDetailPane.ID, new DefaultDetailPaneFactory()); } public static DetailPaneManager getDefault(){ - if (fgSingleton == null) fgSingleton = new DetailPaneManager(); + if (fgSingleton == null) { + fgSingleton = new DetailPaneManager(); + } return fgSingleton; } @@ -273,8 +281,8 @@ public class DetailPaneManager { * @return The ID of the preferred detail pane or null */ public String getPreferredPaneFromSelection(IStructuredSelection selection){ - Collection possibleFactories = getEnabledFactories(selection); - Set possiblePaneIDs = getPossiblePaneIDs(possibleFactories, selection); + List<IDetailPaneFactory> possibleFactories = getEnabledFactories(selection); + Set<String> possiblePaneIDs = getPossiblePaneIDs(possibleFactories, selection); return chooseDetailsAreaIDInSet(possiblePaneIDs, possibleFactories, selection); } @@ -285,8 +293,8 @@ public class DetailPaneManager { * @param selection The selection to display in the detail pane * @return The set of IDs of all possible detail panes for the given selection */ - public Set getAvailablePaneIDs(IStructuredSelection selection){ - Collection possibleFactories = getEnabledFactories(selection); + public Set<String> getAvailablePaneIDs(IStructuredSelection selection) { + List<IDetailPaneFactory> possibleFactories = getEnabledFactories(selection); return getPossiblePaneIDs(possibleFactories, selection); } @@ -301,7 +309,7 @@ public class DetailPaneManager { * @return The instantiated pane or null */ public IDetailPane getDetailPaneFromID(String ID){ - IDetailPaneFactory factory = (IDetailPaneFactory)fFactoriesByPaneID.get(ID); + IDetailPaneFactory factory = fFactoriesByPaneID.get(ID); if (factory != null){ return factory.createDetailPane(ID); } @@ -316,7 +324,7 @@ public class DetailPaneManager { * @return The name of the details pane or null */ public String getNameFromID(String ID){ - IDetailPaneFactory factory = (IDetailPaneFactory)fFactoriesByPaneID.get(ID); + IDetailPaneFactory factory = fFactoriesByPaneID.get(ID); if (factory != null){ return factory.getDetailPaneName(ID); } @@ -331,7 +339,7 @@ public class DetailPaneManager { * @return The description of the details pane or null */ public String getDescriptionFromID(String ID){ - IDetailPaneFactory factory = (IDetailPaneFactory)fFactoriesByPaneID.get(ID); + IDetailPaneFactory factory = fFactoriesByPaneID.get(ID); if (factory != null){ return factory.getDetailPaneDescription(ID); } @@ -348,12 +356,12 @@ public class DetailPaneManager { * * @return The factories enabled for the selection or an empty collection. */ - private Collection getEnabledFactories(IStructuredSelection selection){ - Collection factoriesForSelection = new ArrayList(); - if (fKnownFactories == null) initializeDetailFactories(); - Iterator iter = fKnownFactories.iterator(); - while (iter.hasNext()) { - IDetailPaneFactory currentFactory = (IDetailPaneFactory) iter.next(); + private List<IDetailPaneFactory> getEnabledFactories(IStructuredSelection selection) { + List<IDetailPaneFactory> factoriesForSelection = new ArrayList<IDetailPaneFactory>(); + if (fKnownFactories == null) { + initializeDetailFactories(); + } + for (IDetailPaneFactory currentFactory : fKnownFactories) { if (currentFactory instanceof DetailPaneFactoryExtension){ if (((DetailPaneFactoryExtension)currentFactory).isEnabled(selection)){ factoriesForSelection.add(currentFactory); @@ -371,14 +379,10 @@ public class DetailPaneManager { * @param selection The selection to be displayed * @return Set of pane IDs or an empty set */ - private Set getPossiblePaneIDs(Collection factoriesToQuery, IStructuredSelection selection){ - Set idsForSelection = new LinkedHashSet(); - Iterator factoryIter = factoriesToQuery.iterator(); - while (factoryIter.hasNext()) { - IDetailPaneFactory currentFactory = (IDetailPaneFactory) factoryIter.next(); - Iterator detailAreaTypes = currentFactory.getDetailPaneTypes(selection).iterator(); - while (detailAreaTypes.hasNext()) { - String currentAreaTypeID = (String) detailAreaTypes.next(); + private Set<String> getPossiblePaneIDs(List<IDetailPaneFactory> factoriesToQuery, IStructuredSelection selection) { + Set<String> idsForSelection = new LinkedHashSet<String>(); + for (IDetailPaneFactory currentFactory : factoriesToQuery) { + for (String currentAreaTypeID : currentFactory.getDetailPaneTypes(selection)) { fFactoriesByPaneID.put(currentAreaTypeID, currentFactory); idsForSelection.add(currentAreaTypeID); } @@ -396,7 +400,7 @@ public class DetailPaneManager { * @param selection the current selection from the variables view * @return The preferred detail pane ID or null */ - private String chooseDetailsAreaIDInSet(Set possiblePaneIDs, Collection enabledFactories, IStructuredSelection selection){ + private String chooseDetailsAreaIDInSet(Set<String> possiblePaneIDs, List<IDetailPaneFactory> enabledFactories, IStructuredSelection selection) { if (possiblePaneIDs == null || possiblePaneIDs.isEmpty()){ return null; } @@ -405,18 +409,19 @@ public class DetailPaneManager { if (preferredID == null){ // If there is no preferred pane already set, check the factories to see there is a default pane - Iterator factoryIterator = enabledFactories.iterator(); - while (preferredID == null && factoryIterator.hasNext()) { - IDetailPaneFactory currentFactory = (IDetailPaneFactory) factoryIterator.next(); + for (IDetailPaneFactory currentFactory : enabledFactories) { preferredID = currentFactory.getDefaultDetailPane(selection); + if (preferredID != null) { + break; + } } // If the factories don't have a default, try to choose the DefaultDetailPane if (preferredID == null){ - Iterator paneIterator = possiblePaneIDs.iterator(); + Iterator<String> paneIterator = possiblePaneIDs.iterator(); // If the DefaultDetailPane is not in the set, just use the first in the set - preferredID = (String)paneIterator.next(); + preferredID = paneIterator.next(); while (paneIterator.hasNext() && preferredID != DefaultDetailPaneFactory.DEFAULT_DETAIL_PANE_ID) { - String currentID = (String) paneIterator.next(); + String currentID = paneIterator.next(); if (currentID.equals(DefaultDetailPaneFactory.DEFAULT_DETAIL_PANE_ID)){ preferredID = currentID; } @@ -433,7 +438,7 @@ public class DetailPaneManager { */ private synchronized void initializeDetailFactories(){ if (fKnownFactories == null){ - fKnownFactories = new ArrayList(); + fKnownFactories = new ArrayList<DetailPaneFactoryExtension>(); IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_DETAIL_FACTORIES); IConfigurationElement[] infos = extensionPoint.getConfigurationElements(); DetailPaneFactoryExtension delegate = null; @@ -450,11 +455,11 @@ public class DetailPaneManager { * @param possibleDetailsAreaIDs Set of possible pane IDs * @return The preferred ID or null */ - public String getUserPreferredDetailPane(Set possibleDetailsAreaIDs){ + public String getUserPreferredDetailPane(Set<String> possibleDetailsAreaIDs) { if (fPreferredDetailPanes == null){ loadPreferredDetailsAreas(); } - return (String)fPreferredDetailPanes.get(possibleDetailsAreaIDs); + return fPreferredDetailPanes.get(possibleDetailsAreaIDs); } @@ -465,12 +470,14 @@ public class DetailPaneManager { * @param possibleDetailsAreaIDs The set of possible IDs * @param preferredDetailsAreaID The preferred ID in the set. */ - public void setPreferredDetailPane(Set possibleDetailsAreaIDs, String preferredDetailsAreaID){ - if (possibleDetailsAreaIDs == null) return; + public void setPreferredDetailPane(Set<String> possibleDetailsAreaIDs, String preferredDetailsAreaID) { + if (possibleDetailsAreaIDs == null) { + return; + } if (fPreferredDetailPanes == null){ loadPreferredDetailsAreas(); } - String currentKey = (String)fPreferredDetailPanes.get(possibleDetailsAreaIDs); + String currentKey = fPreferredDetailPanes.get(possibleDetailsAreaIDs); if (currentKey == null || !currentKey.equals(preferredDetailsAreaID)){ fPreferredDetailPanes.put(possibleDetailsAreaIDs, preferredDetailsAreaID); storePreferredDetailsAreas(); @@ -488,12 +495,8 @@ public class DetailPaneManager { */ private void storePreferredDetailsAreas() { StringBuffer buffer= new StringBuffer(); - Iterator iter = fPreferredDetailPanes.entrySet().iterator(); - while (iter.hasNext()) { - Entry entry = (Entry) iter.next(); - Iterator setIter = ((Set)entry.getKey()).iterator(); - while (setIter.hasNext()) { - String currentID = (String) setIter.next(); + for (Entry<Set<String>, String> entry : fPreferredDetailPanes.entrySet()) { + for (String currentID : entry.getKey()) { buffer.append(currentID); buffer.append(','); } @@ -519,7 +522,7 @@ public class DetailPaneManager { * @see #storePreferredDetailsAreas() */ private void loadPreferredDetailsAreas() { - fPreferredDetailPanes = new HashMap(); + fPreferredDetailPanes = new HashMap<Set<String>, String>(); String preferenceValue = Platform.getPreferencesService().getString(DebugUIPlugin.getUniqueIdentifier(), PREF_DETAIL_AREAS, "", //$NON-NLS-1$ @@ -529,7 +532,7 @@ public class DetailPaneManager { String token = entryTokenizer.nextToken(); int valueStart = token.indexOf(':'); StringTokenizer keyTokenizer = new StringTokenizer(token.substring(0,valueStart),","); //$NON-NLS-1$ - Set keys = new LinkedHashSet(); + Set<String> keys = new LinkedHashSet<String>(); while (keyTokenizer.hasMoreTokens()){ keys.add(keyTokenizer.nextToken()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneProxy.java index abd568775..da231f3c8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -173,7 +173,7 @@ public class DetailPaneProxy implements ISaveablePart { * @param required the class to get the adapter for * @return the {@link IAdaptable} for the given class or <code>null</code> */ - public Object getAdapter(Class required){ + public Object getAdapter(Class<?> required) { if (fCurrentPane != null && fCurrentPane instanceof IAdaptable){ return ((IAdaptable)fCurrentPane).getAdapter(required); } @@ -203,8 +203,12 @@ public class DetailPaneProxy implements ISaveablePart { private void setupPane(String paneID, IStructuredSelection selection) { try { fParentContainer.getParentComposite().setRedraw(false); - if (fCurrentPane != null) fCurrentPane.dispose(); - if (fCurrentControl != null && !fCurrentControl.isDisposed()) fCurrentControl.dispose(); + if (fCurrentPane != null) { + fCurrentPane.dispose(); + } + if (fCurrentControl != null && !fCurrentControl.isDisposed()) { + fCurrentControl.dispose(); + } fCurrentPane = null; fCurrentPane = DetailPaneManager.getDefault().getDetailPaneFromID(paneID); if (fCurrentPane != null){ @@ -223,9 +227,11 @@ public class DetailPaneProxy implements ISaveablePart { fCurrentPane.display(selection); if (fParentContainer instanceof IDetailPaneContainer2) { fCurrentControl.addFocusListener(new FocusAdapter() { + @Override public void focusGained(FocusEvent e) { updateSelectionProvider(true); } + @Override public void focusLost(FocusEvent e) { updateSelectionProvider(false); } @@ -233,11 +239,11 @@ public class DetailPaneProxy implements ISaveablePart { } } else{ createErrorLabel(DetailMessages.DetailPaneProxy_0); - DebugUIPlugin.log(new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), MessageFormat.format(DetailMessages.DetailPaneProxy_2, new String[]{fCurrentPane.getID()})))); + DebugUIPlugin.log(new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), MessageFormat.format(DetailMessages.DetailPaneProxy_2, new Object[] { fCurrentPane.getID() })))); } } else { createErrorLabel(DetailMessages.DetailPaneProxy_0); - DebugUIPlugin.log(new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), MessageFormat.format(DetailMessages.DetailPaneProxy_3, new String[]{paneID})))); + DebugUIPlugin.log(new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), MessageFormat.format(DetailMessages.DetailPaneProxy_3, new Object[] { paneID })))); } } finally { fParentContainer.getParentComposite().setRedraw(true); @@ -272,8 +278,12 @@ public class DetailPaneProxy implements ISaveablePart { * @param message The message to display */ private void createErrorLabel(String message){ - if (fCurrentPane != null) fCurrentPane.dispose(); - if (fCurrentControl != null && !fCurrentControl.isDisposed()) fCurrentControl.dispose(); + if (fCurrentPane != null) { + fCurrentPane.dispose(); + } + if (fCurrentControl != null && !fCurrentControl.isDisposed()) { + fCurrentControl.dispose(); + } fCurrentControl = SWTFactory.createComposite(fParentContainer.getParentComposite(), 1, 1, GridData.FILL_HORIZONTAL); SWTFactory.createLabel((Composite) fCurrentControl, message, 1); fParentContainer.getParentComposite().layout(); @@ -282,6 +292,7 @@ public class DetailPaneProxy implements ISaveablePart { /* (non-Javadoc) * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void doSave(IProgressMonitor monitor) { ISaveablePart saveable = getSaveable(); if (saveable != null) { @@ -292,6 +303,7 @@ public class DetailPaneProxy implements ISaveablePart { /* (non-Javadoc) * @see org.eclipse.ui.ISaveablePart#doSaveAs() */ + @Override public void doSaveAs() { ISaveablePart saveable = getSaveable(); if (saveable != null) { @@ -302,6 +314,7 @@ public class DetailPaneProxy implements ISaveablePart { /* (non-Javadoc) * @see org.eclipse.ui.ISaveablePart#isDirty() */ + @Override public boolean isDirty() { ISaveablePart saveable = getSaveable(); if (saveable != null) { @@ -313,6 +326,7 @@ public class DetailPaneProxy implements ISaveablePart { /* (non-Javadoc) * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed() */ + @Override public boolean isSaveAsAllowed() { ISaveablePart saveable = getSaveable(); if (saveable != null) { @@ -324,6 +338,7 @@ public class DetailPaneProxy implements ISaveablePart { /* (non-Javadoc) * @see org.eclipse.ui.ISaveablePart#isSaveOnCloseNeeded() */ + @Override public boolean isSaveOnCloseNeeded() { ISaveablePart saveable = getSaveable(); if (saveable != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java index 69fa18c3b..609ec9afb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java @@ -46,12 +46,14 @@ public class MessageDetailPane implements IDetailPane { /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#init(org.eclipse.ui.IWorkbenchPartSite) */ + @Override public void init(IWorkbenchPartSite partSite) { } /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#dispose() */ + @Override public void dispose() { fControlParent.dispose(); } @@ -59,6 +61,7 @@ public class MessageDetailPane implements IDetailPane { /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public Control createControl(Composite parent) { fControlParent = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH); fControlParent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND)); @@ -69,6 +72,7 @@ public class MessageDetailPane implements IDetailPane { /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#setFocus() */ + @Override public boolean setFocus() { return false; } @@ -76,6 +80,7 @@ public class MessageDetailPane implements IDetailPane { /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#display(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public void display(IStructuredSelection selection) { // re-create controls if the layout has changed if (selection != null && selection.size() == 1) { @@ -95,6 +100,7 @@ public class MessageDetailPane implements IDetailPane { /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#getID() */ + @Override public String getID() { return ID; } @@ -102,6 +108,7 @@ public class MessageDetailPane implements IDetailPane { /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#getName() */ + @Override public String getName() { return NAME; } @@ -109,6 +116,7 @@ public class MessageDetailPane implements IDetailPane { /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#getDescription() */ + @Override public String getDescription() { return DESCRIPTION; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.java index 8c1b2ad45..913984ff8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractBreakpointOrganizerDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,14 +35,16 @@ public abstract class AbstractBreakpointOrganizerDelegate implements IBreakpoint /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#addBreakpoint(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable) */ - public void addBreakpoint(IBreakpoint breakpoint, IAdaptable category) { + @Override + public void addBreakpoint(IBreakpoint breakpoint, IAdaptable category) { // do noting, not supported by default } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void addPropertyChangeListener(IPropertyChangeListener listener) { + @Override + public void addPropertyChangeListener(IPropertyChangeListener listener) { fListeners.add(listener); } @@ -53,7 +55,8 @@ public abstract class AbstractBreakpointOrganizerDelegate implements IBreakpoint * * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#canAdd(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable) */ - public boolean canAdd(IBreakpoint breakpoint, IAdaptable category) { + @Override + public boolean canAdd(IBreakpoint breakpoint, IAdaptable category) { return category instanceof OtherBreakpointCategory; } @@ -64,28 +67,32 @@ public abstract class AbstractBreakpointOrganizerDelegate implements IBreakpoint * * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#canRemove(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable) */ - public boolean canRemove(IBreakpoint breakpoint, IAdaptable category) { + @Override + public boolean canRemove(IBreakpoint breakpoint, IAdaptable category) { return category instanceof OtherBreakpointCategory; } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#dispose() */ - public void dispose() { + @Override + public void dispose() { fListeners = new ListenerList(); } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#removeBreakpoint(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable) */ - public void removeBreakpoint(IBreakpoint breakpoint, IAdaptable category) { + @Override + public void removeBreakpoint(IBreakpoint breakpoint, IAdaptable category) { // do nothing, not supported by default } /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void removePropertyChangeListener(IPropertyChangeListener listener) { + @Override + public void removePropertyChangeListener(IPropertyChangeListener listener) { fListeners.remove(listener); } @@ -103,10 +110,12 @@ public abstract class AbstractBreakpointOrganizerDelegate implements IBreakpoint for (int i = 0; i < listeners.length; i++) { final IPropertyChangeListener listener = (IPropertyChangeListener) listeners[i]; ISafeRunnable runnable = new ISafeRunnable() { - public void handleException(Throwable exception) { + @Override + public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } - public void run() throws Exception { + @Override + public void run() throws Exception { listener.propertyChange(event); } }; @@ -117,7 +126,8 @@ public abstract class AbstractBreakpointOrganizerDelegate implements IBreakpoint /* (non-Javadoc) * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories() */ - public IAdaptable[] getCategories() { + @Override + public IAdaptable[] getCategories() { return null; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java index efc12b3cf..92a41dd97 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java @@ -12,9 +12,9 @@ package org.eclipse.debug.ui; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -113,19 +113,19 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi * Map of actions. Keys are strings, values * are <code>IAction</code>. */ - private Map fActionMap = null; + private Map<String, IAction> fActionMap = null; /** * Map of actions. Keys are strings, values * are <code>IAction</code>. */ - private List fUpdateables = null; + private List<IUpdate> fUpdateables = null; /** * The collection of menu managers that are * relevant for this view. */ - private List fContextMenuManagers; + private List<IMenuManager> fContextMenuManagers; /** * The memento that was used to persist the state of this view. @@ -151,9 +151,9 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi */ private String fEarlyMessage= null; - private static Set fgGlobalActionIds; + private static Set<String> fgGlobalActionIds; static { - fgGlobalActionIds = new HashSet(); + fgGlobalActionIds = new HashSet<String>(); fgGlobalActionIds.add(SELECT_ALL_ACTION); fgGlobalActionIds.add(COPY_ACTION); fgGlobalActionIds.add(CUT_ACTION); @@ -173,6 +173,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi * * @see org.eclipse.ui.IPartListener2#partVisible(IWorkbenchPartReference) */ + @Override public void partVisible(IWorkbenchPartReference ref) { IWorkbenchPart part= ref.getPart(false); if (part == AbstractDebugView.this) { @@ -183,6 +184,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see org.eclipse.ui.IPartListener2#partHidden(IWorkbenchPartReference) */ + @Override public void partHidden(IWorkbenchPartReference ref) { IWorkbenchPart part= ref.getPart(false); if (part == AbstractDebugView.this) { @@ -193,36 +195,42 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see org.eclipse.ui.IPartListener2#partActivated(IWorkbenchPartReference) */ + @Override public void partActivated(IWorkbenchPartReference ref) { } /** * @see org.eclipse.ui.IPartListener2#partBroughtToTop(IWorkbenchPartReference) */ + @Override public void partBroughtToTop(IWorkbenchPartReference ref) { } /** * @see org.eclipse.ui.IPartListener2#partClosed(IWorkbenchPartReference) */ + @Override public void partClosed(IWorkbenchPartReference ref) { } /** * @see org.eclipse.ui.IPartListener2#partDeactivated(IWorkbenchPartReference) */ + @Override public void partDeactivated(IWorkbenchPartReference ref) { } /** * @see org.eclipse.ui.IPartListener2#partOpened(IWorkbenchPartReference) */ + @Override public void partOpened(IWorkbenchPartReference ref) { } /** * @see org.eclipse.ui.IPartListener2#partInputChanged(IWorkbenchPartReference) */ + @Override public void partInputChanged(IWorkbenchPartReference ref){ } @@ -232,8 +240,8 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi * Constructs a new debug view. */ public AbstractDebugView() { - fActionMap = new HashMap(5); - fUpdateables= new ArrayList(3); + fActionMap = new HashMap<String, IAction>(5); + fUpdateables = new ArrayList<IUpdate>(3); } /** @@ -244,6 +252,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) * @see IDebugView */ + @Override public Object getAdapter(Class adapter) { if (adapter == IDebugView.class) { return this; @@ -268,6 +277,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IPage#createControl(Composite) */ + @Override public void createControl(Composite parent) { Viewer viewer = createViewer(parent); setViewer(viewer); @@ -276,6 +286,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IPage#getControl() */ + @Override public Control getControl() { return getDefaultControl(); } @@ -283,6 +294,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IPage#setFocus() */ + @Override public void setFocus() { Viewer viewer= getViewer(); if (viewer != null) { @@ -316,6 +328,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi * @see AbstractDebugView#getHelpContextId() * @see AbstractDebugView#fillContextMenu(IMenuManager) */ + @Override public void createPartControl(Composite parent) { registerPartListener(); super.createPartControl(parent); @@ -331,6 +344,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi } if (viewer != null) { getViewer().getControl().addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { handleKeyPressed(e); } @@ -355,6 +369,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi * * @see PageBookView#createDefaultPage(PageBook) */ + @Override protected IPage createDefaultPage(PageBook book) { ViewerPage page = new ViewerPage(); page.createControl(book); @@ -391,6 +406,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IWorkbenchPart#dispose() */ + @Override public void dispose() { saveAllCheckedActionStates(); deregisterPartListener(); @@ -466,6 +482,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IDebugView#getViewer() */ + @Override public Viewer getViewer() { return fViewer; } @@ -501,6 +518,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IDebugView#getPresentation(String) */ + @Override public IDebugModelPresentation getPresentation(String id) { if (getViewer() instanceof StructuredViewer) { IBaseLabelProvider lp = ((StructuredViewer)getViewer()).getLabelProvider(); @@ -533,6 +551,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi MenuManager menuMgr= new MenuManager("#PopUp"); //$NON-NLS-1$ menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager mgr) { fillContextMenu(mgr); } @@ -552,6 +571,8 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi * * @deprecated @see AbstractDebugView.getContextMenuManagers() */ + @Deprecated + @Override public IMenuManager getContextMenuManager() { if (fContextMenuManagers != null) { fContextMenuManagers.get(fContextMenuManagers.size() - 1); @@ -565,7 +586,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi * @return the context menu managers relevant to this view * @since 2.1 */ - public List getContextMenuManagers() { + public List<IMenuManager> getContextMenuManagers() { return fContextMenuManagers; } @@ -598,6 +619,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi // This is done in a runnable to be run after this view's pane // is created Runnable r = new Runnable() { + @Override public void run() { if (!isAvailable()) { return; @@ -644,6 +666,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IViewPart#init(IViewSite, IMemento) */ + @Override public void init(IViewSite site, IMemento memento) throws PartInitException { super.init(site, memento); //store the memento to be used when this view is created. @@ -673,6 +696,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IDebugView#setAction(String, IAction) */ + @Override public void setAction(String actionID, IAction action) { if (action == null) { Object removedAction= fActionMap.remove(actionID); @@ -680,7 +704,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi } else { fActionMap.put(actionID, action); if (action instanceof IUpdate) { - fUpdateables.add(action); + fUpdateables.add((IUpdate) action); } } if (fgGlobalActionIds.contains(actionID)) { @@ -692,17 +716,17 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IDebugView#getAction(String) */ + @Override public IAction getAction(String actionID) { - return (IAction) fActionMap.get(actionID); + return fActionMap.get(actionID); } /** * Updates all the registered updatables. */ public void updateObjects() { - Iterator actions = fUpdateables.iterator(); - while (actions.hasNext()) { - ((IUpdate)actions.next()).update(); + for (IUpdate update : fUpdateables) { + update.update(); } } @@ -728,6 +752,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi * * @see IDoubleClickListener#doubleClick(DoubleClickEvent) */ + @Override public void doubleClick(DoubleClickEvent event) { IAction action = getAction(DOUBLE_CLICK_ACTION); if (action != null && !event.getSelection().isEmpty() && action.isEnabled()) { @@ -808,6 +833,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see PageBookView#isImportant(IWorkbenchPart) */ + @Override protected boolean isImportant(IWorkbenchPart part) { return false; } @@ -815,6 +841,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see PageBookView#doCreatePage(IWorkbenchPart) */ + @Override protected PageRec doCreatePage(IWorkbenchPart part) { return null; } @@ -822,12 +849,14 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see PageBookView#doDestroyPage(org.eclipse.ui.IWorkbenchPart, org.eclipse.ui.part.PageBookView.PageRec) */ + @Override protected void doDestroyPage(IWorkbenchPart part, PageRec pageRecord) { } /** * @see PageBookView#getBootstrapPart() */ + @Override protected IWorkbenchPart getBootstrapPart() { return null; } @@ -908,6 +937,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IDebugView#add(IUpdate) */ + @Override public void add(IUpdate updatable) { if (!fUpdateables.contains(updatable)) { fUpdateables.add(updatable); @@ -917,6 +947,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi /** * @see IDebugView#remove(IUpdate) */ + @Override public void remove(IUpdate updatable) { fUpdateables.remove(updatable); } @@ -929,7 +960,7 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi */ public void addContextMenuManager(IMenuManager contextMenuManager) { if (fContextMenuManagers == null) { - fContextMenuManagers= new ArrayList(); + fContextMenuManagers = new ArrayList<IMenuManager>(); } fContextMenuManagers.add(contextMenuManager); } @@ -993,14 +1024,14 @@ public abstract class AbstractDebugView extends PageBookView implements IDebugVi * presentation in this view associated with the given debug model * @since 3.0 */ - public Map getPresentationAttributes(String modelId) { + public Map<String, Object> getPresentationAttributes(String modelId) { IDebugModelPresentation presentation = getPresentation(modelId); if (presentation instanceof DelegatingModelPresentation) { return ((DelegatingModelPresentation)presentation).getAttributeMap(); } else if (presentation instanceof LazyModelPresentation) { return ((LazyModelPresentation)presentation).getAttributeMap(); } - return new HashMap(); + return Collections.EMPTY_MAP; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.java index dd4e4456c..e2dbb3a50 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -118,6 +118,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura /** * @see ILaunchConfigurationTab#getControl() */ + @Override public Control getControl() { return fControl; } @@ -134,6 +135,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura /** * @see ILaunchConfigurationTab#getErrorMessage() */ + @Override public String getErrorMessage() { return fErrorMessage; } @@ -142,6 +144,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura * @see ILaunchConfigurationTab2#getWarningMessage() * @since 3.9 */ + @Override public String getWarningMessage() { return fWarningMessage; } @@ -149,6 +152,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura /** * @see ILaunchConfigurationTab#getMessage() */ + @Override public String getMessage() { return fMessage; } @@ -162,12 +166,15 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura * than the launch dialog, this method cannot be relied upon for launching * functionality. */ + @Deprecated + @Override public void launched(ILaunch launch) { } /** * @see ILaunchConfigurationTab#setLaunchConfigurationDialog(ILaunchConfigurationDialog) */ + @Override public void setLaunchConfigurationDialog(ILaunchConfigurationDialog dialog) { fLaunchConfigurationDialog = dialog; } @@ -214,6 +221,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura * * @see ILaunchConfigurationTab#dispose() */ + @Override public void dispose() { } @@ -273,6 +281,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura /** * @see ILaunchConfigurationTab#canSave() */ + @Override public boolean canSave() { return true; } @@ -280,6 +289,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura /** * @see ILaunchConfigurationTab#isValid(ILaunchConfiguration) */ + @Override public boolean isValid(ILaunchConfiguration launchConfig) { return true; } @@ -310,6 +320,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura /** * @see ILaunchConfigurationTab#getImage() */ + @Override public Image getImage() { return null; } @@ -395,6 +406,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) * @since 3.0 */ + @Override public void activated(ILaunchConfigurationWorkingCopy workingCopy) { initializeFrom(workingCopy); } @@ -415,6 +427,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) * @since 3.0 */ + @Override public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) { performApply(workingCopy); } @@ -452,12 +465,14 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura */ protected Job createUpdateJob() { return new WorkbenchJob(getControl().getDisplay(), "Update LCD") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (!getControl().isDisposed()) { updateLaunchConfigurationDialog(); } return Status.OK_STATUS; } + @Override public boolean shouldRun() { return !getControl().isDisposed(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTabGroup.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTabGroup.java index d1e873e1d..970ac29dc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTabGroup.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTabGroup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,6 +36,7 @@ public abstract class AbstractLaunchConfigurationTabGroup implements ILaunchConf /** * @see ILaunchConfigurationTabGroup#getTabs() */ + @Override public ILaunchConfigurationTab[] getTabs() { return fTabs; } @@ -54,6 +55,7 @@ public abstract class AbstractLaunchConfigurationTabGroup implements ILaunchConf * * @see ILaunchConfigurationTabGroup#dispose() */ + @Override public void dispose() { ILaunchConfigurationTab[] tabs = getTabs(); if (tabs != null) { @@ -68,6 +70,7 @@ public abstract class AbstractLaunchConfigurationTabGroup implements ILaunchConf * * @see ILaunchConfigurationTabGroup#setDefaults(ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { ILaunchConfigurationTab[] tabs = getTabs(); for (int i = 0; i < tabs.length; i++) { @@ -80,6 +83,7 @@ public abstract class AbstractLaunchConfigurationTabGroup implements ILaunchConf * * @see ILaunchConfigurationTabGroup#initializeFrom(ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { ILaunchConfigurationTab[] tabs = getTabs(); for (int i = 0; i < tabs.length; i++) { @@ -92,6 +96,7 @@ public abstract class AbstractLaunchConfigurationTabGroup implements ILaunchConf * * @see ILaunchConfigurationTabGroup#performApply(ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { ILaunchConfigurationTab[] tabs = getTabs(); for (int i = 0; i < tabs.length; i++) { @@ -108,6 +113,8 @@ public abstract class AbstractLaunchConfigurationTabGroup implements ILaunchConf * than the launch dialog, this method cannot be relied upon for launching * functionality. */ + @Deprecated + @Override public void launched(ILaunch launch) { ILaunchConfigurationTab[] tabs = getTabs(); for (int i = 0; i < tabs.length; i++) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/BreakpointTypeCategory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/BreakpointTypeCategory.java index 1ce0c4672..9fcb97e15 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/BreakpointTypeCategory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/BreakpointTypeCategory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -64,6 +64,7 @@ public class BreakpointTypeCategory extends PlatformObject implements IBreakpoin /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object object) { if (object instanceof BreakpointTypeCategory) { BreakpointTypeCategory type = (BreakpointTypeCategory) object; @@ -75,6 +76,7 @@ public class BreakpointTypeCategory extends PlatformObject implements IBreakpoin /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return getName().hashCode(); } @@ -82,6 +84,7 @@ public class BreakpointTypeCategory extends PlatformObject implements IBreakpoin /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object o) { return null; } @@ -89,6 +92,7 @@ public class BreakpointTypeCategory extends PlatformObject implements IBreakpoin /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ + @Override public ImageDescriptor getImageDescriptor(Object object) { return fImageDescriptor; } @@ -96,6 +100,7 @@ public class BreakpointTypeCategory extends PlatformObject implements IBreakpoin /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ + @Override public String getLabel(Object o) { return getName(); } @@ -103,10 +108,12 @@ public class BreakpointTypeCategory extends PlatformObject implements IBreakpoin /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ + @Override public Object getParent(Object o) { return null; } + @Override public String toString() { return fName; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java index a74e76b11..fdac516a5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,7 +15,6 @@ import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -141,6 +140,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { * Modify listener that simply updates the owning launch configuration dialog. */ private ModifyListener fBasicModifyListener = new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { scheduleUpdateJob(); } @@ -157,6 +157,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); @@ -202,6 +203,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { fFavoritesTable.setContentProvider(new FavoritesContentProvider()); fFavoritesTable.setLabelProvider(new FavoritesLabelProvider()); fFavoritesTable.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { updateLaunchConfigurationDialog(); } @@ -222,12 +224,14 @@ public class CommonTab extends AbstractLaunchConfigurationTab { fLocalRadioButton.setLayoutData(gd); fSharedRadioButton = createRadioButton(comp, LaunchConfigurationsMessages.CommonTab_S_hared_4); fSharedRadioButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleSharedRadioButtonSelected(); } }); fSharedLocationText = SWTFactory.createSingleText(comp, 1); fSharedLocationText.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = LaunchConfigurationsMessages.CommonTab_S_hared_4; } @@ -235,6 +239,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { fSharedLocationText.addModifyListener(fBasicModifyListener); fSharedLocationButton = createPushButton(comp, LaunchConfigurationsMessages.CommonTab__Browse_6, null); fSharedLocationButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleSharedLocationButtonSelected(); } @@ -259,7 +264,8 @@ public class CommonTab extends AbstractLaunchConfigurationTab { gd.horizontalSpan = 5; fConsoleOutput.setLayoutData(gd); fConsoleOutput.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } }); @@ -267,14 +273,16 @@ public class CommonTab extends AbstractLaunchConfigurationTab { fFileOutput = createCheckButton(comp, LaunchConfigurationsMessages.CommonTab_6); fFileOutput.setLayoutData(new GridData(SWT.BEGINNING, SWT.NORMAL, false, false)); fFileOutput.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { enableOuputCaptureWidgets(fFileOutput.getSelection()); updateLaunchConfigurationDialog(); } }); fFileText = SWTFactory.createSingleText(comp, 4); fFileText.getAccessible().addAccessibleListener(new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = LaunchConfigurationsMessages.CommonTab_6; } }); @@ -286,7 +294,8 @@ public class CommonTab extends AbstractLaunchConfigurationTab { ld.marginWidth = 0; fWorkspaceBrowse = createPushButton(bcomp, LaunchConfigurationsMessages.CommonTab_12, null); fWorkspaceBrowse.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider()); dialog.setTitle(LaunchConfigurationsMessages.CommonTab_13); dialog.setMessage(LaunchConfigurationsMessages.CommonTab_14); @@ -305,7 +314,8 @@ public class CommonTab extends AbstractLaunchConfigurationTab { }); fFileBrowse = createPushButton(bcomp, LaunchConfigurationsMessages.CommonTab_7, null); fFileBrowse.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { String filePath = fFileText.getText(); FileDialog dialog = new FileDialog(getShell(), SWT.SAVE); filePath = dialog.open(); @@ -316,7 +326,8 @@ public class CommonTab extends AbstractLaunchConfigurationTab { }); fVariables = createPushButton(bcomp, LaunchConfigurationsMessages.CommonTab_9, null); fVariables.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell()); dialog.open(); String variable = dialog.getVariableExpression(); @@ -324,14 +335,16 @@ public class CommonTab extends AbstractLaunchConfigurationTab { fFileText.insert(variable); } } - public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetDefaultSelected(SelectionEvent e) {} }); fAppend = createCheckButton(comp, LaunchConfigurationsMessages.CommonTab_11); gd = new GridData(SWT.LEFT, SWT.TOP, true, false); gd.horizontalSpan = 4; fAppend.setLayoutData(gd); fAppend.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } }); @@ -394,19 +407,21 @@ public class CommonTab extends AbstractLaunchConfigurationTab { fEncodingCombo = new Combo(group, SWT.NONE); fEncodingCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); fEncodingCombo.setFont(parent.getFont()); - List allEncodings = IDEEncoding.getIDEEncodings(); - String[] encodingArray = (String[]) allEncodings.toArray(new String[0]); + List<String> allEncodings = IDEEncoding.getIDEEncodings(); + String[] encodingArray = allEncodings.toArray(new String[0]); fEncodingCombo.setItems(encodingArray); if (encodingArray.length > 0) { fEncodingCombo.select(0); } fEncodingCombo.getAccessible().addAccessibleListener(new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = LaunchConfigurationsMessages.CommonTab_3; } }); SelectionListener listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { if(e.getSource() instanceof Button) { Button button = (Button)e.getSource(); if(button.getSelection()) { @@ -428,6 +443,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { * * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent) */ + @Override public void keyReleased(KeyEvent e) { scheduleUpdateJob(); } @@ -464,6 +480,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { fLaunchInBackgroundButton.setLayoutData(data); fLaunchInBackgroundButton.setFont(parent.getFont()); fLaunchInBackgroundButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } @@ -547,6 +564,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { boolean isShared = !configuration.isLocal(); fSharedRadioButton.setSelection(isShared); @@ -615,7 +633,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { } catch (CoreException e) { } String defaultEncoding = getDefaultEncoding(configuration); - fDefaultEncodingButton.setText(MessageFormat.format(LaunchConfigurationsMessages.CommonTab_2, new String[]{defaultEncoding})); + fDefaultEncodingButton.setText(MessageFormat.format(LaunchConfigurationsMessages.CommonTab_2, new Object[] { defaultEncoding })); fDefaultEncodingButton.pack(); if (encoding != null) { fAltEncodingButton.setSelection(true); @@ -649,11 +667,12 @@ public class CommonTab extends AbstractLaunchConfigurationTab { * Updates the favorites selections from the local configuration * @param config the local configuration */ + @SuppressWarnings("deprecation") private void updateFavoritesFromConfig(ILaunchConfiguration config) { fFavoritesTable.setInput(config); fFavoritesTable.setCheckedElements(new Object[]{}); try { - List groups = config.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, new ArrayList()); + List<String> groups = config.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, new ArrayList<String>()); if (groups.isEmpty()) { // check old attributes for backwards compatible if (config.getAttribute(IDebugUIConstants.ATTR_DEBUG_FAVORITE, false)) { @@ -664,10 +683,8 @@ public class CommonTab extends AbstractLaunchConfigurationTab { } } if (!groups.isEmpty()) { - List list = new ArrayList(); - Iterator iterator = groups.iterator(); - while (iterator.hasNext()) { - String id = (String)iterator.next(); + List<LaunchGroupExtension> list = new ArrayList<LaunchGroupExtension>(); + for (String id : groups) { LaunchGroupExtension extension = getLaunchConfigurationManager().getLaunchGroup(id); if (extension != null) { list.add(extension); @@ -716,6 +733,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { * and will be missing for older configurations. * @param config the configuration to update */ + @SuppressWarnings("deprecation") private void updateConfigFromFavorites(ILaunchConfigurationWorkingCopy config) { try { Object[] checked = fFavoritesTable.getCheckedElements(); @@ -723,7 +741,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { boolean run = config.getAttribute(IDebugUIConstants.ATTR_RUN_FAVORITE, false); if (debug || run) { // old attributes - List groups = new ArrayList(); + List<LaunchGroupExtension> groups = new ArrayList<LaunchGroupExtension>(); int num = 0; if (debug) { groups.add(getLaunchConfigurationManager().getLaunchGroup(IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP)); @@ -749,11 +767,11 @@ public class CommonTab extends AbstractLaunchConfigurationTab { } config.setAttribute(IDebugUIConstants.ATTR_DEBUG_FAVORITE, (String)null); config.setAttribute(IDebugUIConstants.ATTR_RUN_FAVORITE, (String)null); - List groups = null; + List<String> groups = null; for (int i = 0; i < checked.length; i++) { LaunchGroupExtension group = (LaunchGroupExtension)checked[i]; if (groups == null) { - groups = new ArrayList(); + groups = new ArrayList<String>(); } groups.add(group.getIdentifier()); } @@ -774,6 +792,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public boolean isValid(ILaunchConfiguration config) { setMessage(null); setErrorMessage(null); @@ -834,6 +853,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy config) { config.setContainer(null); setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, config, true, true); @@ -842,6 +862,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { updateConfigFromLocalShared(configuration); updateConfigFromFavorites(configuration); @@ -881,6 +902,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return LaunchConfigurationsMessages.CommonTab__Common_15; } @@ -890,6 +912,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { * * @since 3.3 */ + @Override public String getId() { return "org.eclipse.debug.ui.commonTab"; //$NON-NLS-1$ } @@ -897,6 +920,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#canSave() */ + @Override public boolean canSave() { return validateLocalShared(); } @@ -904,6 +928,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() */ + @Override public Image getImage() { return DebugUITools.getImage(IInternalDebugUIConstants.IMG_OBJS_COMMON_TAB); } @@ -911,11 +936,13 @@ public class CommonTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void activated(ILaunchConfigurationWorkingCopy workingCopy) {} /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {} /** @@ -923,9 +950,10 @@ public class CommonTab extends AbstractLaunchConfigurationTab { */ class FavoritesContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { ILaunchGroup[] groups = DebugUITools.getLaunchGroups(); - List possibleGroups = new ArrayList(); + List<ILaunchGroup> possibleGroups = new ArrayList<ILaunchGroup>(); ILaunchConfiguration configuration = (ILaunchConfiguration)inputElement; for (int i = 0; i < groups.length; i++) { ILaunchGroup extension = groups[i]; @@ -937,8 +965,10 @@ public class CommonTab extends AbstractLaunchConfigurationTab { return possibleGroups.toArray(); } + @Override public void dispose() {} + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} } @@ -949,10 +979,11 @@ public class CommonTab extends AbstractLaunchConfigurationTab { */ class FavoritesLabelProvider implements ITableLabelProvider { - private Map fImages = new HashMap(); + private Map<Object, Image> fImages = new HashMap<Object, Image>(); + @Override public Image getColumnImage(Object element, int columnIndex) { - Image image = (Image)fImages.get(element); + Image image = fImages.get(element); if (image == null) { ImageDescriptor descriptor = ((LaunchGroupExtension)element).getImageDescriptor(); if (descriptor != null) { @@ -963,23 +994,26 @@ public class CommonTab extends AbstractLaunchConfigurationTab { return image; } + @Override public String getColumnText(Object element, int columnIndex) { String label = ((LaunchGroupExtension)element).getLabel(); return DebugUIPlugin.removeAccelerators(label); } + @Override public void addListener(ILabelProviderListener listener) {} + @Override public void dispose() { - Iterator images = fImages.values().iterator(); - while (images.hasNext()) { - Image image = (Image)images.next(); + for (Image image : fImages.values()) { image.dispose(); } } + @Override public boolean isLabelProperty(Object element, String property) {return false;} + @Override public void removeListener(ILabelProviderListener listener) {} } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugElementWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugElementWorkbenchAdapter.java index fed8d2b4c..6de7015f5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugElementWorkbenchAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugElementWorkbenchAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -31,40 +31,46 @@ import org.eclipse.ui.model.IWorkbenchAdapter2; * {@link IWorkbenchAdapter}. Custom content is currently supported * by a provisional internal viewer framework. */ +@Deprecated public abstract class DebugElementWorkbenchAdapter implements IWorkbenchAdapter, IWorkbenchAdapter2 { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ - public ImageDescriptor getImageDescriptor(Object object) { + @Override + public ImageDescriptor getImageDescriptor(Object object) { return DebugElementHelper.getImageDescriptor(object); } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ - public String getLabel(Object o) { + @Override + public String getLabel(Object o) { return DebugElementHelper.getLabel(o); } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter2#getForeground(java.lang.Object) */ - public RGB getForeground(Object element) { + @Override + public RGB getForeground(Object element) { return DebugElementHelper.getForeground(element); } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter2#getBackground(java.lang.Object) */ - public RGB getBackground(Object element) { + @Override + public RGB getBackground(Object element) { return DebugElementHelper.getBackground(element); } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter2#getFont(java.lang.Object) */ - public FontData getFont(Object element) { + @Override + public FontData getFont(Object element) { return DebugElementHelper.getFont(element); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugPopup.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugPopup.java index 442eb0da2..5d3709a4c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugPopup.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugPopup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.debug.ui; -import com.ibm.icu.text.MessageFormat; - import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -31,6 +29,8 @@ import org.eclipse.ui.handlers.IHandlerActivation; import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.keys.IBindingService; +import com.ibm.icu.text.MessageFormat; + /** * A <code>PopupDialog</code> that is automatically positioned relative * to a specified anchor point. The popup can be dismissed in the same @@ -85,7 +85,8 @@ public abstract class DebugPopup extends PopupDialog { String infoText = null; if (formattedBinding != null) { - infoText = MessageFormat.format(DebugUIViewsMessages.InspectPopupDialog_1, new String[] { formattedBinding, getActionText()}); + infoText = MessageFormat.format(DebugUIViewsMessages.InspectPopupDialog_1, new Object[] { + formattedBinding, getActionText() }); } return infoText; } @@ -138,7 +139,8 @@ public abstract class DebugPopup extends PopupDialog { * (non-Javadoc) * @see org.eclipse.jface.dialogs.PopupDialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ - protected abstract Control createDialogArea(Composite parent); + @Override + protected abstract Control createDialogArea(Composite parent); /** @@ -152,7 +154,8 @@ public abstract class DebugPopup extends PopupDialog { * <code>getInitialSize</code>. * @return the initial location of the shell */ - protected Point getInitialLocation(Point initialSize) { + @Override + protected Point getInitialLocation(Point initialSize) { if (fAnchor == null) { return super.getInitialLocation(initialSize); } @@ -171,7 +174,8 @@ public abstract class DebugPopup extends PopupDialog { * (non-Javadoc) * @see org.eclipse.jface.dialogs.PopupDialog#getDialogSettings() */ - protected IDialogSettings getDialogSettings() { + @Override + protected IDialogSettings getDialogSettings() { IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); return settings; } @@ -180,12 +184,14 @@ public abstract class DebugPopup extends PopupDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.PopupDialog#open() */ - public int open() { + @Override + public int open() { IWorkbench workbench = PlatformUI.getWorkbench(); String commandId = getCommandId(); if (commandId != null) { IHandler fCloseHandler = new AbstractHandler() { - public Object execute(ExecutionEvent event) throws ExecutionException { + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { persist(); close(); return null; @@ -197,8 +203,9 @@ public abstract class DebugPopup extends PopupDialog { } String infoText = getInfoText(); - if (infoText != null) - setInfoText(infoText); + if (infoText != null) { + setInfoText(infoText); + } return super.open(); } @@ -206,9 +213,11 @@ public abstract class DebugPopup extends PopupDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.PopupDialog#close() */ - public boolean close() { - if (fActivation != null) - fHandlerService.deactivateHandler(fActivation); + @Override + public boolean close() { + if (fActivation != null) { + fHandlerService.deactivateHandler(fActivation); + } return super.close(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java index 5c1b10395..ab92b7437 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -286,11 +286,13 @@ public class DebugUITools { IMarker[] markers= new IMarker[breakpoints.length]; int markerCount; for (markerCount= 0; markerCount < breakpoints.length; markerCount++) { - if (!breakpoints[markerCount].isRegistered()) + if (!breakpoints[markerCount].isRegistered()) { break; + } markers[markerCount]= breakpoints[markerCount].getMarker(); - if (markers[markerCount] == null) + if (markers[markerCount] == null) { break; + } } // We only offer undo support if all breakpoints are registered and have associated markers @@ -300,15 +302,18 @@ public class DebugUITools { if (allowUndo) { - for (int i= 0; i < markers.length; i++) + for (int i= 0; i < markers.length; i++) { markers[i].setAttribute(DebugPlugin.ATTR_BREAKPOINT_IS_DELETED, true); + } IAdaptable context= null; if (shell != null) { context= new IAdaptable() { + @Override public Object getAdapter(Class adapter) { - if (adapter == Shell.class) + if (adapter == Shell.class) { return shell; + } return null; } }; @@ -506,6 +511,7 @@ public class DebugUITools { * to specify the launch group that the dialog should be opened on. This method will open * on the launch group with the specified mode and a <code>null</code> category */ + @Deprecated public static int openLaunchConfigurationDialog(Shell shell, IStructuredSelection selection, String mode) { ILaunchGroup[] groups = getLaunchGroups(); for (int i = 0; i < groups.length; i++) { @@ -585,6 +591,7 @@ public class DebugUITools { /** * @see java.lang.Runnable#run() */ + @Override public void run() { LaunchConfigurationsDialog dialog = (LaunchConfigurationsDialog) LaunchConfigurationsDialog.getCurrentlyVisibleLaunchConfigurationDialog(); if (dialog != null) { @@ -711,6 +718,7 @@ public class DebugUITools { * @deprecated Saving has been moved to the launch delegate <code>LaunchConfigurationDelegate</code> to allow for scoped saving * of resources that are only involved in the current launch, no longer the entire workspace */ + @Deprecated public static boolean saveAndBuildBeforeLaunch() { return DebugUIPlugin.saveAndBuild(); } @@ -732,6 +740,7 @@ public class DebugUITools { * @deprecated Saving has been moved to the launch delegate <code>LaunchConfigurationDelegate</code> to allow for scoped saving * of resources that are only involved in the current launch, no longer the entire workspace */ + @Deprecated public static boolean saveBeforeLaunch() { return DebugUIPlugin.preLaunchSave(); } @@ -811,7 +820,7 @@ public class DebugUITools { * * @since 3.3 */ - public static String getLaunchPerspective(ILaunchConfigurationType type, ILaunchDelegate delegate, Set modes) { + public static String getLaunchPerspective(ILaunchConfigurationType type, ILaunchDelegate delegate, Set<String> modes) { return DebugUIPlugin.getDefault().getPerspectiveManager().getLaunchPerspective(type, modes, delegate); } @@ -849,7 +858,7 @@ public class DebugUITools { * * @since 3.3 */ - public static void setLaunchPerspective(ILaunchConfigurationType type, ILaunchDelegate delegate, Set modes, String perspectiveid) { + public static void setLaunchPerspective(ILaunchConfigurationType type, ILaunchDelegate delegate, Set<String> modes, String perspectiveid) { DebugUIPlugin.getDefault().getPerspectiveManager().setLaunchPerspective(type, modes, delegate, perspectiveid); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DeferredDebugElementWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DeferredDebugElementWorkbenchAdapter.java index c3083bf8b..393cdfab6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DeferredDebugElementWorkbenchAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DeferredDebugElementWorkbenchAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -30,6 +30,7 @@ import org.eclipse.ui.progress.IElementCollector; * {@link IDeferredWorkbenchAdapter}. Deferred custom content is currently supported * by a provisional internal viewer framework. */ +@Deprecated public abstract class DeferredDebugElementWorkbenchAdapter extends DebugElementWorkbenchAdapter implements IDeferredWorkbenchAdapter { /** @@ -40,20 +41,23 @@ public abstract class DeferredDebugElementWorkbenchAdapter extends DebugElementW /* (non-Javadoc) * @see org.eclipse.ui.progress.IDeferredWorkbenchAdapter#isContainer() */ - public boolean isContainer() { + @Override + public boolean isContainer() { return true; } /* (non-Javadoc) * @see org.eclipse.ui.progress.IDeferredWorkbenchAdapter#getRule(java.lang.Object) */ - public ISchedulingRule getRule(Object object) { + @Override + public ISchedulingRule getRule(Object object) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.progress.IDeferredWorkbenchAdapter#fetchDeferredChildren(java.lang.Object, org.eclipse.ui.progress.IElementCollector, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void fetchDeferredChildren(Object object, IElementCollector collector, IProgressMonitor monitor) { if (monitor.isCanceled()) { return; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/EnvironmentTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/EnvironmentTab.java index eb748fa2b..6f312f47c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/EnvironmentTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/EnvironmentTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 Keith Seitz and others. + * Copyright (c) 2000, 2013 Keith Seitz and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import org.eclipse.core.runtime.CoreException; @@ -108,12 +109,13 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { * Content provider for the environment table */ protected class EnvironmentVariableContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { EnvironmentVariable[] elements = new EnvironmentVariable[0]; ILaunchConfiguration config = (ILaunchConfiguration) inputElement; - Map m; + Map<String, String> m; try { - m = config.getAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, (Map) null); + m = config.getAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, (Map<String, String>) null); } catch (CoreException e) { DebugUIPlugin.log(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "Error reading configuration", e)); //$NON-NLS-1$ return elements; @@ -123,13 +125,15 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { String[] varNames = new String[m.size()]; m.keySet().toArray(varNames); for (int i = 0; i < m.size(); i++) { - elements[i] = new EnvironmentVariable(varNames[i], (String) m.get(varNames[i])); + elements[i] = new EnvironmentVariable(varNames[i], m.get(varNames[i])); } } return elements; } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput == null){ return; @@ -140,6 +144,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { return; } tableViewer.setComparator(new ViewerComparator() { + @Override public int compare(Viewer iviewer, Object e1, Object e2) { if (e1 == null) { return -1; @@ -158,6 +163,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { * Label provider for the environment table */ public class EnvironmentVariableLabelProvider extends LabelProvider implements ITableLabelProvider { + @Override public String getColumnText(Object element, int columnIndex) { String result = null; if (element != null) { @@ -169,10 +175,13 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { case 1: // value result = var.getValue(); break; + default: + break; } } return result; } + @Override public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) { return DebugPluginImages.getImage(IDebugUIConstants.IMG_OBJS_ENV_VAR); @@ -191,6 +200,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { // Create main composite Composite mainComposite = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL); @@ -214,6 +224,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { Composite comp = SWTFactory.createComposite(parent, 1, 2, GridData.FILL_HORIZONTAL); appendEnvironment= createRadioButton(comp, LaunchConfigurationsMessages.EnvironmentTab_16); appendEnvironment.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } @@ -254,11 +265,13 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { environmentTable.setLabelProvider(new EnvironmentVariableLabelProvider()); environmentTable.setColumnProperties(new String[] {P_VARIABLE, P_VALUE}); environmentTable.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleTableSelectionChanged(event); } }); environmentTable.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { if (!environmentTable.getSelection().isEmpty()) { handleEnvEditButtonSelected(); @@ -273,6 +286,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { final Table tref = table; final Composite comp = tableComposite; tableComposite.addControlListener(new ControlAdapter() { + @Override public void controlResized(ControlEvent e) { Rectangle area = comp.getClientArea(); Point size = tref.computeSize(SWT.DEFAULT, SWT.DEFAULT); @@ -317,18 +331,21 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { // Create buttons envAddButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_New_4, null); envAddButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { handleEnvAddButtonSelected(); } }); envSelectButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_18, null); envSelectButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { handleEnvSelectButtonSelected(); } }); envEditButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_Edit_5, null); envEditButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { handleEnvEditButtonSelected(); } @@ -336,6 +353,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { envEditButton.setEnabled(false); envRemoveButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_Remove_6, null); envRemoveButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { handleEnvRemoveButtonSelected(); } @@ -377,7 +395,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { for (int i = 0; i < items.length; i++) { EnvironmentVariable existingVariable = (EnvironmentVariable) items[i].getData(); if (existingVariable.getName().equals(name)) { - boolean overWrite= MessageDialog.openQuestion(getShell(), LaunchConfigurationsMessages.EnvironmentTab_12, MessageFormat.format(LaunchConfigurationsMessages.EnvironmentTab_13, new String[] {name})); // + boolean overWrite = MessageDialog.openQuestion(getShell(), LaunchConfigurationsMessages.EnvironmentTab_12, MessageFormat.format(LaunchConfigurationsMessages.EnvironmentTab_13, new Object[] { name })); // if (!overWrite) { return false; } @@ -396,7 +414,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { */ private void handleEnvSelectButtonSelected() { //get Environment Variables from the OS - Map envVariables = getNativeEnvironment(); + Map<String, EnvironmentVariable> envVariables = getNativeEnvironment(); //get Environment Variables from the table TableItem[] items = environmentTable.getTable().getItems(); @@ -424,13 +442,11 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { * Gets native environment variable from the LaunchManager. Creates EnvironmentVariable objects. * @return Map of name - EnvironmentVariable pairs based on native environment. */ - private Map getNativeEnvironment() { - Map stringVars = DebugPlugin.getDefault().getLaunchManager().getNativeEnvironmentCasePreserved(); - HashMap vars = new HashMap(); - for (Iterator i = stringVars.keySet().iterator(); i.hasNext(); ) { - String key = (String) i.next(); - String value = (String) stringVars.get(key); - vars.put(key, new EnvironmentVariable(key, value)); + private Map<String, EnvironmentVariable> getNativeEnvironment() { + Map<String, String> stringVars = DebugPlugin.getDefault().getLaunchManager().getNativeEnvironmentCasePreserved(); + HashMap<String, EnvironmentVariable> vars = new HashMap<String, EnvironmentVariable>(); + for (Entry<String, String> entry : stringVars.entrySet()) { + vars.put(entry.getKey(), new EnvironmentVariable(entry.getKey(), entry.getValue())); } return vars; } @@ -476,12 +492,15 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { */ private void handleEnvRemoveButtonSelected() { IStructuredSelection sel = (IStructuredSelection) environmentTable.getSelection(); - environmentTable.getControl().setRedraw(false); - for (Iterator i = sel.iterator(); i.hasNext(); ) { - EnvironmentVariable var = (EnvironmentVariable) i.next(); - environmentTable.remove(var); + try { + environmentTable.getControl().setRedraw(false); + for (Iterator<?> i = sel.iterator(); i.hasNext();) { + EnvironmentVariable var = (EnvironmentVariable) i.next(); + environmentTable.remove(var); + } + } finally { + environmentTable.getControl().setRedraw(true); } - environmentTable.getControl().setRedraw(true); updateAppendReplace(); updateLaunchConfigurationDialog(); } @@ -497,6 +516,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { configuration.removeAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES); } @@ -504,6 +524,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { boolean append= true; try { @@ -526,18 +547,18 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { * Stores the environment in the given configuration * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { // Convert the table's items into a Map so that this can be saved in the // configuration's attributes. TableItem[] items = environmentTable.getTable().getItems(); - Map map = new HashMap(items.length); - for (int i = 0; i < items.length; i++) - { + Map<String, String> map = new HashMap<String, String>(items.length); + for (int i = 0; i < items.length; i++) { EnvironmentVariable var = (EnvironmentVariable) items[i].getData(); map.put(var.getName(), var.getValue()); } if (map.size() == 0) { - configuration.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, (Map) null); + configuration.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, (Map<String, String>) null); } else { configuration.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, map); } @@ -566,6 +587,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return LaunchConfigurationsMessages.EnvironmentTab_Environment_7; } @@ -575,6 +597,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { * * @since 3.3 */ + @Override public String getId() { return "org.eclipse.debug.ui.environmentTab"; //$NON-NLS-1$ } @@ -582,6 +605,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() */ + @Override public Image getImage() { return DebugPluginImages.getImage(IDebugUIConstants.IMG_OBJS_ENVIRONMENT); } @@ -589,6 +613,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void activated(ILaunchConfigurationWorkingCopy workingCopy) { // do nothing when activated } @@ -596,6 +621,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) { // do nothing when deactivated } @@ -617,6 +643,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getDialogSettingsId() */ + @Override protected String getDialogSettingsId() { return IDebugUIConstants.PLUGIN_ID + ".ENVIRONMENT_TAB.NATIVE_ENVIROMENT_DIALOG"; //$NON-NLS-1$ } @@ -624,6 +651,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getHelpContextId() */ + @Override protected String getHelpContextId() { return IDebugHelpContextIds.SELECT_NATIVE_ENVIRONMENT_DIALOG; } @@ -631,6 +659,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerInput() */ + @Override protected Object getViewerInput() { return fInput; } @@ -638,6 +667,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getViewerLabel() */ + @Override protected String getViewerLabel() { return LaunchConfigurationsMessages.EnvironmentTab_19; } @@ -645,22 +675,30 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getLabelProvider() */ + @Override protected IBaseLabelProvider getLabelProvider() { return new ILabelProvider() { + @Override public Image getImage(Object element) { return DebugPluginImages.getImage(IDebugUIConstants.IMG_OBJS_ENVIRONMENT); } + @Override public String getText(Object element) { EnvironmentVariable var = (EnvironmentVariable) element; - return MessageFormat.format(LaunchConfigurationsMessages.EnvironmentTab_7, new String[] {var.getName(), var.getValue()}); + return MessageFormat.format(LaunchConfigurationsMessages.EnvironmentTab_7, new Object[] { + var.getName(), var.getValue() }); } + @Override public void addListener(ILabelProviderListener listener) { } + @Override public void dispose() { } + @Override public boolean isLabelProperty(Object element, String property) { return false; } + @Override public void removeListener(ILabelProviderListener listener) { } }; @@ -669,31 +707,36 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#getContentProvider() */ + @Override protected IContentProvider getContentProvider() { return new IStructuredContentProvider() { + @Override public Object[] getElements(Object inputElement) { EnvironmentVariable[] elements = null; if (inputElement instanceof HashMap) { - Comparator comparator = new Comparator() { + Comparator<Object> comparator = new Comparator<Object>() { + @Override public int compare(Object o1, Object o2) { - String s1 = (String)o1; - String s2 = (String)o2; + String s1 = (String) o1; + String s2 = (String) o2; return s1.compareTo(s2); } }; - TreeMap envVars = new TreeMap(comparator); - envVars.putAll((Map)inputElement); + TreeMap<Object, Object> envVars = new TreeMap<Object, Object>(comparator); + envVars.putAll((Map<?, ?>) inputElement); elements = new EnvironmentVariable[envVars.size()]; int index = 0; - for (Iterator iterator = envVars.keySet().iterator(); iterator.hasNext(); index++) { + for (Iterator<Object> iterator = envVars.keySet().iterator(); iterator.hasNext(); index++) { Object key = iterator.next(); elements[index] = (EnvironmentVariable) envVars.get(key); } } return elements; } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } }; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugModelPresentation.java index cdcbc3c5f..3477185c4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugModelPresentation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugModelPresentation.java @@ -111,6 +111,7 @@ public interface IDebugModelPresentation extends ILabelProvider, ISourcePresenta * image should be used * @see ILabelProvider */ + @Override public Image getImage(Object element); /** * Returns a label for the element, or <code>null</code> if a default @@ -121,6 +122,7 @@ public interface IDebugModelPresentation extends ILabelProvider, ISourcePresenta * label should be used * @see ILabelProvider */ + @Override public String getText(Object element); /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java index 6dff487e1..59913787e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java @@ -194,6 +194,7 @@ public interface IDebugUIConstants { * @since 2.0 * @deprecated no longer used */ + @Deprecated public static final String PREF_SHOW_TYPE_NAMES = PLUGIN_ID + ".show_type_names"; //$NON-NLS-1$ /** @@ -204,6 +205,7 @@ public interface IDebugUIConstants { * @since 2.0 * @deprecated no longer used */ + @Deprecated public static final String PREF_SHOW_DETAIL_PANE = PLUGIN_ID + ".show_detail_pane"; //$NON-NLS-1$ /** @@ -289,6 +291,7 @@ public interface IDebugUIConstants { * @deprecated Use org.eclipse.ui.console.IConsoleConstants.ID_CONSOLE_VIEW * @since 3.0 */ + @Deprecated public static final String ID_CONSOLE_VIEW= "org.eclipse.debug.ui.ConsoleView"; //$NON-NLS-1$ // Console stream identifiers @@ -337,6 +340,7 @@ public interface IDebugUIConstants { /** Clear action image identifier. * @deprecated use the platform shared image for clear - {@link ISharedImages#IMG_ETOOL_CLEAR}*/ + @Deprecated public static final String IMG_LCL_CLEAR= "IMG_LCL_CLEAR"; //$NON-NLS-1$ /** Display variable type names action image identifier. */ @@ -854,6 +858,7 @@ public interface IDebugUIConstants { * @deprecated Since 3.0, this launch configuration attribute is no longer supported. * Use <code>DebugUITools.setLaunchPerspective(ILaunchConfigurationType type, String mode, String perspective)</code>. */ + @Deprecated public static final String ATTR_TARGET_RUN_PERSPECTIVE = PLUGIN_ID + ".target_run_perspective"; //$NON-NLS-1$ /** @@ -867,6 +872,7 @@ public interface IDebugUIConstants { * @deprecated Since 3.0, this launch configuration attribute is no longer supported. * Use <code>DebugUITools.setLaunchPerspective(ILaunchConfigurationType type, String mode, String perspective)</code>. */ + @Deprecated public static final String ATTR_TARGET_DEBUG_PERSPECTIVE = PLUGIN_ID + ".target_debug_perspective"; //$NON-NLS-1$ /** @@ -896,6 +902,7 @@ public interface IDebugUIConstants { * @since 2.0 * @deprecated use <code>ATTR_FAVORITE_GROUPS</code> instead */ + @Deprecated public static final String ATTR_DEBUG_FAVORITE = PLUGIN_ID + ".debugFavorite"; //$NON-NLS-1$ /** @@ -906,6 +913,7 @@ public interface IDebugUIConstants { * @since 2.0 * @deprecated use <code>ATTR_FAVORITE_GROUPS</code> instead */ + @Deprecated public static final String ATTR_RUN_FAVORITE = PLUGIN_ID + ".runFavorite"; //$NON-NLS-1$ /** @@ -941,6 +949,7 @@ public interface IDebugUIConstants { * @since 3.1 * @deprecated in 3.3 Please use DebugPlugin.ATTR_CONSOLE_ENCODING instead. */ + @Deprecated public static final String ATTR_CONSOLE_ENCODING = DebugPlugin.ATTR_CONSOLE_ENCODING; /** @@ -986,6 +995,7 @@ public interface IDebugUIConstants { * @deprecated The Debug Action Groups extension point no longer exists. Product * vendors should use Activities instead. */ + @Deprecated public static final String EXTENSION_POINT_DEBUG_ACTION_GROUPS= "debugActionGroups"; //$NON-NLS-1$ /** @@ -1074,7 +1084,8 @@ public interface IDebugUIConstants { * @since 3.1 * @deprecated As of release 3.4, replaced by {@link #EXTENSION_POINT_MEMORY_RENDERINGS} */ - public static final String EXTENSION_POINT_MEMORY_RENDERIGNS = "memoryRenderings"; //$NON-NLS-1$ + @Deprecated + public static final String EXTENSION_POINT_MEMORY_RENDERIGNS = "memoryRenderings"; //$NON-NLS-1$ /** * Memory renderings extension point identifier (value diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugView.java index da04b4d78..d6e6b6b45 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -173,5 +173,6 @@ public interface IDebugView extends IViewPart { * @return the context menu manager for this view, or <code>null</code> if none * @deprecated See AbstractDebugView#getContextMenuManagers() */ + @Deprecated public IMenuManager getContextMenuManager(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDetailPaneFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDetailPaneFactory.java index 2dbfdfbdd..c92e41e32 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDetailPaneFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDetailPaneFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -45,7 +45,7 @@ public interface IDetailPaneFactory { * @param selection The current selection * @return Set of String IDs for possible detail pane types, possibly empty */ - public Set getDetailPaneTypes(IStructuredSelection selection); + public Set<String> getDetailPaneTypes(IStructuredSelection selection); /** * Returns the identifier of the default detail pane type to use for the given diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationDialog.java index e279452ee..8505b0344 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,6 +35,7 @@ public interface ILaunchConfigurationDialog extends IRunnableContext { * @deprecated the launch dialog no longer supports launching without * opening - this constant will never be returned by the dialog */ + @Deprecated public static final int LAUNCHED_BEFORE_OPENING = 2; /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationTab.java index e7256f5bc..e13d55995 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -201,6 +201,7 @@ public interface ILaunchConfigurationTab { * than the launch dialog, this method cannot be relied upon for launching * functionality. */ + @Deprecated public void launched(ILaunch launch); /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationTabGroup.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationTabGroup.java index 1f4f117a2..340629abe 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationTabGroup.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchConfigurationTabGroup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -153,6 +153,7 @@ public interface ILaunchConfigurationTabGroup { * than the launch dialog, this method cannot be relied upon for launching * functionality. */ + @Deprecated public void launched(ILaunch launch); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/InspectPopupDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/InspectPopupDialog.java index c0c71c341..0531e322f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/InspectPopupDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/InspectPopupDialog.java @@ -94,7 +94,8 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.ui.DebugPopup#createDialogArea(org.eclipse.swt.widgets.Composite) */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Composite composite = new Composite(parent, parent.getStyle()); GridLayout layout = new GridLayout(); composite.setLayout(layout); @@ -125,10 +126,12 @@ public class InspectPopupDialog extends DebugPopup { fTree = fViewer.getTree(); fTree.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { fDetailPane.display((IStructuredSelection)fViewer.getSelection()); } - public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetDefaultSelected(SelectionEvent e) {} }); initSashWeights(); @@ -147,12 +150,16 @@ public class InspectPopupDialog extends DebugPopup { TreeRoot treeRoot = new TreeRoot(); // add update listener to auto-select and display details of root expression fViewer.addViewerUpdateListener(new IViewerUpdateListener() { + @Override public void viewerUpdatesComplete() { } + @Override public void viewerUpdatesBegin() { } + @Override public void updateStarted(IViewerUpdate update) { } + @Override public void updateComplete(IViewerUpdate update) { if (update instanceof IChildrenUpdate) { TreeSelection selection = new TreeSelection(new TreePath(new Object[]{fExpression})); @@ -191,7 +198,8 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.PopupDialog#saveDialogBounds(org.eclipse.swt.widgets.Shell) */ - protected void saveDialogBounds(Shell shell) { + @Override + protected void saveDialogBounds(Shell shell) { super.saveDialogBounds(shell); if (fSashForm != null && !fSashForm.isDisposed()){ int[] weights = fSashForm.getWeights(); @@ -219,12 +227,14 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return 1; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ + @Override protected Object[] getChildren(Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor) throws CoreException { return new Object[] { fExpression }; } @@ -232,6 +242,7 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.elements.ElementContentProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId(String id) { return true; } @@ -261,7 +272,8 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.ui.DebugPopup#close() */ - public boolean close() { + @Override + public boolean close() { if (!wasPersisted()) { fExpression.dispose(); } @@ -273,14 +285,16 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.ui.DebugPopup#getActionText() */ - protected String getActionText() { + @Override + protected String getActionText() { return DebugUIViewsMessages.InspectPopupDialog_0; } /* (non-Javadoc) * @see org.eclipse.debug.ui.DebugPopup#persist() */ - protected void persist() { + @Override + protected void persist() { super.persist(); DebugPlugin.getDefault().getExpressionManager().addExpression(fExpression); @@ -300,7 +314,8 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.PopupDialog#getInitialSize() */ - protected Point getInitialSize() { + @Override + protected Point getInitialSize() { Point initialSize = super.getInitialSize(); initialSize.x = Math.max(initialSize.x, MIN_WIDTH); initialSize.y = Math.max(initialSize.y, MIN_HEIGHT); @@ -310,8 +325,9 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.PopupDialog#getBackgroundColorExclusions() */ - protected List getBackgroundColorExclusions() { - List list = super.getBackgroundColorExclusions(); + @Override + protected List<Control> getBackgroundColorExclusions() { + List<Control> list = super.getBackgroundColorExclusions(); list.add(fSashForm); return list; } @@ -325,6 +341,7 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getCurrentPaneID() */ + @Override public String getCurrentPaneID() { return fDetailPane.getCurrentPaneID(); } @@ -332,6 +349,7 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getCurrentSelection() */ + @Override public IStructuredSelection getCurrentSelection() { return (IStructuredSelection)fViewer.getSelection(); } @@ -339,6 +357,7 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#refreshDetailPaneContents() */ + @Override public void refreshDetailPaneContents() { fDetailPane.display(getCurrentSelection()); } @@ -346,6 +365,7 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getParentComposite() */ + @Override public Composite getParentComposite() { return fDetailPaneComposite; } @@ -353,6 +373,7 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getWorkbenchPartSite() */ + @Override public IWorkbenchPartSite getWorkbenchPartSite() { return null; } @@ -360,6 +381,7 @@ public class InspectPopupDialog extends DebugPopup { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#paneChanged(java.lang.String) */ + @Override public void paneChanged(String newPaneID) { if (newPaneID.equals(DefaultDetailPane.ID)){ Display display = getShell().getDisplay(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java index a816dc8f2..3f7c9bff8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java @@ -99,6 +99,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { /** * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite mainComposite = new Composite(parent, SWT.NONE); setControl(mainComposite); @@ -112,6 +113,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { fRefreshButton = createCheckButton(mainComposite, StringSubstitutionMessages.RefreshTab_31); fRefreshButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateEnabledState(); updateLaunchConfigurationDialog(); @@ -129,6 +131,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { fGroup.setLayoutData(gd); SelectionAdapter adapter = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (((Button)e.getSource()).getSelection()) { updateEnabledState(); @@ -171,6 +174,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { gd = (GridData)fSelectButton.getLayoutData(); gd.horizontalAlignment = GridData.HORIZONTAL_ALIGN_END; fSelectButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { selectResources(); } @@ -212,6 +216,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { data.horizontalSpan = 2; fRecursiveButton.setLayoutData(data); fRecursiveButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } @@ -221,12 +226,14 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { /** * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { } /** * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { updateRefresh(configuration); updateRecursive(configuration); @@ -307,6 +314,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { /** * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { if (fRefreshButton.getSelection()) { String scope = generateScopeMemento(); @@ -347,6 +355,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { /** * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return StringSubstitutionMessages.RefreshTab_6; } @@ -372,10 +381,12 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { /** * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() */ + @Override public Image getImage() { return DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_OBJS_REFRESH_TAB); } + @Override public boolean isValid(ILaunchConfiguration launchConfig) { setErrorMessage(null); setMessage(null); @@ -477,6 +488,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void activated(ILaunchConfigurationWorkingCopy workingCopy) { // do nothing on activation } @@ -484,6 +496,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) { // do nothing on deactivation } @@ -493,6 +506,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { * * @since 3.5 */ + @Override public String getId() { return "org.eclipse.debug.ui.refreshTab"; //$NON-NLS-1$ } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java index 1065f1769..6cb8e7aab 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java @@ -22,10 +22,10 @@ import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; import org.eclipse.debug.internal.ui.SWTFactory; import org.eclipse.debug.internal.ui.preferences.StringVariablePreferencePage; -import org.eclipse.debug.ui.stringsubstitution.IArgumentSelector; import org.eclipse.debug.internal.ui.stringsubstitution.StringSubstitutionMessages; import org.eclipse.debug.internal.ui.stringsubstitution.StringVariableLabelProvider; import org.eclipse.debug.internal.ui.stringsubstitution.StringVariablePresentationManager; +import org.eclipse.debug.ui.stringsubstitution.IArgumentSelector; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.preference.IPreferenceNode; import org.eclipse.jface.preference.PreferenceDialog; @@ -87,7 +87,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { } //no filtering by default - private ArrayList fFilters = new ArrayList(); + private ArrayList<VariableFilter> fFilters = new ArrayList<VariableFilter>(); //when filtering is on, do not show all by default private boolean fShowAllSelected = false; @@ -160,9 +160,11 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { private void updateElements() { final Display display = DebugUIPlugin.getStandardDisplay(); BusyIndicator.showWhile(display, new Runnable() { + @Override public void run() { final IStringVariable[] elements = VariablesPlugin.getDefault().getStringVariableManager().getVariables(); display.asyncExec(new Runnable() { + @Override public void run() { setListElements(elements); } @@ -181,15 +183,16 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { } } + @Override protected void setListElements(Object[] elements) { - ArrayList filtered = new ArrayList(); + ArrayList<Object> filtered = new ArrayList<Object>(); filtered.addAll(Arrays.asList(elements)); if(!fFilters.isEmpty() && !fShowAllSelected) { for (int i = 0; i < elements.length; i++) { if(elements[i] instanceof IDynamicVariable) { boolean bFiltered = false; for (int j = 0; (j < fFilters.size()) && !bFiltered; j++) { - VariableFilter filter = (VariableFilter)fFilters.get(j); + VariableFilter filter = fFilters.get(j); if(filter.isFiltered((IDynamicVariable)elements[i])) { filtered.remove(elements[i]); bFiltered = true; @@ -204,6 +207,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Control ctrl = super.createContents(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(ctrl, IDebugHelpContextIds.VARIABLE_SELECTION_DIALOG); @@ -213,6 +217,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Control control = super.createDialogArea(parent); createArgumentArea((Composite)control); @@ -235,7 +240,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { for (int i = 0;(i < elements.length) && !bNeedShowAll; i++) { if(elements[i] instanceof IDynamicVariable) { for (int j = 0; (j < fFilters.size()) && !bNeedShowAll; j++) { - VariableFilter filter = (VariableFilter)fFilters.get(j); + VariableFilter filter = fFilters.get(j); if(filter.isFiltered((IDynamicVariable)elements[i])) { bNeedShowAll = true; } @@ -248,6 +253,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { updateDescription(); fShowAllButton = SWTFactory.createCheckButton(btnContainer, StringSubstitutionMessages.StringVariableSelectionDialog_9, null, fShowAllSelected, 1); fShowAllButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fShowAllSelected = fShowAllButton.getSelection(); updateDescription(); @@ -262,6 +268,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { Button editButton = SWTFactory.createPushButton(btnContainer, StringSubstitutionMessages.StringVariableSelectionDialog_0, null, GridData.HORIZONTAL_ALIGN_END); editButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { editVariables(); } @@ -277,6 +284,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { fArgumentButton = SWTFactory.createPushButton(args, StringSubstitutionMessages.StringVariableSelectionDialog_7, null); fArgumentButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { configureArgument(); } @@ -299,12 +307,14 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { protected void editVariables() { final Display display = DebugUIPlugin.getStandardDisplay(); BusyIndicator.showWhile(display, new Runnable() { + @Override public void run() { // show the preference page in a new dialog rather than using the utility method to re-use a // preference page, in case this dialog is being opened from a preference page if (showVariablesPage()) { final IStringVariable[] elements = VariablesPlugin.getDefault().getStringVariableManager().getVariables(); display.asyncExec(new Runnable() { + @Override public void run() { setListElements(elements); } @@ -328,6 +338,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { final PreferenceDialog dialog = new PreferenceDialog(DebugUIPlugin.getShell(), manager); final boolean [] result = new boolean[] { false }; BusyIndicator.showWhile(DebugUIPlugin.getStandardDisplay(), new Runnable() { + @Override public void run() { dialog.create(); dialog.setMessage(targetNode.getLabelText()); @@ -355,6 +366,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { * * @see org.eclipse.ui.dialogs.AbstractElementListSelectionDialog#handleSelectionChanged() */ + @Override protected void handleSelectionChanged() { super.handleSelectionChanged(); Object[] objects = getSelectedElements(); @@ -381,6 +393,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { fArgumentValue = fArgumentText.getText().trim(); super.okPressed(); @@ -398,7 +411,8 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() */ - protected IDialogSettings getDialogBoundsSettings() { + @Override + protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsSectionName()); if (section == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/WorkingDirectoryBlock.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/WorkingDirectoryBlock.java index 7eb6c942d..6ec72b8de 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/WorkingDirectoryBlock.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/WorkingDirectoryBlock.java @@ -74,9 +74,11 @@ public abstract class WorkingDirectoryBlock extends AbstractLaunchConfigurationT * A listener to update for text changes and widget selection */ private class WidgetListener extends SelectionAdapter implements ModifyListener { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); } + @Override public void widgetSelected(SelectionEvent e) { Object source= e.getSource(); if (source == fWorkspaceButton) { @@ -142,6 +144,7 @@ public abstract class WorkingDirectoryBlock extends AbstractLaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public final void createControl(Composite parent) { Font font = parent.getFont(); Group group = SWTFactory.createGroup(parent, DebugUIMessages.WorkingDirectoryBlock_12, 2, 1, GridData.FILL_HORIZONTAL); @@ -315,6 +318,7 @@ public abstract class WorkingDirectoryBlock extends AbstractLaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public boolean isValid(ILaunchConfiguration config) { setErrorMessage(null); setMessage(null); @@ -353,6 +357,7 @@ public abstract class WorkingDirectoryBlock extends AbstractLaunchConfigurationT * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy config) { config.setAttribute(workingDirectoryAttribteName, (String)null); } @@ -360,6 +365,7 @@ public abstract class WorkingDirectoryBlock extends AbstractLaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { setLaunchConfiguration(configuration); try { @@ -377,6 +383,7 @@ public abstract class WorkingDirectoryBlock extends AbstractLaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { if(fUseDefaultDirButton.getSelection()) { configuration.setAttribute(workingDirectoryAttribteName, (String)null); @@ -389,6 +396,7 @@ public abstract class WorkingDirectoryBlock extends AbstractLaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return DebugUIMessages.WorkingDirectoryBlock_Working_Directory_8; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java index ae21582b3..4ec985181 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -106,9 +106,11 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I * @since 3.3 */ private ILaunchLabelChangedListener fLabelListener = new ILaunchLabelChangedListener() { + @Override public ILaunchGroup getLaunchGroup() { return fLaunchGroup; } + @Override public void labelChanged() { updateTooltip(); } @@ -215,7 +217,8 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I } else { label= ActionMessages.AbstractLaunchHistoryAction_4; } - return MessageFormat.format(ActionMessages.AbstractLaunchHistoryAction_0, new String[] {label, launchName}); + return MessageFormat.format(ActionMessages.AbstractLaunchHistoryAction_0, new Object[] { + label, launchName }); } /** @@ -225,7 +228,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I * @return the string for the tool tip */ private String getToolTip() { - String launchName = getLaunchingResourceManager().getLaunchLabel(fLaunchGroup); + String launchName = DebugUIPlugin.getDefault().getLaunchingResourceManager().getLaunchLabel(fLaunchGroup); if(launchName == null) { return DebugUIPlugin.removeAccelerators(internalGetHistory().getLaunchGroup().getLabel()); } @@ -241,16 +244,18 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I label = ActionMessages.AbstractLaunchHistoryAction_4; } if(IInternalDebugCoreConstants.EMPTY_STRING.equals(launchName)) { - return MessageFormat.format(ActionMessages.AbstractLaunchHistoryAction_5, new String[] {label}); + return MessageFormat.format(ActionMessages.AbstractLaunchHistoryAction_5, new Object[] { label }); } else { - return MessageFormat.format(ActionMessages.AbstractLaunchHistoryAction_0, new String[] {label, launchName}); + return MessageFormat.format(ActionMessages.AbstractLaunchHistoryAction_0, new Object[] { + label, launchName }); } } /** * @see ILaunchHistoryChangedListener#launchHistoryChanged() */ + @Override public void launchHistoryChanged() { fRecreateMenu = true; } @@ -258,10 +263,11 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I /** * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { setMenu(null); getLaunchConfigurationManager().removeLaunchHistoryListener(this); - getLaunchingResourceManager().removeLaunchLabelChangedListener(fLabelListener); + DebugUIPlugin.getDefault().getLaunchingResourceManager().removeLaunchLabelChangedListener(fLabelListener); } /** @@ -277,6 +283,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I /** * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate#getMenu(org.eclipse.swt.widgets.Control) */ + @Override public Menu getMenu(Control parent) { setMenu(new Menu(parent)); fillMenu(fMenu); @@ -287,6 +294,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate2#getMenu(org.eclipse.swt.widgets.Menu) */ + @Override public Menu getMenu(Menu parent) { setMenu(new Menu(parent)); fillMenu(fMenu); @@ -301,6 +309,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I // Add listener to re-populate the menu each time // it is shown because of dynamic history list fMenu.addMenuListener(new MenuAdapter() { + @Override public void menuShown(MenuEvent e) { if (fRecreateMenu) { Menu m = (Menu)e.widget; @@ -378,6 +387,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I /** * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { // do nothing - this is just a menu } @@ -386,6 +396,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) * @since 3.6 */ + @Override public void runWithEvent(IAction action, Event event) { if(((event.stateMask & SWT.MOD1) > 0) && (event.type != SWT.KeyDown)) { ILaunchConfiguration configuration = null; @@ -395,7 +406,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I } else { configuration = getLaunchConfigurationManager().getFilteredLastLaunch(groupid); } - ArrayList configs = new ArrayList(1); + ArrayList<ILaunchConfiguration> configs = new ArrayList<ILaunchConfiguration>(1); if (configuration != null){ configs.add(configuration); } @@ -418,21 +429,16 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I private ILaunchConfiguration resolveContextConfiguration() { SelectedResourceManager srm = SelectedResourceManager.getDefault(); IStructuredSelection selection = srm.getCurrentSelection(); - List shortcuts = null; + List<LaunchShortcutExtension> shortcuts = null; IResource resource = srm.getSelectedResource(); - shortcuts = getLaunchingResourceManager().getShortcutsForSelection( - selection, - getMode()); + LaunchingResourceManager lrm = DebugUIPlugin.getDefault().getLaunchingResourceManager(); + shortcuts = lrm.getShortcutsForSelection(selection, getMode()); if(resource == null) { - resource = getLaunchingResourceManager().getLaunchableResource(shortcuts, selection); + resource = lrm.getLaunchableResource(shortcuts, selection); } - List configs = getLaunchingResourceManager().getParticipatingLaunchConfigurations( - selection, - resource, - shortcuts, - getMode()); + List<ILaunchConfiguration> configs = lrm.getParticipatingLaunchConfigurations(selection, resource, shortcuts, getMode()); if(configs.size() == 1) { - return (ILaunchConfiguration) configs.get(0); + return configs.get(0); } else if(configs.size() > 1) { // launch most recently launched config ILaunchConfiguration config = getLaunchConfigurationManager().getMRUConfiguration(configs, fLaunchGroup, resource); @@ -455,7 +461,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I } return null; } else if(shortcuts.size() == 1) { - LaunchShortcutExtension ext = (LaunchShortcutExtension) shortcuts.get(0); + LaunchShortcutExtension ext = shortcuts.get(0); return createConfigurationFromTypes(ext.getAssociatedConfigurationTypes()); } return getLaunchConfigurationManager().getFilteredLastLaunch(getLaunchGroupIdentifier()); @@ -467,7 +473,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I * @return a new {@link ILaunchConfiguration} * @since 3.6 */ - private ILaunchConfiguration createConfigurationFromTypes(Set types) { + private ILaunchConfiguration createConfigurationFromTypes(Set<String> types) { //context launching always takes the first type, so we do that here as well if(types != null && types.size() > 0) { try { @@ -486,6 +492,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) * @since 3.6 */ + @Override public void init(IAction action) { // do nothing by default } @@ -493,6 +500,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I /** * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection){ if (fAction == null) { initialize(action); @@ -502,9 +510,10 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I /** * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { if (this instanceof AbstractLaunchToolbarAction) { - getLaunchingResourceManager().addLaunchLabelUpdateListener(fLabelListener); + DebugUIPlugin.getDefault().getLaunchingResourceManager().addLaunchLabelUpdateListener(fLabelListener); } } @@ -516,6 +525,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I * for clients of the debug platform. Instead, use <code>getHistory()</code>, * <code>getFavorites()</code>, and <code>getLastLaunch()</code>. */ + @Deprecated protected LaunchHistory getLaunchHistory() { return getLaunchConfigurationManager().getLaunchHistory(getLaunchGroupIdentifier()); } @@ -577,15 +587,6 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I } /** - * Returns the <code>ContextualLaunchingResourceManager</code> - * - * @return <code>ContextualLaunchingResourceManager</code> - */ - private LaunchingResourceManager getLaunchingResourceManager() { - return DebugUIPlugin.getDefault().getLaunchingResourceManager(); - } - - /** * Returns the identifier of the launch group this action is associated * with. * diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java index 78a5a0508..aed6e70ae 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java @@ -49,6 +49,7 @@ public class AbstractLaunchToolbarAction extends AbstractLaunchHistoryAction { * * @param menu the menu to fill */ + @Override protected void fillMenu(Menu menu) { super.fillMenu(menu); // Separator between history and common actions @@ -74,6 +75,7 @@ public class AbstractLaunchToolbarAction extends AbstractLaunchHistoryAction { * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { //always ignore external tools during context launching if(LaunchingResourceManager.isContextLaunchEnabled(getLaunchGroupIdentifier())) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java index a8a447d3b..bd3ef6b95 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java @@ -81,6 +81,7 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct fRenderingType = renderingType; } + @Override public void runWithEvent(Event event) { if (fActionDelegate != null) { @@ -96,17 +97,21 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct private class AddMemoryRenderingMenuCreator implements IMenuCreator { + @Override public void dispose() { } + @Override public Menu getMenu(Control parent) { return null; } + @Override public Menu getMenu(Menu parent) { Menu menu = new Menu(parent); menu.addMenuListener(new MenuAdapter() { + @Override public void menuShown(MenuEvent e) { Menu m = (Menu)e.widget; MenuItem[] items = m.getItems(); @@ -145,6 +150,7 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct updateAction(fAction, fCurrentSelection); } + @Override public void debugContextChanged(DebugContextEvent event) { contextActivated(event.getContext()); } @@ -202,6 +208,7 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { bindPart(view); } @@ -209,6 +216,7 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { // do nothing } @@ -216,6 +224,7 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { fCurrentSelection = selection; @@ -271,6 +280,7 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) */ + @Override public void setActiveEditor(IAction action, IEditorPart targetEditor) { bindPart(targetEditor); @@ -283,6 +293,7 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { bindPart(targetPart); @@ -295,6 +306,7 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { if (action != null) { bindAction(action); @@ -309,6 +321,7 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { // remove as debug context listener fAction = null; @@ -323,6 +336,7 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { // do nothing } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/BreakpointTypesContribution.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/BreakpointTypesContribution.java index b744b40d4..b11185ad2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/BreakpointTypesContribution.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/BreakpointTypesContribution.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Wind River Systems and others. + * Copyright (c) 2012, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,11 +7,11 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.ui.actions; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -68,15 +68,17 @@ import org.eclipse.ui.services.IServiceLocator; public class BreakpointTypesContribution extends CompoundContributionItem implements IWorkbenchContribution { private class SelectTargetAction extends Action { - private final Set fPossibleIDs; + private final Set<String> fPossibleIDs; private final String fID; - SelectTargetAction(String name, Set possibleIDs, String ID) { + + SelectTargetAction(String name, Set<String> possibleIDs, String ID) { super(name, AS_RADIO_BUTTON); fID = ID; fPossibleIDs = possibleIDs; } - public void run() { + @Override + public void run() { if (isChecked()) { // Note: setPreferredTarget is not declared on the // IToggleBreakpontsTargetManager interface. @@ -89,12 +91,14 @@ public class BreakpointTypesContribution extends CompoundContributionItem implem private static IContributionItem[] NO_BREAKPOINT_TYPES_CONTRIBUTION_ITEMS = new IContributionItem[] { new ContributionItem() { + @Override public void fill(Menu menu, int index) { MenuItem item = new MenuItem(menu, SWT.NONE); item.setEnabled(false); item.setText(Messages.BreakpointTypesContribution_0); } + @Override public boolean isEnabled() { return false; } @@ -104,7 +108,8 @@ public class BreakpointTypesContribution extends CompoundContributionItem implem /* (non-Javadoc) * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems() */ - protected IContributionItem[] getContributionItems() { + @Override + protected IContributionItem[] getContributionItems() { IWorkbenchPart part = null; ISelection selection = null; @@ -125,12 +130,11 @@ public class BreakpointTypesContribution extends CompoundContributionItem implem // Get breakpoint toggle target IDs. IToggleBreakpointsTargetManager manager = DebugUITools.getToggleBreakpointsTargetManager(); - Set enabledIDs = manager.getEnabledToggleBreakpointsTargetIDs(part, selection); + Set<String> enabledIDs = manager.getEnabledToggleBreakpointsTargetIDs(part, selection); String preferredId = manager.getPreferredToggleBreakpointsTargetID(part, selection); - List actions = new ArrayList(enabledIDs.size()); - for (Iterator i = enabledIDs.iterator(); i.hasNext();) { - String id = (String) i.next(); + List<Action> actions = new ArrayList<Action>(enabledIDs.size()); + for (String id : enabledIDs) { Action action = new SelectTargetAction(manager.getToggleBreakpointsTargetName(id), enabledIDs, id); if (id.equals(preferredId)) { action.setChecked(true); @@ -144,7 +148,7 @@ public class BreakpointTypesContribution extends CompoundContributionItem implem IContributionItem[] items = new IContributionItem[enabledIDs.size()]; for (int i = 0; i < actions.size(); i++) { - items[i] = new ActionContributionItem((Action) actions.get(i)); + items[i] = new ActionContributionItem(actions.get(i)); } return items; } @@ -152,7 +156,8 @@ public class BreakpointTypesContribution extends CompoundContributionItem implem /* (non-Javadoc) * @see org.eclipse.ui.menus.IWorkbenchContribution#initialize(org.eclipse.ui.services.IServiceLocator) */ - public void initialize(IServiceLocator serviceLocator) { + @Override + public void initialize(IServiceLocator serviceLocator) { fServiceLocator = serviceLocator; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java index 429248693..61f658dba 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,7 +15,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import org.eclipse.core.expressions.Expression; import org.eclipse.core.expressions.IEvaluationContext; @@ -71,7 +70,7 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I // default launch group for this mode (null category) private ILaunchGroup fGroup = null; // map of launch groups by (non-null) categories, for this mode - private Map fGroupsByCategory = null; + private Map<String, ILaunchGroup> fGroupsByCategory = null; // whether to re-fill the menu (reset on selection change) private boolean fFillMenu = true; @@ -83,7 +82,7 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I public ContextualLaunchAction(String mode) { fMode = mode; ILaunchGroup[] groups = DebugUITools.getLaunchGroups(); - fGroupsByCategory = new HashMap(3); + fGroupsByCategory = new HashMap<String, ILaunchGroup>(3); for (int i = 0; i < groups.length; i++) { ILaunchGroup group = groups[i]; if (group.getMode().equals(mode)) { @@ -99,18 +98,21 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I /* * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { // We don't have a need for the active part. } /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#dispose() */ + @Override public void dispose() { // nothing to do } /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control) */ + @Override public Menu getMenu(Control parent) { // never called return null; @@ -118,6 +120,7 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu) */ + @Override public Menu getMenu(Menu parent) { //Create the new menu. The menu will get filled when it is about to be shown. see fillMenu(Menu). Menu menu = new Menu(parent); @@ -127,6 +130,7 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I * doesn't dispose pull-down ActionContribution items for each popup menu. */ menu.addMenuListener(new MenuAdapter() { + @Override public void menuShown(MenuEvent e) { if (fFillMenu) { Menu m = (Menu)e.widget; @@ -145,6 +149,7 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I /* * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { // Never called because we become a menu. } @@ -152,6 +157,7 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I /* * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { // if the selection is an IResource, save it and enable our action if (selection instanceof IStructuredSelection) { @@ -195,16 +201,7 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I } catch (CoreException ce) {} } - - List allShortCuts = getLaunchConfigurationManager().getLaunchShortcuts(); - Iterator iter = allShortCuts.iterator(); - List filteredShortCuts = new ArrayList(10); - - //create a context - List selection = ss.toList(); - //in 3.4 we are correctly passing the IEditorPart and ISelection, so we have to perform - //some sneekyness to make sure the IEditorInput is passed to the eval expressions - //for backwards compatibility + List<Object> selection = ss.toList(); Object o = ss.getFirstElement(); if(o instanceof IEditorPart) { selection.set(0, ((IEditorPart)o).getEditorInput()); @@ -212,8 +209,11 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I IEvaluationContext context = DebugUIPlugin.createEvaluationContext(selection); context.setAllowPluginActivation(true); context.addVariable("selection", selection); //$NON-NLS-1$ + List<LaunchShortcutExtension> allShortCuts = getLaunchConfigurationManager().getLaunchShortcuts(); + List<LaunchShortcutExtension> filteredShortCuts = new ArrayList<LaunchShortcutExtension>(); + Iterator<LaunchShortcutExtension> iter = allShortCuts.iterator(); while (iter.hasNext()) { - LaunchShortcutExtension ext = (LaunchShortcutExtension) iter.next(); + LaunchShortcutExtension ext = iter.next(); try { if (!WorkbenchActivityHelper.filterItem(ext) && isApplicable(ext, context)) { filteredShortCuts.add(ext); @@ -225,19 +225,14 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I iter.remove(); } } - iter = filteredShortCuts.iterator(); //we need a separator iff the shared config entry has been added and there are following shortcuts if(menu.getItemCount() > 0 && filteredShortCuts.size() > 0) { new MenuItem(menu, SWT.SEPARATOR); } - List categories = new ArrayList(); - while (iter.hasNext()) { - LaunchShortcutExtension ext = (LaunchShortcutExtension) iter.next(); - Set modes = ext.getModes(); // supported launch modes - Iterator modeIter = modes.iterator(); - while (modeIter.hasNext()) { - String mode = (String) modeIter.next(); + List<String> categories = new ArrayList<String>(); + for(LaunchShortcutExtension ext : filteredShortCuts) { + for(String mode : ext.getModes()) { if (mode.equals(fMode)) { String category = ext.getCategory(); // NOTE: category can be null @@ -259,13 +254,10 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I item.fill(menu, -1); } else { boolean addedSep = false; - iter = categories.iterator(); - while (iter.hasNext()) { - // NOTE: category can be null - String category = (String) iter.next(); + for (String category : categories) { ILaunchGroup group = fGroup; if (category != null) { - group = (ILaunchGroup) fGroupsByCategory.get(category); + group = fGroupsByCategory.get(category); } if (group != null) { if (accelerator > 1 && !addedSep) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugAction.java index 3423222e1..163b2cbd8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugAction.java @@ -33,6 +33,7 @@ public final class DebugAction extends ExecutionAction { /** * @see ExecutionAction#getMode() */ + @Override protected String getMode() { return ILaunchManager.DEBUG_MODE; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java index e69e1829d..33267b8b1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -80,7 +80,8 @@ public abstract class DebugCommandAction extends Action implements IDebugContext private IAction fAction; private IEnabledTarget fEnabledTarget = new IEnabledTarget() { - public void setEnabled(boolean enabled) { + @Override + public void setEnabled(boolean enabled) { DebugCommandAction.this.setEnabled(enabled); } }; @@ -91,8 +92,9 @@ public abstract class DebugCommandAction extends Action implements IDebugContext public DebugCommandAction() { super(); String helpContextId = getHelpContextId(); - if (helpContextId != null) - PlatformUI.getWorkbench().getHelpSystem().setHelp(this, helpContextId); + if (helpContextId != null) { + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, helpContextId); + } setEnabled(false); } @@ -118,7 +120,8 @@ public abstract class DebugCommandAction extends Action implements IDebugContext return fUpdateService.executeCommand( getCommandType(), targets, new ICommandParticipant() { - public void requestDone(org.eclipse.debug.core.IRequest request) { + @Override + public void requestDone(org.eclipse.debug.core.IRequest request) { DebugCommandAction.this.postExecute(request, targets); } }); @@ -145,19 +148,21 @@ public abstract class DebugCommandAction extends Action implements IDebugContext * * @see org.eclipse.debug.core.commands.IDebugCommandHandler */ - abstract protected Class getCommandType(); + abstract protected Class<?> getCommandType(); /** * @see org.eclipse.debug.ui.contexts.IDebugContextListener#debugContextChanged(org.eclipse.debug.ui.contexts.DebugContextEvent) */ - public void debugContextChanged(DebugContextEvent event) { + @Override + public void debugContextChanged(DebugContextEvent event) { fUpdateService.postUpdateCommand(getCommandType(), fEnabledTarget); } /** * @see org.eclipse.jface.action.Action#setEnabled(boolean) */ - public void setEnabled(boolean enabled) { + @Override + public void setEnabled(boolean enabled) { synchronized (this) { if (!fInitialized) { fInitialized = true; @@ -240,7 +245,8 @@ public abstract class DebugCommandAction extends Action implements IDebugContext * (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ - public void run() { + @Override + public void run() { synchronized (this) { if (!fInitialized) { try { @@ -263,7 +269,8 @@ public abstract class DebugCommandAction extends Action implements IDebugContext * (non-Javadoc) * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event) */ - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { run(); } @@ -302,37 +309,43 @@ public abstract class DebugCommandAction extends Action implements IDebugContext * (non-Javadoc) * @see org.eclipse.jface.action.Action#getId() */ - public abstract String getId(); + @Override + public abstract String getId(); /* * (non-Javadoc) * @see org.eclipse.jface.action.Action#getText() */ - public abstract String getText(); + @Override + public abstract String getText(); /* * (non-Javadoc) * @see org.eclipse.jface.action.Action#getToolTipText() */ - public abstract String getToolTipText(); + @Override + public abstract String getToolTipText(); /* * (non-Javadoc) * @see org.eclipse.jface.action.Action#getDisabledImageDescriptor() */ - public abstract ImageDescriptor getDisabledImageDescriptor(); + @Override + public abstract ImageDescriptor getDisabledImageDescriptor(); /* * (non-Javadoc) * @see org.eclipse.jface.action.Action#getHoverImageDescriptor() */ - public abstract ImageDescriptor getHoverImageDescriptor(); + @Override + public abstract ImageDescriptor getHoverImageDescriptor(); /* * (non-Javadoc) * @see org.eclipse.jface.action.Action#getImageDescriptor() */ - public abstract ImageDescriptor getImageDescriptor(); + @Override + public abstract ImageDescriptor getImageDescriptor(); /** * Returns the workbench proxy associated with this action or <code>null</code> diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandHandler.java index c209730f9..9cc8c4c25 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,11 +7,11 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.ui.actions; -import java.util.Iterator; import java.util.Map; import java.util.WeakHashMap; @@ -77,7 +77,8 @@ public abstract class DebugCommandHandler extends AbstractHandler { getContextService(fWindow).addDebugContextListener(this); } - public void setEnabled(boolean enabled) { + @Override + public void setEnabled(boolean enabled) { boolean oldEnabled = fEnabled; fEnabled = enabled; if (fEnabled != oldEnabled && fCurrentEnabledTarget == this) { @@ -85,7 +86,8 @@ public abstract class DebugCommandHandler extends AbstractHandler { } } - public void debugContextChanged(DebugContextEvent event) { + @Override + public void debugContextChanged(DebugContextEvent event) { DebugCommandService.getService(fWindow).postUpdateCommand(getCommandType(), this); } @@ -108,21 +110,25 @@ public abstract class DebugCommandHandler extends AbstractHandler { */ private IWindowListener fWindowListener = new IWindowListener() { - public void windowOpened(IWorkbenchWindow w) { + @Override + public void windowOpened(IWorkbenchWindow w) { } - public void windowDeactivated(IWorkbenchWindow w) { + @Override + public void windowDeactivated(IWorkbenchWindow w) { } - public void windowClosed(IWorkbenchWindow w) { - EnabledTarget enabledTarget = (EnabledTarget)fEnabledTargetsMap.get(w); + @Override + public void windowClosed(IWorkbenchWindow w) { + EnabledTarget enabledTarget = fEnabledTargetsMap.get(w); if (enabledTarget != null) { enabledTarget.dispose(); } } - public void windowActivated(IWorkbenchWindow w) { - fCurrentEnabledTarget = (EnabledTarget)fEnabledTargetsMap.get(w); + @Override + public void windowActivated(IWorkbenchWindow w) { + fCurrentEnabledTarget = fEnabledTargetsMap.get(w); fireHandlerChanged(new HandlerEvent(DebugCommandHandler.this, true, false)); } }; @@ -130,7 +136,7 @@ public abstract class DebugCommandHandler extends AbstractHandler { /** * Map of enabled targets keyed by workbench window. */ - private Map fEnabledTargetsMap = new WeakHashMap(); + private Map<IWorkbenchWindow, EnabledTarget> fEnabledTargetsMap = new WeakHashMap<IWorkbenchWindow, EnabledTarget>(); /** * The current enabled target, based on the active @@ -149,7 +155,8 @@ public abstract class DebugCommandHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object) */ - public void setEnabled(Object evaluationContext) { + @Override + public void setEnabled(Object evaluationContext) { // This method is called with the current evaluation context // just prior to the isEnabled() being called. Check the active // window and update the current enabled target based on it @@ -169,7 +176,8 @@ public abstract class DebugCommandHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#isEnabled() */ - public boolean isEnabled() { + @Override + public boolean isEnabled() { if (fCurrentEnabledTarget == null) { return false; } @@ -177,7 +185,7 @@ public abstract class DebugCommandHandler extends AbstractHandler { } private EnabledTarget getEnabledTarget(IWorkbenchWindow window) { - EnabledTarget target = (EnabledTarget)fEnabledTargetsMap.get(window); + EnabledTarget target = fEnabledTargetsMap.get(window); if (target == null) { target = new EnabledTarget(window); fEnabledTargetsMap.put(window, target); @@ -188,7 +196,8 @@ public abstract class DebugCommandHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ - public Object execute(ExecutionEvent event) throws ExecutionException { + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event); if (window == null) { throw new ExecutionException("No active workbench window."); //$NON-NLS-1$ @@ -222,7 +231,8 @@ public abstract class DebugCommandHandler extends AbstractHandler { return service.executeCommand( getCommandType(), targets, new ICommandParticipant() { - public void requestDone(org.eclipse.debug.core.IRequest request) { + @Override + public void requestDone(org.eclipse.debug.core.IRequest request) { DebugCommandHandler.this.postExecute(request, targets); } }); @@ -249,7 +259,7 @@ public abstract class DebugCommandHandler extends AbstractHandler { * * @see org.eclipse.debug.core.commands.IDebugCommandHandler */ - abstract protected Class getCommandType(); + abstract protected Class<?> getCommandType(); /** @@ -266,10 +276,10 @@ public abstract class DebugCommandHandler extends AbstractHandler { /** * Clean up when removing */ - public void dispose() { - PlatformUI.getWorkbench().removeWindowListener(fWindowListener); - for (Iterator itr = fEnabledTargetsMap.values().iterator(); itr.hasNext();) { - EnabledTarget target = (EnabledTarget)itr.next(); + @Override + public void dispose() { + PlatformUI.getWorkbench().removeWindowListener(fWindowListener); + for(EnabledTarget target : fEnabledTargetsMap.values()) { if (!target.isDisposed()) { target.dispose(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.java index 3cbd7d829..46a64f53a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.java @@ -17,6 +17,7 @@ import java.io.OutputStreamWriter; import java.io.StringWriter; import java.io.Writer; import java.lang.reflect.InvocationTargetException; +import java.util.Map.Entry; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; @@ -83,6 +84,7 @@ public class ExportBreakpointsOperation implements IRunnableWithProgress { /* (non-Javadoc) * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException { SubMonitor localmonitor = SubMonitor.convert(monitor, ImportExportMessages.ExportOperation_0, fBreakpoints.length); XMLMemento memento = XMLMemento.createWriteRoot(IImportExportConstants.IE_NODE_BREAKPOINTS); @@ -114,9 +116,9 @@ public class ExportBreakpointsOperation implements IRunnableWithProgress { root.putString(IImportExportConstants.CHARSTART, (val != null) ? val.toString() : null); String value = null; boolean wsattrib = false; - for(java.util.Iterator iter = marker.getAttributes().keySet().iterator(); iter.hasNext();) { - String iterval = iter.next().toString(); - value = marker.getAttribute(iterval).toString(); + for (Entry<String, Object> entry : marker.getAttributes().entrySet()) { + String iterval = entry.getKey(); + value = entry.getValue().toString(); if(!iterval.equals(IMarker.LINE_NUMBER)) { child = root.createChild(IImportExportConstants.IE_NODE_ATTRIB); if(iterval.equals(IInternalDebugUIConstants.WORKING_SET_NAME)) { @@ -145,8 +147,7 @@ public class ExportBreakpointsOperation implements IRunnableWithProgress { } catch (CoreException e) { throw new InvocationTargetException(e); } catch (IOException e) { - throw new InvocationTargetException(e, - MessageFormat.format("There was a problem writing file: {0}", new String[] {fFileName})); //$NON-NLS-1$ + throw new InvocationTargetException(e, MessageFormat.format("There was a problem writing file: {0}", new Object[] { fFileName })); //$NON-NLS-1$ } finally { localmonitor.done(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/IToggleBreakpointsTargetFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/IToggleBreakpointsTargetFactory.java index a12ca764e..61025767b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/IToggleBreakpointsTargetFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/IToggleBreakpointsTargetFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 Wind River Systems and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -73,7 +73,7 @@ public interface IToggleBreakpointsTargetFactory { * @return Set of <code>String</code> IDs for possible toggle breakpoint * targets, possibly empty */ - public Set getToggleTargets(IWorkbenchPart part, ISelection selection); + public Set<String> getToggleTargets(IWorkbenchPart part, ISelection selection); /** * Returns the identifier of the default toggle breakpoints target to use diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/IToggleBreakpointsTargetManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/IToggleBreakpointsTargetManager.java index fb8e69af6..f768c2880 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/IToggleBreakpointsTargetManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/IToggleBreakpointsTargetManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Wind River Systems and others. + * Copyright (c) 2012, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.ui.actions; @@ -47,7 +48,7 @@ public interface IToggleBreakpointsTargetManager { * @param selection active selection in part * @return Set of toggle target IDs or an empty set */ - public Set getEnabledToggleBreakpointsTargetIDs(IWorkbenchPart part, ISelection selection); + public Set<String> getEnabledToggleBreakpointsTargetIDs(IWorkbenchPart part, ISelection selection); /** * Returns the ID of the calculated preferred toggle breakpoints target for the diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java index 5e94b9d18..06b25b443 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java @@ -23,30 +23,18 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; - -import com.ibm.icu.text.MessageFormat; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubMonitor; +import java.util.Map.Entry; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; - -import org.eclipse.jface.operation.IRunnableWithProgress; - -import org.eclipse.ui.IMemento; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.IWorkingSetManager; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.XMLMemento; - +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.debug.core.model.IBreakpointImportParticipant; @@ -54,8 +42,15 @@ import org.eclipse.debug.internal.core.BreakpointManager; import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.importexport.breakpoints.IImportExportConstants; import org.eclipse.debug.internal.ui.importexport.breakpoints.ImportExportMessages; - import org.eclipse.debug.ui.IDebugUIConstants; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.ui.IMemento; +import org.eclipse.ui.IWorkingSet; +import org.eclipse.ui.IWorkingSetManager; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.XMLMemento; + +import com.ibm.icu.text.MessageFormat; /** * Imports breakpoints from a file or string buffer into the workspace. @@ -73,7 +68,7 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { private boolean fCreateWorkingSets = false; - private ArrayList fAdded = new ArrayList(); + private ArrayList<IBreakpoint> fAdded = new ArrayList<IBreakpoint>(); private String fCurrentWorkingSetProperty = null; @@ -162,6 +157,7 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { /* (non-Javadoc) * @see org.eclipse.core.resources.IWorkspaceRunnable#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void run(final IProgressMonitor monitor) throws InvocationTargetException { SubMonitor localmonitor = SubMonitor.convert(monitor, ImportExportMessages.ImportOperation_0, 1); Reader reader = null; @@ -175,7 +171,7 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { IMemento[] nodes = memento.getChildren(IImportExportConstants.IE_NODE_BREAKPOINT); IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot(); localmonitor.setWorkRemaining(nodes.length); - Map attributes = null; + Map<String, Object> attributes = null; IBreakpointImportParticipant[] participants = null; for(int i = 0; i < nodes.length; i++) { if(localmonitor.isCanceled()) { @@ -218,20 +214,20 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { localmonitor.worked(1); } if(fAdded.size() > 0 && fImportBreakpoints) { - fManager.addBreakpoints((IBreakpoint[])fAdded.toArray(new IBreakpoint[fAdded.size()])); + fManager.addBreakpoints(fAdded.toArray(new IBreakpoint[fAdded.size()])); } } catch(FileNotFoundException e) { throw new InvocationTargetException(e, - MessageFormat.format("Breakpoint import file not found: {0}", new String[]{fFileName})); //$NON-NLS-1$ + MessageFormat.format("Breakpoint import file not found: {0}", new Object[] { fFileName })); //$NON-NLS-1$ } catch (UnsupportedEncodingException e) { throw new InvocationTargetException(e, - MessageFormat.format("The import file was written in non-UTF-8 encoding.", new String[]{fFileName})); //$NON-NLS-1$ + MessageFormat.format("The import file was written in non-UTF-8 encoding.", new Object[] { fFileName })); //$NON-NLS-1$ } catch(CoreException ce) { throw new InvocationTargetException(ce, - MessageFormat.format("There was a problem importing breakpoints from: {0}", new String[] {fFileName})); //$NON-NLS-1$ + MessageFormat.format("There was a problem importing breakpoints from: {0}", new Object[] { fFileName })); //$NON-NLS-1$ } finally { localmonitor.done(); @@ -253,7 +249,7 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { * @return the marker for an existing breakpoint or <code>null</code> if one could not be located * @since 3.5 */ - protected IMarker findExistingMarker(Map attributes, IBreakpointImportParticipant[] participants) { + protected IMarker findExistingMarker(Map<String, Object> attributes, IBreakpointImportParticipant[] participants) { IBreakpoint[] bps = fManager.getBreakpoints(); for(int i = 0; i < bps.length; i++) { for(int j = 0; j < participants.length; j++) { @@ -280,8 +276,8 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { * @return a new map of all of the breakpoint attributes from the given memento. * @since 3.5 */ - protected Map collectBreakpointProperties(IMemento memento) { - HashMap map = new HashMap(); + protected Map<String, Object> collectBreakpointProperties(IMemento memento) { + HashMap<String, Object> map = new HashMap<String, Object>(); //collect attributes from the 'breakpoint' node map.put(IImportExportConstants.IE_BP_ENABLED, memento.getBoolean(IImportExportConstants.IE_BP_ENABLED)); @@ -310,7 +306,7 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { * @param memento the memento to read a name / value attribute from * @param map the map to add the read attribute to */ - private void readAttribute(IMemento memento, Map map) { + private void readAttribute(IMemento memento, Map<String, Object> map) { String name = memento.getString(IImportExportConstants.IE_NODE_NAME), value = memento.getString(IImportExportConstants.IE_NODE_VALUE); if (value != null && name != null) { @@ -339,14 +335,12 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { * @param participants the list of participants used to verify the restored breakpoint * @since 3.5 */ - protected void restoreBreakpoint(IMarker marker, final Map attributes, IBreakpointImportParticipant[] participants) { - String key = null; - for(Iterator iter = attributes.keySet().iterator(); iter.hasNext();) { - key = (String) iter.next(); + protected void restoreBreakpoint(IMarker marker, final Map<String, Object> attributes, IBreakpointImportParticipant[] participants) { + for (Entry<String, Object> entry : attributes.entrySet()) { try { - marker.setAttribute(key, attributes.get(key)); + marker.setAttribute(entry.getKey(), entry.getValue()); + } catch (CoreException ce) { } - catch(CoreException ce) {} } IBreakpoint breakpoint = null; try { @@ -386,14 +380,13 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { */ private void updateWorkingSets(String[] wsnames, IBreakpoint breakpoint) { IWorkingSetManager mgr = PlatformUI.getWorkbench().getWorkingSetManager(); - IWorkingSet set = null; - ArrayList sets = new ArrayList(); + ArrayList<IWorkingSet> sets = new ArrayList<IWorkingSet>(); collectContainingWorkingsets(breakpoint, sets); for (int i = 0; i < wsnames.length; i++) { if("".equals(wsnames[i])) { //$NON-NLS-1$ continue; } - set = mgr.getWorkingSet(wsnames[i]); + IWorkingSet set = mgr.getWorkingSet(wsnames[i]); if(set == null) { //create working set set = mgr.createWorkingSet(wsnames[i], new IAdaptable[] {}); @@ -409,12 +402,11 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { } sets.remove(set); } - ArrayList items = null; - for(Iterator iter = sets.iterator(); iter.hasNext();) { - set = (IWorkingSet) iter.next(); - items = new ArrayList(Arrays.asList(set.getElements())); + ArrayList<IAdaptable> items = null; + for (IWorkingSet set : sets) { + items = new ArrayList<IAdaptable>(Arrays.asList(set.getElements())); if(items.remove(breakpoint)) { - set.setElements((IAdaptable[]) items.toArray(new IAdaptable[items.size()])); + set.setElements(items.toArray(new IAdaptable[items.size()])); } } } @@ -427,7 +419,7 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { * @param collector the list to collect containing working sets in * @since 3.5 */ - private void collectContainingWorkingsets(IBreakpoint breakpoint, List collector) { + private void collectContainingWorkingsets(IBreakpoint breakpoint, List<IWorkingSet> collector) { IWorkingSetManager mgr = PlatformUI.getWorkbench().getWorkingSetManager(); IWorkingSet[] sets = mgr.getWorkingSets(); for (int i = 0; i < sets.length; i++) { @@ -462,6 +454,6 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { * @since 3.5 */ public IBreakpoint[] getImportedBreakpoints() { - return (IBreakpoint[])fAdded.toArray(new IBreakpoint[fAdded.size()]); + return fAdded.toArray(new IBreakpoint[fAdded.size()]); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAction.java index 220f6addf..ccbfff59f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.debug.ui.actions; import java.util.ArrayList; -import java.util.Iterator; import java.util.Set; import org.eclipse.core.runtime.CoreException; @@ -21,6 +20,8 @@ import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; +import org.eclipse.debug.internal.ui.actions.ActionMessages; +import org.eclipse.debug.internal.ui.launchConfigurations.LaunchHistory; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.ILaunchGroup; import org.eclipse.jface.action.Action; @@ -31,8 +32,6 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Event; import org.eclipse.ui.PlatformUI; -import org.eclipse.debug.internal.ui.actions.ActionMessages; -import org.eclipse.debug.internal.ui.launchConfigurations.LaunchHistory; import com.ibm.icu.text.MessageFormat; @@ -76,6 +75,7 @@ public class LaunchAction extends Action { /** * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { DebugUITools.launch(fConfiguration, fMode); } @@ -86,6 +86,7 @@ public class LaunchAction extends Action { * * @see org.eclipse.jface.action.IAction#runWithEvent(org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(Event event) { if ((event.stateMask & SWT.MOD1) > 0 && (event.stateMask & SWT.MOD2) > 0){ ILaunchGroup[] groups = getAllGroupsForConfiguration(fConfiguration); @@ -95,7 +96,7 @@ public class LaunchAction extends Action { if(store.getBoolean(IInternalDebugUIConstants.PREF_REMOVE_FROM_LAUNCH_HISTORY)) { MessageDialogWithToggle mdwt = MessageDialogWithToggle.openYesNoQuestion(DebugUIPlugin.getShell(), ActionMessages.LaunchAction_0, - MessageFormat.format(ActionMessages.LaunchAction_1, new String[] {fConfiguration.getName()}), + MessageFormat.format(ActionMessages.LaunchAction_1, new Object[] { fConfiguration.getName() }), ActionMessages.LaunchAction_2, false, null, @@ -140,7 +141,7 @@ public class LaunchAction extends Action { if(history != null) { history.removeFromHistory(fConfiguration); } else { - DebugUIPlugin.logErrorMessage(MessageFormat.format("Unable to remove configuration [{0}] from launch history. The launch history for mode [{1}] does not exist.", new String[] {config.getName(), groups[i].getMode()})); //$NON-NLS-1$ + DebugUIPlugin.logErrorMessage(MessageFormat.format("Unable to remove configuration [{0}] from launch history. The launch history for mode [{1}] does not exist.", new Object[] { config.getName(), groups[i].getMode() })); //$NON-NLS-1$ } } } @@ -153,15 +154,13 @@ public class LaunchAction extends Action { * @since 3.4 */ private ILaunchGroup[] getAllGroupsForConfiguration(ILaunchConfiguration config) { - ArrayList list = new ArrayList(); + ArrayList<ILaunchGroup> list = new ArrayList<ILaunchGroup>(); try { ILaunchConfigurationType type = config.getType(); - Set modes = type.getSupportedModeCombinations(); + Set<Set<String>> modes = type.getSupportedModeCombinations(); String mode = null; ILaunchGroup group = null; - Set modesets = null; - for(Iterator iter = modes.iterator(); iter.hasNext();) { - modesets = (Set) iter.next(); + for (Set<String> modesets : modes) { if(modesets.size() == 1) { mode = (String) modesets.toArray()[0]; group = DebugUITools.getLaunchGroup(config, mode); @@ -172,7 +171,6 @@ public class LaunchAction extends Action { } } catch(CoreException ce) {} - return (ILaunchGroup[]) list.toArray(new ILaunchGroup[list.size()]); + return list.toArray(new ILaunchGroup[list.size()]); } - } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java index 12a9f09bf..5f563daea 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,6 @@ package org.eclipse.debug.ui.actions; -import java.util.Iterator; import java.util.List; import org.eclipse.debug.core.DebugPlugin; @@ -50,6 +49,7 @@ import org.eclipse.ui.activities.WorkbenchActivityHelper; * menus. Use <code>LaunchShorcutsAction</code> instead. * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWindowPulldownDelegate2 { /** @@ -93,6 +93,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi /** * @see IAction#run() */ + @Override public void run() { //do nothing, this action just creates a cascading menu. } @@ -114,6 +115,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi /** * @see IMenuCreator#dispose() */ + @Override public void dispose() { if (getCreatedMenu() != null) { getCreatedMenu().dispose(); @@ -123,6 +125,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi /** * @see IMenuCreator#getMenu(Control) */ + @Override public Menu getMenu(Control parent) { return null; } @@ -130,6 +133,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi /** * @see IMenuCreator#getMenu(Menu) */ + @Override public Menu getMenu(Menu parent) { if (getCreatedMenu() != null) { getCreatedMenu().dispose(); @@ -142,7 +146,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi private void fillMenu() { //Retrieve the current perspective and the registered shortcuts - List shortcuts = null; + List<LaunchShortcutExtension> shortcuts = null; String activePerspID = getActivePerspectiveID(); if (activePerspID != null) { shortcuts = getLaunchConfigurationManager().getLaunchShortcuts(activePerspID, getCategory()); @@ -155,11 +159,8 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi } int menuCount = 1; - - Iterator iter = shortcuts.iterator(); String mode = getMode(); - while (iter.hasNext()) { - LaunchShortcutExtension ext = (LaunchShortcutExtension) iter.next(); + for (LaunchShortcutExtension ext : shortcuts) { if (ext.getModes().contains(mode) && !WorkbenchActivityHelper.filterItem(ext)) { populateMenu(mode, ext, getCreatedMenu(), menuCount); menuCount++; @@ -174,6 +175,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi // Add listener to re-populate the menu each time // it is shown to reflect changes in selection or active perspective fCreatedMenu.addMenuListener(new MenuAdapter() { + @Override public void menuShown(MenuEvent e) { Menu m = (Menu)e.widget; MenuItem[] items = m.getItems(); @@ -262,6 +264,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi /** * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { // if (window instanceof WorkbenchWindow) { // fKeyBindingService= ((WorkbenchWindow)window).getKeyBindingService(); @@ -271,6 +274,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi /** * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { // do nothing - this is just a menu } @@ -278,6 +282,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi /** * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (fAction == null) { initialize(action); @@ -302,10 +307,8 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi * the mode of this action */ private boolean existsShortcutsForMode() { - List shortcuts = getLaunchConfigurationManager().getLaunchShortcuts(getCategory()); - Iterator iter = shortcuts.iterator(); - while (iter.hasNext()) { - LaunchShortcutExtension ext = (LaunchShortcutExtension) iter.next(); + List<LaunchShortcutExtension> shortcuts = getLaunchConfigurationManager().getLaunchShortcuts(getCategory()); + for (LaunchShortcutExtension ext : shortcuts) { if (ext.getModes().contains(getMode())) { return true; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java index b30159f4d..b184ebee9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java @@ -14,7 +14,6 @@ package org.eclipse.debug.ui.actions; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Set; import org.eclipse.core.expressions.Expression; import org.eclipse.core.expressions.IEvaluationContext; @@ -46,6 +45,7 @@ import org.eclipse.swt.events.MenuEvent; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; +import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2; @@ -100,6 +100,7 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork /** * @see IAction#run() */ + @Override public void run() { //do nothing, this action just creates a cascading menu. } @@ -107,6 +108,7 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork /** * @see IMenuCreator#dispose() */ + @Override public void dispose() { if (fCreatedMenu != null) { fCreatedMenu.dispose(); @@ -116,6 +118,7 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork /** * @see IMenuCreator#getMenu(Control) */ + @Override public Menu getMenu(Control parent) { return null; } @@ -123,6 +126,7 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork /** * @see IMenuCreator#getMenu(Menu) */ + @Override public Menu getMenu(Menu parent) { if (fCreatedMenu != null) { fCreatedMenu.dispose(); @@ -138,7 +142,7 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork private IEvaluationContext createContext() { IStructuredSelection ss = SelectedResourceManager.getDefault().getCurrentSelection(); Object o = ss.getFirstElement(); - List list = new ArrayList(0); + List<IEditorInput> list = new ArrayList<IEditorInput>(0); if(o instanceof IEditorPart) { list.add(((IEditorPart)o).getEditorInput()); } @@ -157,11 +161,11 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork private void fillMenu() { IEvaluationContext context = createContext(); int accelerator = 1; - List allShortCuts = getLaunchConfigurationManager().getLaunchShortcuts(fGroup.getCategory()); - Iterator iter = allShortCuts.iterator(); - List filteredShortCuts = new ArrayList(10); + List<LaunchShortcutExtension> allShortCuts = getLaunchConfigurationManager().getLaunchShortcuts(fGroup.getCategory()); + Iterator<LaunchShortcutExtension> iter = allShortCuts.iterator(); + List<LaunchShortcutExtension> filteredShortCuts = new ArrayList<LaunchShortcutExtension>(10); while (iter.hasNext()) { - LaunchShortcutExtension ext = (LaunchShortcutExtension) iter.next(); + LaunchShortcutExtension ext = iter.next(); try { if (!WorkbenchActivityHelper.filterItem(ext) && isApplicable(ext, context)) { filteredShortCuts.add(ext); @@ -187,13 +191,8 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork } catch(CoreException ce) {DebugUIPlugin.log(ce);} //second add the launch shortcuts if any - iter = filteredShortCuts.iterator(); - while (iter.hasNext()) { - LaunchShortcutExtension ext = (LaunchShortcutExtension) iter.next(); - Set modes = ext.getModes(); // supported launch modes - Iterator modeIter = modes.iterator(); - while (modeIter.hasNext()) { - String modee = (String) modeIter.next(); + for (LaunchShortcutExtension ext : filteredShortCuts) { + for (String modee : ext.getModes()) { if (modee.equals(mode)) { populateMenuItem(modee, ext, fCreatedMenu, accelerator++); } @@ -215,7 +214,7 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork * @since 3.3 */ private Object getSelection(IEvaluationContext context) { - List list = (List) context.getVariable("selection"); //$NON-NLS-1$ + List<?> list = (List<?>) context.getVariable("selection"); //$NON-NLS-1$ return (list.isEmpty() ? null : list.get(0)); } @@ -269,6 +268,7 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork // Add listener to re-populate the menu each time // it is shown to reflect changes in selection or active perspective fCreatedMenu.addMenuListener(new MenuAdapter() { + @Override public void menuShown(MenuEvent e) { Menu m = (Menu)e.widget; MenuItem[] items = m.getItems(); @@ -301,11 +301,13 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork /** * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) {} /** * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { // do nothing - this is just a menu } @@ -313,6 +315,7 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork /** * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (!fInitialized) { action.setEnabled(existsConfigTypesForMode()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java index 7f97c39cb..649542dfe 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -60,7 +60,7 @@ public class OpenLaunchDialogAction extends Action implements IActionDelegate2, ILaunchGroup group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(fIdentifier); if(group != null) { String lbl = group.getLabel(); - String actionLabel = MessageFormat.format(ActionMessages.OpenLaunchDialogAction_1, new String[] {lbl}); + String actionLabel = MessageFormat.format(ActionMessages.OpenLaunchDialogAction_1, new Object[] { lbl }); setText(DebugUIPlugin.adjustDBCSAccelerator(actionLabel)); } PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.OPEN_LAUNCH_CONFIGURATION_ACTION); @@ -69,6 +69,7 @@ public class OpenLaunchDialogAction extends Action implements IActionDelegate2, /** * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { LaunchHistory history = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchHistory(fIdentifier); ILaunchConfiguration configuration = history.getRecentLaunch(); @@ -85,6 +86,7 @@ public class OpenLaunchDialogAction extends Action implements IActionDelegate2, /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(); } @@ -92,6 +94,7 @@ public class OpenLaunchDialogAction extends Action implements IActionDelegate2, /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { run(); } @@ -99,11 +102,13 @@ public class OpenLaunchDialogAction extends Action implements IActionDelegate2, /** * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() {} /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { if(action != null) { action.setEnabled(existsConfigTypesForMode()); @@ -131,11 +136,13 @@ public class OpenLaunchDialogAction extends Action implements IActionDelegate2, /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) {} /** * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) {} /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RelaunchLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RelaunchLastAction.java index 42df05e34..b58ccae6f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RelaunchLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RelaunchLastAction.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -59,6 +59,7 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega /* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
*/
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if(event.getKey().equals(IInternalDebugUIConstants.PREF_USE_CONTEXTUAL_LAUNCH)) {
initialize(fAction);
@@ -73,6 +74,7 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega /* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
*/
+ @Override
public void dispose(){
IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier());
if(prefs != null) {
@@ -83,6 +85,7 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega /* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void init(IWorkbenchWindow window){
fWorkbenchWindow = window;
IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier());
@@ -94,6 +97,7 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega /* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action){
if(LaunchingResourceManager.isContextLaunchEnabled()) {
ILaunchGroup group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(getLaunchGroupId());
@@ -108,7 +112,8 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega } else {
String configName = configuration.getName();
String title = ActionMessages.RelaunchLastAction_Cannot_relaunch_1;
- String message = MessageFormat.format(ActionMessages.RelaunchLastAction_Cannot_relaunch___0___because_it_does_not_support__2__mode_2, new String[] {configName, getMode()});
+ String message = MessageFormat.format(ActionMessages.RelaunchLastAction_Cannot_relaunch___0___because_it_does_not_support__2__mode_2, new Object[] {
+ configName, getMode() });
MessageDialog.openError(getShell(), title, message);
}
} else {
@@ -136,6 +141,7 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega /* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection){
if (fAction == null) {
initialize(action);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointAction.java index 6612a9e8f..c48abc8d4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -20,6 +20,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.IVerticalRulerInfo; import org.eclipse.ui.texteditor.ITextEditor; @@ -59,11 +60,11 @@ public abstract class RulerBreakpointAction extends Action { IAnnotationModel annotationModel = fEditor.getDocumentProvider().getAnnotationModel(fEditor.getEditorInput()); IDocument document = fEditor.getDocumentProvider().getDocument(fEditor.getEditorInput()); if (annotationModel != null) { - Iterator iterator = annotationModel.getAnnotationIterator(); + Iterator<Annotation> iterator = annotationModel.getAnnotationIterator(); while (iterator.hasNext()) { - Object object = iterator.next(); - if (object instanceof SimpleMarkerAnnotation) { - SimpleMarkerAnnotation markerAnnotation = (SimpleMarkerAnnotation) object; + Annotation annot = iterator.next(); + if (annot instanceof SimpleMarkerAnnotation) { + SimpleMarkerAnnotation markerAnnotation = (SimpleMarkerAnnotation) annot; IMarker marker = markerAnnotation.getMarker(); try { if (marker.isSubtypeOf(IBreakpoint.BREAKPOINT_MARKER)) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointTypesActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointTypesActionDelegate.java index eda0b060d..b09b9fdbf 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointTypesActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointTypesActionDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,10 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation * Wind River Systems - adapted action to use for breakpoint types -******************************************************************************/ + ******************************************************************************/ package org.eclipse.debug.ui.actions; -import java.util.Iterator; import java.util.Set; import org.eclipse.debug.internal.ui.actions.ToggleBreakpointsTargetManager; @@ -75,6 +74,7 @@ import org.eclipse.ui.texteditor.ITextEditorExtension; * * @deprecated Should use BreakpointTypesContribution instead. */ +@Deprecated public class RulerBreakpointTypesActionDelegate implements IEditorActionDelegate, IMenuListener, IMenuCreator { private ITextEditor fEditor = null; private IAction fCallerAction = null; @@ -87,15 +87,17 @@ public class RulerBreakpointTypesActionDelegate implements IEditorActionDelegate private Menu fMenu; private class SelectTargetAction extends Action { - private final Set fPossibleIDs; + private final Set<String> fPossibleIDs; private final String fID; - SelectTargetAction(String name, Set possibleIDs, String ID) { + + SelectTargetAction(String name, Set<String> possibleIDs, String ID) { super(name, AS_RADIO_BUTTON); fID = ID; fPossibleIDs = possibleIDs; } - public void run() { + @Override + public void run() { if (isChecked()) { ToggleBreakpointsTargetManager.getDefault().setPreferredTarget(fPossibleIDs, fID); } @@ -103,18 +105,21 @@ public class RulerBreakpointTypesActionDelegate implements IEditorActionDelegate } - public void selectionChanged(IAction action, ISelection selection) { + @Override + public void selectionChanged(IAction action, ISelection selection) { // In the editor we're not using the selection. } - public void run(IAction action) { + @Override + public void run(IAction action) { // Do nothing, this is a pull-down menu. } /* (non-Javadoc) * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) */ - public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) { + @Override + public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) { // Clean up old editor data. if (fCallerAction != null) { fCallerAction.setMenuCreator(null); @@ -140,7 +145,8 @@ public class RulerBreakpointTypesActionDelegate implements IEditorActionDelegate } - public void dispose() { + @Override + public void dispose() { if (fCallerAction != null) { fCallerAction.setMenuCreator(null); } @@ -150,7 +156,8 @@ public class RulerBreakpointTypesActionDelegate implements IEditorActionDelegate fRulerInfo = null; } - public void menuAboutToShow(IMenuManager manager) { + @Override + public void menuAboutToShow(IMenuManager manager) { fSelection = StructuredSelection.EMPTY; if (fEditor != null && fRulerInfo != null) { @@ -166,7 +173,7 @@ public class RulerBreakpointTypesActionDelegate implements IEditorActionDelegate } } ToggleBreakpointsTargetManager toggleTargetManager = ToggleBreakpointsTargetManager.getDefault(); - Set enabledIDs = toggleTargetManager.getEnabledToggleBreakpointsTargetIDs(fEditor, fSelection); + Set<String> enabledIDs = toggleTargetManager.getEnabledToggleBreakpointsTargetIDs(fEditor, fSelection); fCallerAction.setEnabled(enabledIDs.size() > 0); } else { fCallerAction.setEnabled(false); @@ -186,14 +193,16 @@ public class RulerBreakpointTypesActionDelegate implements IEditorActionDelegate fMenu = menu; } - public Menu getMenu(Menu parent) { + @Override + public Menu getMenu(Menu parent) { setMenu(new Menu(parent)); fillMenu(fMenu); initMenu(); return fMenu; } - public Menu getMenu(Control parent) { + @Override + public Menu getMenu(Control parent) { setMenu(new Menu(parent)); fillMenu(fMenu); initMenu(); @@ -207,17 +216,13 @@ public class RulerBreakpointTypesActionDelegate implements IEditorActionDelegate */ private void fillMenu(Menu menu) { ToggleBreakpointsTargetManager manager = ToggleBreakpointsTargetManager.getDefault(); - Set enabledIDs = manager.getEnabledToggleBreakpointsTargetIDs(fEditor, fSelection); + Set<String> enabledIDs = manager.getEnabledToggleBreakpointsTargetIDs(fEditor, fSelection); String preferredId = manager.getPreferredToggleBreakpointsTargetID(fEditor, fSelection); - - for (Iterator itr = enabledIDs.iterator(); itr.hasNext();) { - String id = (String)itr.next(); + for (String id : enabledIDs) { SelectTargetAction action= new SelectTargetAction(manager.getToggleBreakpointsTargetName(id), enabledIDs, id); - if (id.equals(preferredId)){ action.setChecked(true); } - ActionContributionItem item= new ActionContributionItem(action); item.fill(menu, -1); } @@ -230,7 +235,8 @@ public class RulerBreakpointTypesActionDelegate implements IEditorActionDelegate // Add listener to re-populate the menu each time // it is shown because of dynamic history list fMenu.addMenuListener(new MenuAdapter() { - public void menuShown(MenuEvent e) { + @Override + public void menuShown(MenuEvent e) { Menu m = (Menu)e.widget; MenuItem[] items = m.getItems(); for (int i=0; i < items.length; i++) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.java index 0b17e2a89..b41960f02 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.java @@ -48,6 +48,7 @@ public class RulerEnableDisableBreakpointActionDelegate extends AbstractRulerAct /* (non-Javadoc) * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo) */ + @Override protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) { return new RulerEnableDisableBreakpointAction(editor, rulerInfo); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.java index ff93f5af1..fba8e40ce 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.java @@ -79,6 +79,7 @@ public class RulerToggleBreakpointActionDelegate extends AbstractRulerActionDele /* (non-Javadoc) * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo) */ + @Override protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) { fDelegate = new ToggleBreakpointAction(editor, null, rulerInfo); return fDelegate; @@ -87,6 +88,7 @@ public class RulerToggleBreakpointActionDelegate extends AbstractRulerActionDele /* (non-Javadoc) * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) */ + @Override public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) { if (fEditor != null) { if (fDelegate != null) { @@ -101,12 +103,14 @@ public class RulerToggleBreakpointActionDelegate extends AbstractRulerActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { if (fDelegate != null) { fDelegate.dispose(); @@ -118,6 +122,7 @@ public class RulerToggleBreakpointActionDelegate extends AbstractRulerActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { if(fDelegate != null) { fDelegate.runWithEvent(event); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunAction.java index 32145272f..ed3a12692 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunAction.java @@ -34,6 +34,7 @@ public final class RunAction extends ExecutionAction { /** * @see ExecutionAction#getMode() */ + @Override protected String getMode() { return ILaunchManager.RUN_MODE; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java index e7513285b..d735d34c4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java @@ -76,6 +76,7 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe update(); } + @Override public void debugContextChanged(DebugContextEvent event) { contextActivated(event.getContext()); } @@ -85,6 +86,7 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe /*(non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { DebugUITools.getDebugContextManager().getContextService(fActivePart.getSite().getWorkbenchWindow()).removeDebugContextListener(fContextListener); fActivePart = null; @@ -94,6 +96,7 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fPartTarget != null && fTargetElement != null) { try { @@ -106,6 +109,7 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { this.fAction = action; update(); @@ -119,6 +123,7 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe return; } Runnable r = new Runnable() { + @Override public void run() { boolean enabled = false; if (fPartTarget != null && fTargetElement != null) { @@ -140,6 +145,7 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { this.fAction = action; if (action != null) { @@ -151,12 +157,14 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } /* (non-Javadoc) * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) */ + @Override public void setActiveEditor(IAction action, IEditorPart targetEditor) { init(action); bindTo(targetEditor); @@ -165,6 +173,7 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { bindTo(view); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java index d0d5dd1e4..4db1b058c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java @@ -65,7 +65,8 @@ public class RunToLineHandler implements IDebugEventSetListener, IBreakpointMana /* (non-Javadoc) * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ - public void handleDebugEvents(DebugEvent[] events) { + @Override + public void handleDebugEvents(DebugEvent[] events) { for (int i = 0; i < events.length; i++) { DebugEvent event= events[i]; Object source= event.getSource(); @@ -91,7 +92,8 @@ public class RunToLineHandler implements IDebugEventSetListener, IBreakpointMana /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointManagerListener#breakpointManagerEnablementChanged(boolean) */ - public void breakpointManagerEnablementChanged(boolean enabled) { + @Override + public void breakpointManagerEnablementChanged(boolean enabled) { // if the user changes the breakpoint manager enablement, don't restore it fAutoSkip = false; } @@ -123,7 +125,8 @@ public class RunToLineHandler implements IDebugEventSetListener, IBreakpointMana /* (non-Javadoc) * @see org.eclipse.core.resources.IWorkspaceRunnable#run(org.eclipse.core.runtime.IProgressMonitor) */ - public void run(IProgressMonitor monitor) throws CoreException { + @Override + public void run(IProgressMonitor monitor) throws CoreException { getDebugPlugin().addDebugEventListener(this); IBreakpointManager breakpointManager = getBreakpointManager(); fAutoSkip = DebugUITools.getPreferenceStore().getBoolean(IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE) && breakpointManager.isEnabled(); @@ -132,7 +135,8 @@ public class RunToLineHandler implements IDebugEventSetListener, IBreakpointMana breakpointManager.addBreakpointManagerListener(this); } Job job = new Job(ActionMessages.RunToLineHandler_0) { - protected IStatus run(IProgressMonitor jobMonitor) { + @Override + protected IStatus run(IProgressMonitor jobMonitor) { if (!jobMonitor.isCanceled()) { fTarget.breakpointAdded(fBreakpoint); try { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java index 0a0aadd0e..8a4c9c8a6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java @@ -50,7 +50,8 @@ public class ToggleBreakpointAction extends Action implements IUpdate { private IDocument fDocument; private IVerticalRulerInfo fRulerInfo; private IToggleBreakpointsTargetManagerListener fListener = new IToggleBreakpointsTargetManagerListener() { - public void preferredTargetsChanged() { + @Override + public void preferredTargetsChanged() { update(); } }; @@ -78,6 +79,7 @@ public class ToggleBreakpointAction extends Action implements IUpdate { * (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { doIt(null); } @@ -85,6 +87,7 @@ public class ToggleBreakpointAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(Event event) { doIt(event); } @@ -186,6 +189,7 @@ public class ToggleBreakpointAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IUpdate#update() */ + @Override public void update() { IDocument document= getDocument(); if (document != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleMethodBreakpointActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleMethodBreakpointActionDelegate.java index 4b3db6ff7..aeed58b01 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleMethodBreakpointActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleMethodBreakpointActionDelegate.java @@ -31,6 +31,7 @@ public class ToggleMethodBreakpointActionDelegate extends ToggleBreakpointObject /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.ToggleBreakpointObjectActionDelegate#performAction(org.eclipse.debug.internal.ui.actions.IToggleBreakpointsTarget, org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override protected void performAction(IToggleBreakpointsTarget target, IWorkbenchPart part, ISelection selection) throws CoreException { target.toggleMethodBreakpoints(part, selection); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleWatchpointActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleWatchpointActionDelegate.java index c5ebd55ec..ac1bdd8a3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleWatchpointActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleWatchpointActionDelegate.java @@ -31,6 +31,7 @@ public class ToggleWatchpointActionDelegate extends ToggleBreakpointObjectAction /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.ToggleBreakpointObjectActionDelegate#performAction(org.eclipse.debug.internal.ui.actions.IToggleBreakpointsTarget, org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override protected void performAction(IToggleBreakpointsTarget target, IWorkbenchPart part, ISelection selection) throws CoreException { target.toggleWatchpoints(part, selection); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/ConsoleColorProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/ConsoleColorProvider.java index 27ca96d60..62b9b5e13 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/ConsoleColorProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/ConsoleColorProvider.java @@ -34,6 +34,7 @@ public class ConsoleColorProvider implements IConsoleColorProvider { /* (non-Javadoc) * @see org.eclipse.debug.ui.console.IConsoleColorProvider#connect(org.eclipse.debug.core.model.IProcess, org.eclipse.debug.ui.console.IConsole) */ + @Override public void connect(IProcess process, IConsole console) { fProcess = process; fConsole = console; @@ -46,6 +47,7 @@ public class ConsoleColorProvider implements IConsoleColorProvider { /* (non-Javadoc) * @see org.eclipse.debug.ui.console.IConsoleColorProvider#disconnect() */ + @Override public void disconnect() { fConsole = null; fProcess = null; @@ -54,6 +56,7 @@ public class ConsoleColorProvider implements IConsoleColorProvider { /* (non-Javadoc) * @see org.eclipse.debug.ui.console.IConsoleColorProvider#isReadOnly() */ + @Override public boolean isReadOnly() { return fProcess == null || fProcess.isTerminated(); } @@ -61,6 +64,7 @@ public class ConsoleColorProvider implements IConsoleColorProvider { /* (non-Javadoc) * @see org.eclipse.debug.ui.console.IConsoleColorProvider#getColor(java.lang.String) */ + @Override public Color getColor(String streamIdentifer) { if (IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM.equals(streamIdentifer)) { return DebugUIPlugin.getPreferenceColor(IDebugPreferenceConstants.CONSOLE_SYS_OUT_COLOR); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/FileLink.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/FileLink.java index 5bf3cc8a9..aa3d73139 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/FileLink.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/FileLink.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -41,6 +41,7 @@ import org.eclipse.ui.texteditor.ITextEditor; * @since 2.1 * @noextend This class is not intended to be subclassed by clients. */ +@SuppressWarnings("deprecation") public class FileLink implements IConsoleHyperlink { private IFile fFile; @@ -72,6 +73,7 @@ public class FileLink implements IConsoleHyperlink { /* (non-Javadoc) * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkActivated() */ + @Override public void linkActivated() { IWorkbenchWindow window = DebugUIPlugin.getActiveWorkbenchWindow(); if (window != null) { @@ -123,12 +125,14 @@ public class FileLink implements IConsoleHyperlink { /* (non-Javadoc) * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkEntered() */ + @Override public void linkEntered() { } /* (non-Javadoc) * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkExited() */ + @Override public void linkExited() { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/IConsole.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/IConsole.java index 522de7e7d..55f46ec24 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/IConsole.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/IConsole.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -64,6 +64,7 @@ public interface IConsole { * @param length the length of the associated hyperlink text * @deprecated replaced with addLink(IHyperlink link, int offset, int length) */ + @Deprecated public void addLink(IConsoleHyperlink link, int offset, int length); /** @@ -91,6 +92,7 @@ public interface IConsole { * @return region of text associated with the hyperlink, or <code>null</code> * @deprecated replaced with getRegion(IHyperlink link) instead */ + @Deprecated public IRegion getRegion(IConsoleHyperlink link); /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/IConsoleHyperlink.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/IConsoleHyperlink.java index b735fac78..bf7ccf74c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/IConsoleHyperlink.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/IConsoleHyperlink.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,10 +19,13 @@ import org.eclipse.ui.console.IHyperlink; * Clients may implement this interface. * </p> * <p> - * Since 3.1, this interface now extends {@link org.eclipse.ui.console.IHyperlink}. + * Since 3.1, this interface now extends + * {@link org.eclipse.ui.console.IHyperlink}. * </p> + * * @since 2.1 * @deprecated replaced by org.eclipse.ui.console.IHyperlink */ +@Deprecated public interface IConsoleHyperlink extends IHyperlink { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/AbstractDebugContextProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/AbstractDebugContextProvider.java index ec983e352..15c18d638 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/AbstractDebugContextProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/AbstractDebugContextProvider.java @@ -47,6 +47,7 @@ public abstract class AbstractDebugContextProvider implements IDebugContextProvi /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextProvider#addDebugContextEventListener(org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextEventListener) */ + @Override public void addDebugContextListener(IDebugContextListener listener) { fListeners.add(listener); } @@ -54,6 +55,7 @@ public abstract class AbstractDebugContextProvider implements IDebugContextProvi /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextProvider#getPart() */ + @Override public IWorkbenchPart getPart() { return fPart; } @@ -61,6 +63,7 @@ public abstract class AbstractDebugContextProvider implements IDebugContextProvi /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextProvider#removeDebugContextEventListener(org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextEventListener) */ + @Override public void removeDebugContextListener(IDebugContextListener listener) { fListeners.remove(listener); } @@ -75,9 +78,11 @@ public abstract class AbstractDebugContextProvider implements IDebugContextProvi for (int i = 0; i < listeners.length; i++) { final IDebugContextListener listener = (IDebugContextListener) listeners[i]; SafeRunner.run(new ISafeRunnable() { + @Override public void run() throws Exception { listener.debugContextChanged(event); } + @Override public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java index a6227f6bf..cb4f4823d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java @@ -73,6 +73,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements setSystem(true); } + @Override protected IStatus run(IProgressMonitor monitor) { fRunnable.run(); return Status.OK_STATUS; @@ -100,6 +101,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#init(org.eclipse.debug.ui.memory.IMemoryRenderingSite, org.eclipse.debug.core.model.IMemoryBlock) */ + @Override public void init(IMemoryRenderingContainer container, IMemoryBlock block) { fContainer = container; fMemoryBlock = block; @@ -110,12 +112,14 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#dispose() */ + @Override public void dispose() { // disconnect from memory block when rendering is disposed if (fMemoryBlock instanceof IMemoryBlockExtension) { Runnable runnable = new Runnable(){ + @Override public void run() { ((IMemoryBlockExtension)fMemoryBlock).disconnect(AbstractMemoryRendering.this); }}; @@ -137,6 +141,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#activated() */ + @Override public void activated() { if (fContainer.getMemoryRenderingSite().getSynchronizationService() != null) fContainer.getMemoryRenderingSite().getSynchronizationService().setSynchronizationProvider(this); @@ -145,6 +150,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#deactivated() */ + @Override public void deactivated() { // do nothing when deactivated // we do not want to set the sync provider from rendering site @@ -156,12 +162,14 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#becomesVisible() */ + @Override public void becomesVisible() { fVisible = true; if (fMemoryBlock instanceof IMemoryBlockExtension) { Runnable runnable = new Runnable(){ + @Override public void run() { ((IMemoryBlockExtension)fMemoryBlock).connect(AbstractMemoryRendering.this); }}; @@ -172,11 +180,13 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#becomesHidden() */ + @Override public void becomesHidden() { fVisible = false; if (fMemoryBlock instanceof IMemoryBlockExtension) { Runnable runnable = new Runnable(){ + @Override public void run() { ((IMemoryBlockExtension)fMemoryBlock).disconnect(AbstractMemoryRendering.this); }}; @@ -187,6 +197,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#getMemoryBlock() */ + @Override public IMemoryBlock getMemoryBlock() { return fMemoryBlock; } @@ -194,6 +205,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#getRenderingId() */ + @Override public String getRenderingId() { return fRenderingId; @@ -202,6 +214,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { if (fPropertyListeners == null) @@ -213,6 +226,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { if (fPropertyListeners == null) @@ -223,6 +237,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#getImage() */ + @Override public Image getImage() { return decorateImage(null); } @@ -243,6 +258,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#getLabel() */ + @Override public String getLabel() { if (fMemoryBlock == null) @@ -341,6 +357,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements ISelectionProvider selProvider = site.getSite().getSelectionProvider(); fMenuListener = new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); }}; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRenderingBindingsProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRenderingBindingsProvider.java index 7c1c50675..aaec45a6d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRenderingBindingsProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRenderingBindingsProvider.java @@ -31,6 +31,7 @@ public abstract class AbstractMemoryRenderingBindingsProvider implements IMemory /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#addListener(org.eclipse.debug.ui.memory.IMemoryRenderingBindingsListener) */ + @Override public void addListener(IMemoryRenderingBindingsListener listener) { if (fListeners == null) { fListeners = new ListenerList(); @@ -40,6 +41,7 @@ public abstract class AbstractMemoryRenderingBindingsProvider implements IMemory /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#removeListener(org.eclipse.debug.ui.memory.IMemoryRenderingBindingsListener) */ + @Override public void removeListener(IMemoryRenderingBindingsListener listener) { if (fListeners != null) { fListeners.remove(listener); @@ -60,9 +62,11 @@ public abstract class AbstractMemoryRenderingBindingsProvider implements IMemory if (listeners[i] instanceof IMemoryRenderingBindingsListener) { final IMemoryRenderingBindingsListener listener = (IMemoryRenderingBindingsListener)listeners[i]; ISafeRunnable runnable = new ISafeRunnable () { + @Override public void handleException(Throwable exception) { DebugUIPlugin.log(exception); } + @Override public void run() throws Exception { listener.memoryRenderingBindingsChanged(); }}; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java index b46a29be9..2db7b143b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java @@ -268,6 +268,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { fIsShowAddressColumn = !fIsShowAddressColumn; resizeColumnsToPreferredSize(); @@ -296,6 +297,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".NextPageAction_context"); //$NON-NLS-1$ } + @Override public void run() { BigInteger address = fContentInput.getLoadAddress(); address = address.add(BigInteger.valueOf(getPageSizeInUnits())); @@ -312,6 +314,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".PrevPageAction_context"); //$NON-NLS-1$ } + @Override public void run() { BigInteger address = fContentInput.getLoadAddress(); address = address.subtract(BigInteger.valueOf(getPageSizeInUnits())); @@ -331,6 +334,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { // if memory view table font has changed if (event.getProperty().equals(IInternalDebugUIConstants.FONT_NAME)) @@ -365,12 +369,14 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } // do not handle event if the rendering is displaying an error - if (isDisplayingError()) + if (isDisplayingError()) { return; + } // do not handle property change event if the rendering is not visible - if (!isVisible()) + if (!isVisible()) { return; + } if (event.getProperty().equals(IDebugPreferenceConstants.PREF_DYNAMIC_LOAD_MEM)) { handleDyanicLoadChanged(); @@ -396,18 +402,21 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering return; } - if (evtSrc == this) + if (evtSrc == this) { return; + } - if (!(evtSrc instanceof IMemoryRendering)) + if (!(evtSrc instanceof IMemoryRendering)) { return; + } IMemoryRendering rendering = (IMemoryRendering)evtSrc; IMemoryBlock memoryBlock = rendering.getMemoryBlock(); // do not handle event from renderings displaying other memory blocks - if (memoryBlock != getMemoryBlock()) + if (memoryBlock != getMemoryBlock()) { return; + } String propertyName = event.getProperty(); Object value = event.getNewValue(); @@ -428,8 +437,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering { if (needMoreLines()) { - if (isDynamicLoad()) + if (isDynamicLoad()) { reloadTable(getTopVisibleAddress(), false); + } } topVisibleAddressChanged((BigInteger)value, false); } @@ -453,8 +463,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering else { BigInteger pageStart = (BigInteger)getSynchronizedProperty(IInternalDebugUIConstants.PROPERTY_PAGE_START_ADDRESS); - if (pageStart == null) + if (pageStart == null) { pageStart = fTopRowAddress; + } handlePageStartAddressChanged(pageStart); } } @@ -496,14 +507,16 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // continue to handle event if caller decides to force the rendering // to move to the top visible address even when the rendering // is not visible - if (!isVisible() && !force) + if (!isVisible() && !force) { return; + } // do not handle event if the base address of the memory // block has changed, wait for debug event to update to // new location - if (isBaseAddressChanged()) + if (isBaseAddressChanged()) { return; + } if (!address.equals(fTopRowAddress)) { @@ -532,10 +545,11 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering setTopIndex(table, index); } - if (isAddressVisible(fSelectedAddress)) + if (isAddressVisible(fSelectedAddress)) { fTableCursor.setVisible(true); - else + } else { fTableCursor.setVisible(false); + } } @@ -547,8 +561,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering Object evtLockClient = new Object(); try { - if (!fEvtHandleLock.acquireLock(evtLockClient)) + if (!fEvtHandleLock.acquireLock(evtLockClient)) { return; + } if (!isAddressOutOfRange(address)) { @@ -572,18 +587,20 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } else { - if (isDynamicLoad() && getBufferThreshold(BUFFER_START) > 0) + if (isDynamicLoad() && getBufferThreshold(BUFFER_START) > 0) { reloadTable(address, false); - else + } else { setTopIndex(table, index); + } } } else if ((numInBuffer-(index+getNumberOfVisibleLines())) <= getBufferThreshold(BUFFER_END)) { - if (!isAtBottomLimit() && isDynamicLoad() && getBufferThreshold(BUFFER_END) > 0) + if (!isAtBottomLimit() && isDynamicLoad() && getBufferThreshold(BUFFER_END) > 0) { reloadTable(address, false); - else + } else { setTopIndex(table, index); + } } } } @@ -593,11 +610,12 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering reloadTable(address, false); } - if (isAddressVisible(fSelectedAddress)) + if (isAddressVisible(fSelectedAddress)) { fTableCursor.setVisible(true); - else + } else { fTableCursor.setVisible(false); } + } finally { fEvtHandleLock.releaseLock(evtLockClient); @@ -612,17 +630,19 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // do not handle event if the base address of the memory // block has changed, wait for debug event to update to // new location - if (isBaseAddressChanged()) + if (isBaseAddressChanged()) { return; + } try { // do not handle event if the event is out of range and the // rendering is in non-dynamic-load mode, otherwise, will // cause rendering to continue to scroll when it shouldn't - if (isDynamicLoad()) + if (isDynamicLoad()) { goToAddress(value); - else if (!isAddressOutOfRange(value)) + } else if (!isAddressOutOfRange(value)) { goToAddress(value); + } } catch (DebugException e) { // do nothing } @@ -631,23 +651,28 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering private void handlePageStartAddressChanged(BigInteger address) { // do not handle if in dynamic mode - if (isDynamicLoad()) + if (isDynamicLoad()) { return; + } - if (fContentInput == null) + if (fContentInput == null) { return; + } - if (!(getMemoryBlock() instanceof IMemoryBlockExtension)) + if (!(getMemoryBlock() instanceof IMemoryBlockExtension)) { return; + } // do not handle event if the base address of the memory // block has changed, wait for debug event to update to // new location - if (isBaseAddressChanged()) + if (isBaseAddressChanged()) { return; + } - if(fContentProvider.getBufferTopAddress().equals(address)) + if(fContentProvider.getBufferTopAddress().equals(address)) { return; + } BigInteger start = fContentInput.getStartAddress(); BigInteger end = fContentInput.getEndAddress(); @@ -655,8 +680,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // smaller than start address, load at start address if (address.compareTo(start) < 0) { - if (isAtTopLimit()) + if (isAtTopLimit()) { return; + } address = start; } @@ -664,8 +690,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // bigger than end address, no need to load, already at top if (address.compareTo(end) > 0) { - if (isAtBottomLimit()) + if (isAtBottomLimit()) { return; + } address = end.subtract(BigInteger.valueOf(getPageSizeInUnits())); } @@ -696,6 +723,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public Control createControl(Composite parent) { fPageBook = new PageBook(parent, SWT.NONE); @@ -719,10 +747,11 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering fTableViewer= new TableViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.HIDE_SELECTION | SWT.BORDER); TableRenderingLabelProvider labelProvider; - if (hasCustomizedDecorations()) + if (hasCustomizedDecorations()) { labelProvider = new TableRenderingLabelProviderEx(this); - else + } else { labelProvider = new TableRenderingLabelProvider(this); + } fTableViewer.setLabelProvider(labelProvider); @@ -743,8 +772,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // set up addressable size and figure out number of bytes required per line fAddressableSize = -1; try { - if (getMemoryBlock() instanceof IMemoryBlockExtension) + if (getMemoryBlock() instanceof IMemoryBlockExtension) { fAddressableSize = ((IMemoryBlockExtension)getMemoryBlock()).getAddressableSize(); + } } catch (DebugException e1) { // log error and default to 1 fAddressableSize = 1; @@ -752,8 +782,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering return; } - if (getAddressableSize() < 1) + if (getAddressableSize() < 1) { fAddressableSize = 1; + } // set up initial format setupInitialFormat(); @@ -774,6 +805,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering { // add listener to reload when we know the number of lines to load fTableViewer.getTable().addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { fTableViewer.getTable().removePaintListener(this); fContentInput.setNumLines(getNumberOfVisibleLines()); @@ -818,6 +850,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // set up table cursor createCursor(fTableViewer.getTable(), fSelectedAddress); fTableViewer.getTable().addMouseListener(new MouseAdapter() { + @Override public void mouseDown(MouseEvent e) { handleTableMouseEvent(e); }}); @@ -828,6 +861,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering createPopupMenu(fTableCursor); fMenuListener = new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { fillContextMenu(manager); manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); @@ -863,6 +897,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering JFaceResources.getFontRegistry().addListener(this); fScrollbarSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { handleScrollBarSelection(); @@ -1007,8 +1042,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering if (elmt != null) { - if (elmt.supportsProperty(this, IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL)) + if (elmt.supportsProperty(this, IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL)) { defaultColSize = getDefaultFromPersistableElement(IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL); + } } if (defaultColSize <= 0) @@ -1017,8 +1053,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering defaultColSize = getDefaultColumnSizeByModel(getMemoryBlock().getModelIdentifier()); } - if (defaultColSize > 0) + if (defaultColSize > 0) { columnSize = defaultColSize * getAddressableSize(); + } } return columnSize; } @@ -1052,12 +1089,14 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } } - if (defaultRowSize <= 0) + if (defaultRowSize <= 0) { // no synchronized property, ask preference store by id defaultRowSize = getDefaultRowSizeByModel(getMemoryBlock().getModelIdentifier()); + } - if (defaultRowSize > 0) + if (defaultRowSize > 0) { bytePerLine = defaultRowSize * getAddressableSize(); + } } return bytePerLine; } @@ -1107,6 +1146,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering fTableCursor.setVisible(true); fCursorKeyAdapter = new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { handleCursorKeyPressed(e); @@ -1115,6 +1155,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering fTableCursor.addKeyListener(fCursorKeyAdapter); fCursorTraverseListener = new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { handleCursorTraverseEvt(e); }}; @@ -1122,6 +1163,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering fTableCursor.addTraverseListener(fCursorTraverseListener); fCursorMouseListener = new MouseAdapter() { + @Override public void mouseDown(MouseEvent e) { handleCursorMouseEvent(e); }}; @@ -1130,9 +1172,11 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // cursor may be disposed before disposed is called // remove listeners whenever the cursor is disposed fTableCursor.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { - if (fTableCursor == null) + if (fTableCursor == null) { return; + } fTableCursor.removeTraverseListener(fCursorTraverseListener); fTableCursor.removeKeyListener(fCursorKeyAdapter); fTableCursor.removeMouseListener(fCursorMouseListener); @@ -1140,10 +1184,12 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering }}); fCursorSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { - if (!fEvtHandleLock.acquireLock(this)) + if (!fEvtHandleLock.acquireLock(this)) { return; + } handleCursorMoved(); @@ -1161,8 +1207,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering private void handleCursorTraverseEvt(TraverseEvent e){ - if (fTableCursor.getRow() == null) + if (fTableCursor.getRow() == null) { return; + } Table table = (Table)fTableCursor.getParent(); int row = table.indexOf(fTableCursor.getRow()); @@ -1191,8 +1238,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } Object evtLockClient = new Object(); - if (!fEvtHandleLock.acquireLock(evtLockClient)) + if (!fEvtHandleLock.acquireLock(evtLockClient)) { return; + } handleCursorMoved(); @@ -1206,8 +1254,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering */ private void handleCursorMoved() { - if (fIsDisposed) + if (fIsDisposed) { return; + } BigInteger selectedAddress = getSelectedAddressFromCursor(fTableCursor); @@ -1220,8 +1269,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // now check to see if the cursor is approaching buffer limit TableItem item = fTableCursor.getRow(); - if (item == null) + if (item == null) { return; + } if (getMemoryBlock() instanceof IMemoryBlockExtension) { @@ -1296,8 +1346,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } private BigInteger getAddressFromTableItem(TableItem row, int col) { - if (row == null) + if (row == null) { return null; + } // get row address String temp = ((TableRenderingLine)row.getData()).getAddress(); @@ -1326,12 +1377,14 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering */ private boolean setCursorAtAddress(BigInteger address) { - if (fContentProvider.getBufferTopAddress() == null) + if (fContentProvider.getBufferTopAddress() == null) { return false; + } // selected address is out of range, simply return false - if (address.compareTo(fContentProvider.getBufferTopAddress()) < 0) + if (address.compareTo(fContentProvider.getBufferTopAddress()) < 0) { return false; + } // calculate selected row address int addressableUnit = getAddressableUnitPerLine(); @@ -1353,8 +1406,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering int colAddressableUnit = getAddressableUnitPerColumn(); int col = ((offset.intValue()/colAddressableUnit)+1); - if (col == 0) + if (col == 0) { col = 1; + } fTableCursor.setSelection(row, col); @@ -1370,6 +1424,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * @return true if format is successful, false, otherwise * */ + @Override public boolean format(int bytesPerLine, int columnSize) { @@ -1398,17 +1453,20 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering fColumnSize = columnSize; Object evtLockClient = new Object(); - if (!fEvtHandleLock.acquireLock(evtLockClient)) + if (!fEvtHandleLock.acquireLock(evtLockClient)) { return false; + } // if the tab is already created and is being reformatted if (fIsCreated) { - if (fTableViewer == null) + if (fTableViewer == null) { return false; + } - if (fTableViewer.getTable() == null) + if (fTableViewer.getTable() == null) { return false; + } // clean up old columns TableColumn[] oldColumns = fTableViewer.getTable().getColumns(); @@ -1441,8 +1499,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } // check that column labels are not null - if (columnLabels == null) + if (columnLabels == null) { columnLabels = new String[0]; + } for (int i=0;i<byteColumns.length; i++) { @@ -1520,12 +1579,14 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // for Linux GTK, this must happen after table viewer is refreshed int i = findAddressIndex(fTopRowAddress); - if (i >= 0) + if (i >= 0) { setTopIndex(fTableViewer.getTable(), i); + } - if (isAddressVisible(selectedAddress)) + if (isAddressVisible(selectedAddress)) { // after refresh, make sure the cursor is at the correct position - setCursorAtAddress(selectedAddress); + setCursorAtAddress(selectedAddress); + } } fEvtHandleLock.releaseLock(evtLockClient); @@ -1572,8 +1633,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering styleText = fTextViewer.getTextWidget(); - if (styleText != null) + if (styleText != null) { styleText.setText(DebugUIMessages.AbstractTableRendering_3 + e.getMessage()); + } fPageBook.showPage(fTextViewer.getControl()); // clear content cache if we need to display error @@ -1593,6 +1655,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#getControl() */ + @Override public Control getControl() { return fPageBook; } @@ -1602,6 +1665,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * * @return the addressable size of this rendering's memory block in bytes */ + @Override public int getAddressableSize() { return fAddressableSize; } @@ -1610,8 +1674,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering { IMemoryRenderingSynchronizationService syncService = getMemoryRenderingContainer().getMemoryRenderingSite().getSynchronizationService(); - if (syncService == null) + if (syncService == null) { return null; + } return syncService.getProperty(getMemoryBlock(), propertyId); } @@ -1623,8 +1688,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering */ private int getNumberOfVisibleLines() { - if(fTableViewer == null) + if(fTableViewer == null) { return -1; + } Table table = fTableViewer.getTable(); int height = fTableViewer.getTable().getSize().y; @@ -1677,8 +1743,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering { IMemoryRenderingSynchronizationService syncService = getMemoryRenderingContainer().getMemoryRenderingSite().getSynchronizationService(); - if (syncService == null) + if (syncService == null) { return; + } syncService.addPropertyChangeListener(this, null); @@ -1686,8 +1753,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // do not update sync property in this case if (!isDisplayingError()) { - if (syncService.getSynchronizationProvider() == null) + if (syncService.getSynchronizationProvider() == null) { syncService.setSynchronizationProvider(this); + } // check if there is already synchronization info available Object selectedAddress =getSynchronizedProperty( AbstractTableRendering.PROPERTY_SELECTED_ADDRESS); @@ -1698,8 +1766,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering if (!isDynamicLoad()) { Object pageStartAddress = getSynchronizedProperty(IInternalDebugUIConstants.PROPERTY_PAGE_START_ADDRESS); - if (pageStartAddress == null) + if (pageStartAddress == null) { updateSyncPageStartAddress(); + } } // if info is available, some other view tab has already been @@ -1733,8 +1802,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering BigInteger pageStart = (BigInteger)getSynchronizedProperty(IInternalDebugUIConstants.PROPERTY_PAGE_START_ADDRESS); if (pageStart != null && fContentInput != null && fContentInput.getLoadAddress() != null) { - if (!fContentInput.getLoadAddress().equals(pageStart)) + if (!fContentInput.getLoadAddress().equals(pageStart)) { handlePageStartAddressChanged(pageStart); + } } else if (pageStart != null) { @@ -1781,6 +1851,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering /** * Resize column to the preferred size. */ + @Override public void resizeColumnsToPreferredSize() { // pack columns Table table = fTableViewer.getTable(); @@ -1802,8 +1873,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering */ private void updateSyncSelectedAddress() { - if (!fIsCreated) + if (!fIsCreated) { return; + } PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractTableRendering.PROPERTY_SELECTED_ADDRESS, null, fSelectedAddress); firePropertyChangedEvent(event); } @@ -1813,8 +1885,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering */ private void updateSyncColSize() { - if (!fIsCreated) + if (!fIsCreated) { return; + } PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractTableRendering.PROPERTY_COL_SIZE, null, new Integer(fColumnSize)); firePropertyChangedEvent(event); @@ -1825,8 +1898,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering */ private void updateSyncRowSize() { - if (!fIsCreated) + if (!fIsCreated) { return; + } PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractTableRendering.PROPERTY_ROW_SIZE, null, new Integer(fBytePerLine)); firePropertyChangedEvent(event); @@ -1837,8 +1911,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering */ private void updateSyncTopAddress() { - if (!fIsCreated) + if (!fIsCreated) { return; + } PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractTableRendering.PROPERTY_TOP_ADDRESS, null, fTopRowAddress); firePropertyChangedEvent(event); @@ -1846,11 +1921,13 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering private void updateSyncPageStartAddress() { - if (!fIsCreated) + if (!fIsCreated) { return; + } - if (isBaseAddressChanged()) + if (isBaseAddressChanged()) { return; + } BigInteger pageStart; if (isDynamicLoad()) @@ -1910,6 +1987,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * * @return number of addressable units per row */ + @Override public int getAddressableUnitPerLine() { return fBytePerLine / getAddressableSize(); } @@ -1919,6 +1997,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * * @return number of addressable units per column */ + @Override public int getAddressableUnitPerColumn() { return fColumnSize / getAddressableSize(); } @@ -1928,6 +2007,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * * @return the number of bytes displayed in a single column cell */ + @Override public int getBytesPerColumn() { return fColumnSize; @@ -1938,6 +2018,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * * @return the number of bytes displayed in a row */ + @Override public int getBytesPerLine() { return fBytePerLine; @@ -1946,6 +2027,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering /** * Updates labels of this rendering. */ + @Override public void updateLabels() { // update tab labels @@ -1964,9 +2046,11 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * * @return label of this rendering */ + @Override public String getLabel() { - if (fLabel == null) + if (fLabel == null) { fLabel = buildLabel(true); + } return fLabel; } @@ -1996,7 +2080,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } if (label.startsWith("&")) //$NON-NLS-1$ + { label = "&" + label; //$NON-NLS-1$ + } try { if (showAddress && ((IMemoryBlockExtension)getMemoryBlock()).getBigBaseAddress() != null) @@ -2017,7 +2103,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering String preName = DebugUITools.getMemoryRenderingManager().getRenderingType(getRenderingId()).getLabel(); if (preName != null) + { label += " <" + preName + ">"; //$NON-NLS-1$ //$NON-NLS-2$ + } return decorateLabel(label); } @@ -2033,8 +2121,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } // check that column labels returned are not null - if (columnLabels == null) + if (columnLabels == null) { columnLabels = new String[0]; + } int numByteColumns = fBytePerLine/fColumnSize; @@ -2071,6 +2160,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * Refresh the table viewer with the current top visible address. * Update labels in the memory rendering. */ + @Override public void refresh() { // refresh at start address of this memory block @@ -2112,10 +2202,11 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering else { // reload at top of table - if (isDynamicLoad()) + if (isDynamicLoad()) { address = getTopVisibleAddress(); - else + } else { address = fContentInput.getLoadAddress(); + } reloadTable(address, true); } } catch (DebugException e) { @@ -2132,18 +2223,20 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering synchronized private void reloadTable(BigInteger topAddress, boolean updateDelta){ - if (fTableViewer == null) + if (fTableViewer == null) { return; + } try { Table table = (Table)fTableViewer.getControl(); TableRenderingContentInput input; - if (isDynamicLoad()) + if (isDynamicLoad()) { input = new TableRenderingContentInput(this, fPreBuffer, fPostBuffer, topAddress, getNumberOfVisibleLines(), updateDelta, null); - else + } else { input = new TableRenderingContentInput(this, fContentInput.getPreBuffer(), fContentInput.getPostBuffer(), topAddress, fPageSize, updateDelta, null); + } fContentInput = input; fTableViewer.setInput(fContentInput); @@ -2161,8 +2254,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } // cursor needs to be refreshed after reload - if (isAddressVisible(fSelectedAddress)) + if (isAddressVisible(fSelectedAddress)) { setCursorAtAddress(fSelectedAddress); + } } else { @@ -2184,8 +2278,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering private BigInteger getTopVisibleAddress() { - if (fTableViewer == null) + if (fTableViewer == null) { return BigInteger.valueOf(0); + } Table table = fTableViewer.getTable(); int topIndex = getTopVisibleIndex(table); @@ -2276,20 +2371,24 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#dispose() */ + @Override public void dispose() { try { // prevent rendering from being disposed again - if (fIsDisposed) + if (fIsDisposed) { return; + } fIsDisposed = true; - if (fContentProvider != null) + if (fContentProvider != null) { fContentProvider.dispose(); + } ScrollBar scroll = ((Table)fTableViewer.getControl()).getVerticalBar(); - if (scroll != null && !scroll.isDisposed()) + if (scroll != null && !scroll.isDisposed()) { scroll.removeSelectionListener(fScrollbarSelectionListener); + } if (!fTableCursor.isDisposed()) { @@ -2315,8 +2414,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // remove the view tab from the synchronizer IMemoryRenderingSynchronizationService syncService = getMemoryRenderingContainer().getMemoryRenderingSite().getSynchronizationService(); - if (syncService != null) + if (syncService != null) { syncService.removePropertyChangeListener(this); + } DebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this); @@ -2371,12 +2471,14 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * @param address address to position cursor at * @throws DebugException if an exception occurs */ + @Override public void goToAddress(BigInteger address) throws DebugException { Object evtLockClient = new Object(); try { - if (!fEvtHandleLock.acquireLock(evtLockClient)) + if (!fEvtHandleLock.acquireLock(evtLockClient)) { return; + } // if address is within the range, highlight if (!isAddressOutOfRange(address)) @@ -2468,8 +2570,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering { // if view tab is not yet created // cursor should always be visible - if (!fIsCreated) + if (!fIsCreated) { return true; + } BigInteger topVisible = getTopVisibleAddress(); int addressableUnit = getAddressableUnitPerLine(); @@ -2513,8 +2616,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering Object evtLockClient = new Object(); try { - if (fIsDisposed) + if (fIsDisposed) { return; + } BigInteger address = getTopVisibleAddress(); @@ -2524,8 +2628,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering updateSyncTopAddress(); } - if (!fEvtHandleLock.acquireLock(evtLockClient)) + if (!fEvtHandleLock.acquireLock(evtLockClient)) { return; + } if (getMemoryBlock() instanceof IMemoryBlockExtension) { @@ -2551,8 +2656,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering else if (getBufferThreshold(BUFFER_END) != 0 && (numInBuffer-(index+getNumberOfVisibleLines())) <= getBufferThreshold(BUFFER_END)) { - if (!isAtBottomLimit() && getBufferThreshold(BUFFER_END) > 0) + if (!isAtBottomLimit() && getBufferThreshold(BUFFER_END) > 0) { reloadTable(address, false); + } } } else @@ -2562,10 +2668,11 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } } - if (isAddressVisible(fSelectedAddress)) + if (isAddressVisible(fSelectedAddress)) { fTableCursor.setVisible(true); - else + } else { fTableCursor.setVisible(false); + } } } finally @@ -2583,8 +2690,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering BigInteger startBufferAddress = fContentProvider.getBufferTopAddress(); startBufferAddress = MemoryViewUtil.alignToBoundary(startBufferAddress, getAddressableUnitPerLine()); - if (startAddress.compareTo(startBufferAddress) == 0) + if (startAddress.compareTo(startBufferAddress) == 0) { return true; + } return false; } @@ -2597,8 +2705,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering BigInteger endBufferAddress = fContentProvider.getBufferEndAddress(); endBufferAddress = MemoryViewUtil.alignToBoundary(endBufferAddress, getAddressableUnitPerLine()); - if (endAddress.compareTo(endBufferAddress) == 0) + if (endAddress.compareTo(endBufferAddress) == 0) { return true; + } return false; } @@ -2611,8 +2720,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering TableItem firstItem = table.getItem(0); TableItem lastItem = table.getItem(table.getItemCount()-1); - if (firstItem == null || lastItem == null) + if (firstItem == null || lastItem == null) { return true; + } TableRenderingLine first = (TableRenderingLine)firstItem.getData(); TableRenderingLine last = (TableRenderingLine) lastItem.getData(); @@ -2640,16 +2750,18 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering BigInteger numTopLine = topVisibleAddress.subtract(startAddress).divide(BigInteger.valueOf(addressableUnit)); if (numTopLine.compareTo(BigInteger.valueOf(getBufferThreshold(BUFFER_START))) <= 0 && (startAddress.compareTo(BigInteger.valueOf(0)) != 0)) { - if (!isAtTopLimit() && getBufferThreshold(BUFFER_START) > 0) + if (!isAtTopLimit() && getBufferThreshold(BUFFER_START) > 0) { return true; + } } // if there are only 3 lines left at the bottom, refresh BigInteger numBottomLine = lastAddress.subtract(lastVisibleAddrss).divide(BigInteger.valueOf(addressableUnit)); if (numBottomLine.compareTo(BigInteger.valueOf(getBufferThreshold(BUFFER_END))) <= 0) { - if (!isAtBottomLimit() && getBufferThreshold(BUFFER_END) > 0) + if (!isAtBottomLimit() && getBufferThreshold(BUFFER_END) > 0) { return true; + } } return false; @@ -2681,8 +2793,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } // if column position cannot be determined, return - if (colNum < 1) + if (colNum < 1) { return; + } // handle user mouse click onto table // move cursor to new position @@ -2706,10 +2819,12 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering */ private void columnSizeChanged(final int newColumnSize) { // ignore event if view tab is disabled - if (!isVisible()) + if (!isVisible()) { return; + } Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { format(getBytesPerLine(), newColumnSize); } @@ -2722,17 +2837,20 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering private void rowSizeChanged(final int newRowSize) { // ignore event if view tab is disabled - if (!isVisible()) + if (!isVisible()) { return; + } int bytesPerLine = newRowSize; int col = getBytesPerColumn(); - if (bytesPerLine < getBytesPerColumn()) + if (bytesPerLine < getBytesPerColumn()) { col = bytesPerLine; + } final int columnSize = col; final int rowSize = bytesPerLine; Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { format(rowSize, columnSize); } @@ -2743,8 +2861,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering if (e.button == 1) { int col = fTableCursor.getColumn(); - if (col > 0 && col <= (getNumCol())) + if (col > 0 && col <= (getNumCol())) { activateCellEditor(null); + } } } @@ -2758,8 +2877,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering int col = fTableCursor.getColumn(); int row = findAddressIndex(fSelectedAddress); - if (row < 0) + if (row < 0) { return; + } // do not allow user to edit address column if (col == 0 || col > getNumCol()) { @@ -2790,8 +2910,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering boolean canEdit = cellModifier.canModify(element, (String)property); ((TableRenderingCellModifier)cellModifier).setEditActionInvoked(false); - if (!canEdit) + if (!canEdit) { return; + } // activate based on current cursor position TextCellEditor selectedEditor = (TextCellEditor)fTableViewer.getCellEditors()[col]; @@ -2844,6 +2965,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering */ private void addListeners(Text text) { fEditorFocusListener = new FocusAdapter() { + @Override public void focusLost(FocusEvent e) { handleTableEditorFocusLost(e); @@ -2852,6 +2974,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering text.addFocusListener(fEditorFocusListener); fEditorKeyListener = new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { handleKeyEventInEditor(e); } @@ -2875,6 +2998,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering Display.getDefault().syncExec(new Runnable() { + @Override public void run() { try @@ -2913,6 +3037,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering final KeyEvent e = event; Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { Text text = (Text)e.getSource(); @@ -2926,8 +3051,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering case SWT.ARROW_UP : // move text editor box up one row - if (row-1 < 0) + if (row-1 < 0) { return; + } // modify value for current cell modifyValue(row, col, text.getText()); @@ -2946,8 +3072,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // move text editor box down one row - if (row+1 >= fTableViewer.getTable().getItemCount()) + if (row+1 >= fTableViewer.getTable().getItemCount()) { return; + } // modify value for current cell modifyValue(row, col, text.getText()); @@ -3081,6 +3208,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#becomesHidden() */ + @Override public void becomesHidden() { if (isVisible() == false) @@ -3107,6 +3235,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#becomesVisible() */ + @Override public void becomesVisible() { // do not do anything if already visible @@ -3120,11 +3249,12 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering super.becomesVisible(); boolean value = DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugPreferenceConstants.PREF_DYNAMIC_LOAD_MEM); - if (value != isDynamicLoad()) + if (value != isDynamicLoad()) { // this call will cause a reload handleDyanicLoadChanged(); - else + } else { refresh(); + } synchronize(); updateRenderingLabel(true); @@ -3138,6 +3268,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * * @deprecated use <code>resetRendering</code> to reset this rendering. */ + @Deprecated public void reset() { try { @@ -3176,6 +3307,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * * @return the currently selected address in this rendering */ + @Override public BigInteger getSelectedAddress() { return fSelectedAddress; } @@ -3185,10 +3317,12 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * * @return the currently selected content in this rendering */ + @Override public String getSelectedAsString() { - if (isAddressOutOfRange(fSelectedAddress)) + if (isAddressOutOfRange(fSelectedAddress)) { return IInternalDebugCoreConstants.EMPTY_STRING; + } int col = fTableCursor.getColumn(); TableItem rowItem = fTableCursor.getRow(); @@ -3216,10 +3350,12 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * @return the currently selected content in array of MemoryByte. * Returns an empty array if the selected address is out of buffered range. */ + @Override public MemoryByte[] getSelectedAsBytes() { - if (isAddressOutOfRange(fSelectedAddress)) + if (isAddressOutOfRange(fSelectedAddress)) { return new MemoryByte[0]; + } int col = fTableCursor.getColumn(); TableItem rowItem = fTableCursor.getRow(); @@ -3231,8 +3367,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } Object data = rowItem.getData(); - if (data == null || !(data instanceof TableRenderingLine)) + if (data == null || !(data instanceof TableRenderingLine)) { return new MemoryByte[0]; + } TableRenderingLine line = (TableRenderingLine)data; int offset = (col-1)*(getAddressableUnitPerColumn()*getAddressableSize()); @@ -3255,6 +3392,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * @return the number of characters a byte will convert to * or -1 if unknown */ + @Override public int getNumCharsPerByte() { return -1; @@ -3288,37 +3426,46 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { - if (adapter == IColorProvider.class) + if (adapter == IColorProvider.class) { return getColorProviderAdapter(); + } - if (adapter == ILabelProvider.class) + if (adapter == ILabelProvider.class) { return getLabelProviderAdapter(); + } - if (adapter == IFontProvider.class) + if (adapter == IFontProvider.class) { return getFontProviderAdapter(); + } - if (adapter == IMemoryBlockTablePresentation.class) + if (adapter == IMemoryBlockTablePresentation.class) { return getTablePresentationAdapter(); + } if (adapter == IWorkbenchAdapter.class) { // needed workbench adapter to fill the title of property page if (fWorkbenchAdapter == null) { fWorkbenchAdapter = new IWorkbenchAdapter() { + @Override public Object[] getChildren(Object o) { return new Object[0]; } + @Override public ImageDescriptor getImageDescriptor(Object object) { return null; } + @Override public String getLabel(Object o) { return AbstractTableRendering.this.getLabel(); } + @Override public Object getParent(Object o) { return null; } @@ -3330,6 +3477,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering if (adapter == IMemoryBlockConnection.class) { if (fConnection == null) { fConnection = new IMemoryBlockConnection() { + @Override public void update() { try { fContentProvider.takeContentSnapshot(); @@ -3346,13 +3494,14 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering fContentInput.setLoadAddress(address); } fContentProvider.loadContentForExtendedMemoryBlock(); - } - else + } else { fContentProvider.loadContentForSimpleMemoryBlock(); + } // update UI asynchronously Display display = DebugUIPlugin.getDefault().getWorkbench().getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { updateLabels(); @@ -3375,8 +3524,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering fTableCursor.setVisible(false); } - if (!isDynamicLoad()) + if (!isDynamicLoad()) { updateSyncPageStartAddress(); + } updateSyncTopAddress(); } @@ -3397,8 +3547,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering { if (getFontProviderAdapter() == null && getColorProviderAdapter() == null && - getLabelProviderAdapter() == null) + getLabelProviderAdapter() == null) { return false; + } return true; } @@ -3411,8 +3562,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering BigInteger baseAddress = ((IMemoryBlockExtension)mb).getBigBaseAddress(); if (baseAddress != null) { - if (!baseAddress.equals(fContentInput.getContentBaseAddress())) + if (!baseAddress.equals(fContentInput.getContentBaseAddress())) { return true; + } } } } catch (DebugException e1) { @@ -3529,23 +3681,28 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering private TableItem fTooltipItem = null; private int fCol = -1; + @Override public void mouseExit(MouseEvent e){ - if (!fToolTipShell.isDisposed()) + if (!fToolTipShell.isDisposed()) { fToolTipShell.setVisible(false); + } fTooltipItem = null; } + @Override public void mouseHover(MouseEvent e){ Point hoverPoint = new Point(e.x, e.y); Control control = null; - if (e.widget instanceof Control) + if (e.widget instanceof Control) { control = (Control)e.widget; + } - if (control == null) + if (control == null) { return; + } hoverPoint = control.toDisplay(hoverPoint); TableItem item = getItem(hoverPoint); @@ -3599,8 +3756,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering start = fTableViewer.getTable().toDisplay(start); Point end = new Point(start.x + items[i].getBounds(0).width, start.y + items[i].getBounds(0).height); - if (start.y < point.y && point.y < end.y) + if (start.y < point.y && point.y < end.y) { return items[i]; + } } return null; } @@ -3652,6 +3810,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IResettableMemoryRendering#resetRendering() */ + @Override public void resetRendering() throws DebugException { resetToBaseAddress(); } @@ -3686,14 +3845,16 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering String str = getToolTipText(address, bytes); - if (str != null) + if (str != null) { ((Label) toolTipControl).setText(str); + } } else { String str = getToolTipText(address, new MemoryByte[] {}); - if (str != null) + if (str != null) { ((Label) toolTipControl).setText(str); + } } } } @@ -3767,13 +3928,15 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering { if (startOrEnd == BUFFER_START) { - if (BUFFER_THRESHOLD > fPreBuffer) + if (BUFFER_THRESHOLD > fPreBuffer) { return fPreBuffer; + } return BUFFER_THRESHOLD; } - if (BUFFER_THRESHOLD > fPostBuffer) + if (BUFFER_THRESHOLD > fPostBuffer) { return fPostBuffer; + } return BUFFER_THRESHOLD; } @@ -3791,6 +3954,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * Returns a string to pad the cell if the memory cannot be converted * successfully. */ + @Override abstract public String getString(String renderingTypeId, BigInteger address, MemoryByte[] data); /** @@ -3807,6 +3971,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering * @param newValue the string to be converted to bytes * @return the bytes converted from a string */ + @Override abstract public byte[] getBytes(String renderingTypeId, BigInteger address, MemoryByte[] currentValues, String newValue); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java index 97c7fbb70..fc5758bd8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java @@ -84,6 +84,7 @@ abstract public class AbstractTextRendering extends AbstractTableRendering { /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.AbstractTableRendering#getString(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[]) */ + @Override public String getString(String dataType, BigInteger address, MemoryByte[] data) { try { String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR); @@ -127,6 +128,7 @@ abstract public class AbstractTextRendering extends AbstractTableRendering { /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.AbstractTableRendering#getBytes(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String) */ + @Override public byte[] getBytes(String dataType, BigInteger address, MemoryByte[] currentValues, String data) { try { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.java index 6a7a19fc6..2473d0717 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.java @@ -26,6 +26,7 @@ public class AbstractSourceContainerBrowser implements ISourceContainerBrowser { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#addSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { return new ISourceContainer[0]; } @@ -36,12 +37,14 @@ public class AbstractSourceContainerBrowser implements ISourceContainerBrowser { * * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#canAddSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector) */ + @Override public boolean canAddSourceContainers(ISourceLookupDirector director) { return true; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#editSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public ISourceContainer[] editSourceContainers(Shell shell, ISourceLookupDirector director, ISourceContainer[] containers) { return new ISourceContainer[0]; } @@ -52,6 +55,7 @@ public class AbstractSourceContainerBrowser implements ISourceContainerBrowser { * * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#canEditSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public boolean canEditSourceContainers(ISourceLookupDirector director, ISourceContainer[] containers) { return false; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.java index 5eb24d2fb..36ef02631 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.java @@ -75,18 +75,21 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE /* (non-Javadoc) * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void doSave(IProgressMonitor monitor) { } /* (non-Javadoc) * @see org.eclipse.ui.part.EditorPart#doSaveAs() */ + @Override public void doSaveAs() { } /* (non-Javadoc) * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput) */ + @Override public void init(IEditorSite site, IEditorInput input) throws PartInitException { setSite(site); setInput(input); @@ -96,6 +99,7 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE /* (non-Javadoc) * @see org.eclipse.ui.part.EditorPart#isDirty() */ + @Override public boolean isDirty() { return false; } @@ -103,6 +107,7 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE /* (non-Javadoc) * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed() */ + @Override public boolean isSaveAsAllowed() { return false; } @@ -110,6 +115,7 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE /* (non-Javadoc) * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createPartControl(Composite parent) { GridLayout topLayout = new GridLayout(); GridData data = new GridData(); @@ -150,6 +156,7 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE button.setLayoutData(data); button.setText(SourceLookupUIMessages.addSourceLocation_addButton2); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { editSourceLookupPath(); } @@ -199,6 +206,7 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE /* (non-Javadoc) * @see org.eclipse.ui.part.WorkbenchPart#setFocus() */ + @Override public void setFocus() { if (fText != null) { fText.setFocus(); @@ -208,6 +216,7 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE /* (non-Javadoc) * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput) */ + @Override public void setInput(IEditorInput input) { super.setInput(input); setPartName(input.getName()); @@ -234,6 +243,7 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE { final IEditorPart editor = this; DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() { + @Override public void run() { IWorkbenchWindow activeWorkbenchWindow = DebugUIPlugin.getActiveWorkbenchWindow(); if (activeWorkbenchWindow != null) { @@ -252,6 +262,7 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE * * @see org.eclipse.ui.IWorkbenchPart#dispose() */ + @Override public void dispose() { if (fLaunchesListener != null) DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(fLaunchesListener); @@ -282,6 +293,7 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE protected void initialize() { fLaunchesListener = new ILaunchesListener2() { + @Override public void launchesTerminated(ILaunch[] launches) { Object artifact = getArtifact(); if (artifact instanceof IDebugElement) { @@ -296,13 +308,16 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE } } + @Override public void launchesRemoved(ILaunch[] launches) { launchesTerminated(launches); } + @Override public void launchesAdded(ILaunch[] launches) { } + @Override public void launchesChanged(ILaunch[] launches) { }}; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java index 1dc8eed64..4529315d2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2007 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.debug.ui.sourcelookup; -import com.ibm.icu.text.MessageFormat; - import org.eclipse.core.runtime.PlatformObject; import org.eclipse.debug.internal.core.IInternalDebugCoreConstants; import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIMessages; @@ -21,6 +19,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; +import com.ibm.icu.text.MessageFormat; + /** * Editor input for the <code>CommonSourceNotFoundEditor</code>. The editor * input can be created on an artifact that has a source association. @@ -61,6 +61,7 @@ public class CommonSourceNotFoundEditorInput extends PlatformObject implements I /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#exists() */ + @Override public boolean exists() { return false; } @@ -68,6 +69,7 @@ public class CommonSourceNotFoundEditorInput extends PlatformObject implements I /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getDefaultImageDescriptor(fArtifact); } @@ -75,6 +77,7 @@ public class CommonSourceNotFoundEditorInput extends PlatformObject implements I /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getName() */ + @Override public String getName() { return fLabel; } @@ -82,6 +85,7 @@ public class CommonSourceNotFoundEditorInput extends PlatformObject implements I /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getPersistable() */ + @Override public IPersistableElement getPersistable() { return null; } @@ -89,8 +93,9 @@ public class CommonSourceNotFoundEditorInput extends PlatformObject implements I /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getToolTipText() */ + @Override public String getToolTipText() { - return MessageFormat.format(SourceLookupUIMessages.addSourceLocation_editorMessage, new String[] { fLabel }); + return MessageFormat.format(SourceLookupUIMessages.addSourceLocation_editorMessage, new Object[] { fLabel }); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java index 7aa5cc772..4cc9f57b8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java @@ -65,6 +65,7 @@ public class SourceLookupDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { // create a composite with standard margins and spacing setTitle(SourceLookupUIMessages.manageSourceDialog_description); @@ -101,6 +102,7 @@ public class SourceLookupDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { ILaunchConfiguration config = fDirector.getLaunchConfiguration(); ILaunchConfigurationWorkingCopy copy = null; @@ -118,6 +120,7 @@ public class SourceLookupDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(SourceLookupUIMessages.manageSourceDialog_title); @@ -126,6 +129,7 @@ public class SourceLookupDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#close() */ + @Override public boolean close() { fPanel.dispose(); return super.close(); @@ -135,7 +139,8 @@ public class SourceLookupDialog extends TitleAreaDialog { * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() * @since 3.2 */ - protected IDialogSettings getDialogBoundsSettings() { + @Override + protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(getClass().getName()); if (section == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java index 26cb0af2a..af2f4edd6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java @@ -56,6 +56,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); @@ -80,6 +81,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { } @@ -87,6 +89,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { fSourceLookupPanel.initializeFrom(configuration); } @@ -94,6 +97,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { fSourceLookupPanel.performApply(configuration); } @@ -101,6 +105,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getId() */ + @Override public String getId() { return "org.eclipse.debug.ui.sourceLookupTab"; //$NON-NLS-1$ } @@ -108,6 +113,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return SourceLookupUIMessages.sourceTab_tabTitle; } @@ -115,6 +121,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() */ + @Override public Image getImage() { return DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_SRC_LOOKUP_TAB); } @@ -122,6 +129,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void activated(ILaunchConfigurationWorkingCopy workingCopy) { fSourceLookupPanel.activated(workingCopy); } @@ -129,6 +137,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose() */ + @Override public void dispose() { if (fSourceLookupPanel != null) { if (fSourceLookupPanel.getDirector() != null) { @@ -143,6 +152,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getErrorMessage() */ + @Override public String getErrorMessage() { if (fSourceLookupPanel != null) { return fSourceLookupPanel.getErrorMessage(); @@ -152,6 +162,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getMessage() */ + @Override public String getMessage() { if (fSourceLookupPanel != null) { return fSourceLookupPanel.getMessage(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.java index 5f8d0f05f..62ada047d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ package org.eclipse.debug.ui.sourcelookup; import java.util.ArrayList; + import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -53,6 +54,7 @@ public class WorkingSetSourceContainer extends CompositeSourceContainer{ /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName() */ + @Override public String getName() { return fWorkingSet.getName(); } @@ -60,6 +62,7 @@ public class WorkingSetSourceContainer extends CompositeSourceContainer{ /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj != null && obj instanceof WorkingSetSourceContainer) { return ((WorkingSetSourceContainer)obj).fWorkingSet.equals(fWorkingSet); @@ -67,6 +70,7 @@ public class WorkingSetSourceContainer extends CompositeSourceContainer{ return false; } + @Override public int hashCode() { return fWorkingSet.hashCode(); } @@ -74,6 +78,7 @@ public class WorkingSetSourceContainer extends CompositeSourceContainer{ /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType() */ + @Override public ISourceContainerType getType() { return getSourceContainerType(TYPE_ID); } @@ -81,13 +86,15 @@ public class WorkingSetSourceContainer extends CompositeSourceContainer{ /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers() */ + @Override protected ISourceContainer[] createSourceContainers() throws CoreException { IAdaptable[] elements = fWorkingSet.getElements(); - if(elements == null) + if(elements == null) { return new ISourceContainer[0]; + } - ArrayList locationList = new ArrayList(); + ArrayList<ISourceContainer> locationList = new ArrayList<ISourceContainer>(); for (int i = 0; i < elements.length; i++) { IResource resource = (IResource) elements[i].getAdapter(IResource.class); @@ -100,10 +107,11 @@ public class WorkingSetSourceContainer extends CompositeSourceContainer{ locationList.add(new ProjectSourceContainer((IProject)resource, true)); break; //if the element corresponds to an IFile, do nothing + default: + break; } } } - return (ISourceContainer[])locationList.toArray(new ISourceContainer[locationList.size()]); + return locationList.toArray(new ISourceContainer[locationList.size()]); } - } |