diff options
author | Andrey Loskutov | 2017-01-09 13:12:58 +0000 |
---|---|---|
committer | Andrey Loskutov | 2017-01-13 20:56:39 +0000 |
commit | ebb2566c95427e5c7cffd5e27f1e910b0a187b17 (patch) | |
tree | f9b87db9c4ccf476dfb8c8d4b5fcfcfd3f871bbb /org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements | |
parent | 1c1d17b82a223fb8fcc69b4883a71b8744899ccb (diff) | |
download | eclipse.platform.debug-ebb2566c95427e5c7cffd5e27f1e910b0a187b17.tar.gz eclipse.platform.debug-ebb2566c95427e5c7cffd5e27f1e910b0a187b17.tar.xz eclipse.platform.debug-ebb2566c95427e5c7cffd5e27f1e910b0a187b17.zip |
Bug 510100 - [cleanup] Get rid of trailing white space in platform.debugY20170119-1000I20170119-2000I20170119-1010I20170119-0345I20170118-2000I20170118-1215I20170117-2000I20170116-2000I20170115-2000I20170114-2000I20170113-2000
Also enabled "cleanup whitespace on save" actions for debug.ui and
debug.tests bundles.
Change-Id: I755b879ab1d49144a1bec3f4318dbb8b29521bb3
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements')
14 files changed, 159 insertions, 159 deletions
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 3de6db4e1..75167bce3 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 @@ -31,11 +31,11 @@ import org.eclipse.swt.graphics.RGB; /** * Asynchronous label adapter for debug elements. - * + * * @since 3.2 */ 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) */ @@ -112,11 +112,11 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter { Arrays.fill(rgbs, DebugElementHelper.getBackground(element)); return rgbs; } - + /** * Returns the number of columns in the given presentation context, or 1 * if there are no columns. - * + * * @param context presentation context * @return number of columns or 1 if none */ @@ -124,7 +124,7 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter { String[] columns = context.getColumns(); if (columns == null) { return 1; - } + } return columns.length; } 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 b8b34d385..7aafe1c40 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 @@ -14,36 +14,36 @@ package org.eclipse.debug.internal.ui.elements.adapters; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; /** - * The default breakpoints view input populates the view with content + * The default breakpoints view input populates the view with content * from the default breakpoint manager. - * + * * @since 3.6 */ public class DefaultBreakpointsViewInput { - + /** * The presentation context of the breakpoints view. */ final private IPresentationContext fContext; - + /** * Constructor. - * + * * @param context the presentation context for this input */ public DefaultBreakpointsViewInput(IPresentationContext context) { fContext = context; } - + /** * Returns the presentation context for this input. - * + * * @return the presentation context */ public IPresentationContext getContext() { return fContext; } - + /* * (non-Javadoc) * @see java.lang.Object#hashCode() @@ -68,9 +68,9 @@ public class DefaultBreakpointsViewInput { IPresentationContext context = ((DefaultBreakpointsViewInput) arg0).getContext(); if (getContext() != null && context != null) return getContext().equals(context); - } - - return super.equals(arg0); + } + + return super.equals(arg0); } } 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 33b394dea..19ebdbe7b 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.ICellModifier; */ @SuppressWarnings("deprecation") public class DefaultVariableCellModifier implements ICellModifier { - + /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String) */ @@ -68,7 +68,7 @@ public class DefaultVariableCellModifier implements ICellModifier { // The value column displays special characters escaped, so encode the string with any special characters escaped properly String valueExpression = DefaultLabelProvider.encodeEsacpedChars((String)value); IVariable variable = (IVariable) element; - DetailPaneAssignValueAction.assignValue(DebugUIPlugin.getShell(), variable, valueExpression); + DetailPaneAssignValueAction.assignValue(DebugUIPlugin.getShell(), variable, valueExpression); } } } 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 d47277d85..e152d7580 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Wind River Systems - initial API and implementation * Patrick Chuong (Texas Instruments) - Improve usability of the breakpoint view (Bug 238956) @@ -19,9 +19,9 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate; import org.eclipse.debug.ui.IDebugUIConstants; /** - * Default input provider supplies the expression manager as input to the + * Default input provider supplies the expression manager as input to the * expression view. - * + * * @since 3.4 */ public class DefaultViewerInputProvider extends ViewerInputProvider { @@ -30,12 +30,12 @@ public class DefaultViewerInputProvider extends ViewerInputProvider { * @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())) { + protected Object getViewerInput(Object source, IPresentationContext context, IViewerUpdate update) throws CoreException { + if (IDebugUIConstants.ID_BREAKPOINT_VIEW.equals(context.getId())) { DefaultBreakpointsViewInput input = new DefaultBreakpointsViewInput(context); return input; - } - + } + return DebugPlugin.getDefault().getExpressionManager(); } 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 d2a8c279a..47b0ed4db 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 @@ -7,7 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation - * WindRiver - Bug 192028 [Memory View] Memory view does not + * WindRiver - Bug 192028 [Memory View] Memory view does not * display memory blocks that do not reference IDebugTarget *******************************************************************************/ @@ -219,7 +219,7 @@ public class MemoryBlockContentAdapter extends AsynchronousContentAdapter { /** * Get memory to fit table - * + * * @param startingAddress * @param numberOfLines * @param updateDelta 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 bde25dd89..66a7dc3df 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -20,12 +20,12 @@ import org.eclipse.debug.ui.IDebugUIConstants; 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)}; - + return new ImageDescriptor[0]; } @@ -34,7 +34,7 @@ public class MemoryBlockLabelAdapter extends AsynchronousDebugLabelAdapter { * @return */ private String getLabel(IMemoryBlock memoryBlock) { - + String memoryBlockLabel = " "; //$NON-NLS-1$ if (memoryBlock instanceof IMemoryBlockExtension) { 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 9826e37db..5980d0c00 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ 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 eca235333..d5363430c 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -45,7 +45,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { @Override protected String[] getLabels(Object element, IPresentationContext context) throws CoreException { - + if (context instanceof MemoryViewPresentationContext) { MemoryViewPresentationContext tableRenderingContext = (MemoryViewPresentationContext)context; @@ -57,15 +57,15 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { { String addressStr = getColumnText(element, 0, tableRendering, descriptor); int numColumns = tableRendering.getAddressableUnitPerLine() / tableRendering.getAddressableUnitPerColumn(); - + String[] labels = new String[numColumns+2]; labels[0] = addressStr; - + for (int i=0; i<=numColumns; i++) { labels[i+1] = getColumnText(element, i+1, tableRendering, tableRendering.getAdapter(TableRenderingContentDescriptor.class)); } - + labels[labels.length - 1 ] = IInternalDebugCoreConstants.EMPTY_STRING; return labels; } @@ -73,7 +73,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { } return new String[0]; } - + private String getColumnText(Object element, int columnIndex, AbstractAsyncTableRendering tableRendering, TableRenderingContentDescriptor descriptor) { String columnLabel = null; @@ -86,9 +86,9 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { if (rowLabel != null) return rowLabel; } - + columnLabel = ((MemorySegment)element).getAddress().toString(16).toUpperCase(); - + int addressSize = descriptor.getAddressSize(); int prefillLength = addressSize * 2 - columnLabel.length(); StringBuffer buf = new StringBuffer(); @@ -101,21 +101,21 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { } buf.append(columnLabel); return buf.toString(); - + } else if (columnIndex > (tableRendering.getBytesPerLine()/tableRendering.getBytesPerColumn())) { columnLabel = " "; //$NON-NLS-1$ } else - { + { if (element instanceof MemorySegment) { MemorySegment segment = (MemorySegment)element; if (segment.getBytes().length != tableRendering.getBytesPerLine()) return IInternalDebugCoreConstants.EMPTY_STRING; } - + ILabelProvider labelProvider = tableRendering.getAdapter(ILabelProvider.class); if (labelProvider != null && columnIndex > 0) { @@ -124,14 +124,14 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { String label = labelProvider.getText(renderingElement); if (label != null) return label; - } + } } - + int start = (columnIndex-1)*tableRendering.getBytesPerColumn(); MemoryByte[] bytes = ((MemorySegment)element).getBytes(start, tableRendering.getBytesPerColumn()); BigInteger address = ((MemorySegment)element).getAddress(); - address = address.add(BigInteger.valueOf(start)); - + address = address.add(BigInteger.valueOf(start)); + columnLabel = tableRendering.getString(tableRendering.getRenderingId(), address, bytes); } return columnLabel; @@ -147,32 +147,32 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { { AbstractAsyncTableRendering tableRendering = (AbstractAsyncTableRendering)tableRenderingContext.getRendering(); int numColumns = tableRendering.getAddressableUnitPerLine() / tableRendering.getAddressableUnitPerColumn(); - + ImageDescriptor[] images = new ImageDescriptor[numColumns+2]; - + for (int i=0; i<=numColumns; i++) { images[i] = getColumnImageDescriptor(element, i, tableRendering); } - + images[images.length - 1 ] = null; return images; } } return new ImageDescriptor[0]; } - + private ImageDescriptor getColumnImageDescriptor(Object element, int columnIndex, AbstractAsyncTableRendering tableRendering) { if (columnIndex == 0) - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_OBJECT_MEMORY); - + return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_OBJECT_MEMORY); + if (element instanceof MemorySegment) { MemorySegment segment = (MemorySegment)element; if (segment.getBytes().length != tableRendering.getBytesPerLine()) return null; - + ILabelProvider labelProvider = tableRendering.getAdapter(ILabelProvider.class); if (labelProvider != null && columnIndex > 0) { @@ -183,9 +183,9 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { { return DebugElementHelper.getImageDescriptor(image); } - } + } } - + int start = (columnIndex-1)*tableRendering.getBytesPerColumn(); MemoryByte[] bytes = ((MemorySegment)element).getBytes(start, tableRendering.getBytesPerColumn()); @@ -195,17 +195,17 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { { if (!bytes[i].isHistoryKnown()) allKnown = false; - + if (bytes[i].isChanged()) unchanged = false; } - + if (allKnown) { // mark changed elements with changed icon if (!unchanged) return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_OBJECT_MEMORY_CHANGED); - + } } return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_OBJECT_MEMORY); @@ -221,7 +221,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { { AbstractAsyncTableRendering tableRendering = (AbstractAsyncTableRendering)tableRenderingContext.getRendering(); int numColumns = tableRendering.getAddressableUnitPerLine() / tableRendering.getAddressableUnitPerColumn(); - + FontData[] fontData = new FontData[numColumns+2]; for (int i=0; i<fontData.length-1; i++) @@ -231,18 +231,18 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { return fontData; } } - + return new FontData[0]; } - - private FontData getColumnFontData(Object element, int columnIndex, AbstractAsyncTableRendering tableRendering) + + private FontData getColumnFontData(Object element, int columnIndex, AbstractAsyncTableRendering tableRendering) { if (element instanceof MemorySegment) - { + { MemorySegment segment = (MemorySegment)element; if (segment.getBytes().length != tableRendering.getBytesPerLine()) return null; - + IFontProvider fontProvider = tableRendering.getAdapter(IFontProvider.class); if (fontProvider != null && columnIndex > 0) { @@ -251,7 +251,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { Font font = fontProvider.getFont(renderingElement); if (font != null) return font.getFontData()[0]; - } + } } } return null; @@ -260,7 +260,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { @Override protected RGB[] getForegrounds(Object element, IPresentationContext context) throws CoreException { - + if (context instanceof MemoryViewPresentationContext) { MemoryViewPresentationContext tableRenderingContext = (MemoryViewPresentationContext)context; @@ -268,34 +268,34 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { { AbstractAsyncTableRendering tableRendering = (AbstractAsyncTableRendering)tableRenderingContext.getRendering(); int numColumns = tableRendering.getAddressableUnitPerLine() / tableRendering.getAddressableUnitPerColumn(); - + RGB[] colors = new RGB[numColumns+2]; for (int i=0; i<colors.length-1; i++) { colors[i] = getColumnForeground(element, i, tableRendering); } - + colors[colors.length-1] = null; - + return colors; } } return new RGB[0]; } - + private RGB getColumnBackground(Object element, int columnIndex, AbstractAsyncTableRendering tableRendering) { if (columnIndex == 0) return null; - + if (element instanceof MemorySegment) - { + { MemorySegment segment = (MemorySegment)element; if (segment.getBytes().length != tableRendering.getBytesPerLine()) return null; - + IColorProvider colorProvider = tableRendering.getAdapter(IColorProvider.class); if (colorProvider != null && columnIndex > 0) { @@ -304,23 +304,23 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { Color color = colorProvider.getBackground(renderingElement); if (color != null) return color.getRGB(); - } + } } } return null; } - + private RGB getColumnForeground(Object element, int columnIndex, AbstractAsyncTableRendering tableRendering) { if (columnIndex == 0) return null; - + if (element instanceof MemorySegment) - { + { MemorySegment segment = (MemorySegment)element; if (segment.getBytes().length != tableRendering.getBytesPerLine()) return null; - + IColorProvider colorProvider = tableRendering.getAdapter(IColorProvider.class); if (colorProvider != null && columnIndex > 0) { @@ -329,9 +329,9 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { Color color = colorProvider.getForeground(renderingElement); if (color != null) return color.getRGB(); - } + } } - + int start = (columnIndex-1)*tableRendering.getBytesPerColumn(); MemoryByte[] bytes = segment.getBytes(start, tableRendering.getBytesPerColumn()); boolean allKnown = true; @@ -340,22 +340,22 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { { if (!bytes[i].isHistoryKnown()) allKnown = false; - + if (bytes[i].isChanged()) unchanged = false; } - + if (allKnown) { // mark changed elements in changed color if (!unchanged) - return DebugUIPlugin.getPreferenceColor(IDebugUIConstants.PREF_CHANGED_DEBUG_ELEMENT_COLOR).getRGB(); - + return DebugUIPlugin.getPreferenceColor(IDebugUIConstants.PREF_CHANGED_DEBUG_ELEMENT_COLOR).getRGB(); + return DebugUIPlugin.getPreferenceColor(IDebugUIConstants.PREF_MEMORY_HISTORY_KNOWN_COLOR).getRGB(); } - + return DebugUIPlugin.getPreferenceColor(IDebugUIConstants.PREF_MEMORY_HISTORY_UNKNOWN_COLOR).getRGB(); - + } return null; } @@ -363,7 +363,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { @Override protected RGB[] getBackgrounds(Object element, IPresentationContext context) throws CoreException { - + if (context instanceof MemoryViewPresentationContext) { MemoryViewPresentationContext tableRenderingContext = (MemoryViewPresentationContext)context; @@ -371,27 +371,27 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { { AbstractAsyncTableRendering tableRendering = (AbstractAsyncTableRendering)tableRenderingContext.getRendering(); int numColumns = tableRendering.getAddressableUnitPerLine() / tableRendering.getAddressableUnitPerColumn(); - + RGB[] colors = new RGB[numColumns+2]; for (int i=0; i<colors.length-1; i++) { colors[i] = getColumnBackground(element, i, tableRendering); } - + colors[colors.length-1] = null; - + return colors; } } return new RGB[0]; } - + /** * Returns a memory rendering element corresponding to the given element * or <code>null</code> if none. - * + * * @param element element to be rendered * @param columnIndex column index at which to render * @return memory rendering element or <code>null</code> @@ -407,7 +407,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { } return null; } - + private MemoryRenderingElement getMemoryRenderingElement(MemorySegment line, BigInteger lineAddress, int offset, AbstractBaseTableRendering rendering) { BigInteger cellAddress = lineAddress.add(BigInteger.valueOf(offset)); MemoryByte[] bytes = line.getBytes(offset, rendering.getBytesPerColumn()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/Messages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/Messages.java index 3dc7f87a3..c5ac5fd90 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/Messages.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/Messages.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ 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 4ef734a77..f70f5bfdb 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 @@ -41,7 +41,7 @@ import org.eclipse.ui.IMemento; * that do not change across stack frame selection to avoid register groups collapsing * while stepping between frames. * <p> - * The standard debug model {@link IStackFrame} uses an + * The standard debug model {@link IStackFrame} uses an * {@link org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider} to * create a register group proxy for the register view's input. * </p> @@ -59,12 +59,12 @@ import org.eclipse.ui.IMemento; * @since 3.4 */ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentationFactory, IElementContentProvider, IElementMementoProvider { - + private IRegisterGroup[] fGroups; private IStackFrame fFrame; - + private static final String HASH_CODE = "HASH_CODE"; //$NON-NLS-1$ - + /** * Local implementation of a viewer update request. This class delegates to the underlying frame * for viewer requests. The requests have to be wrapped such that the request's element provided @@ -73,7 +73,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati */ private class Update extends Request implements IViewerUpdate { private IViewerUpdate fViewerUpdate; - + Update(IViewerUpdate update) { fViewerUpdate = update; } @@ -109,7 +109,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati fViewerUpdate.setStatus(getStatus()); fViewerUpdate.done(); } - + /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getViewerInput() */ @@ -117,18 +117,18 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati public Object getViewerInput() { return fFrame; } - + } - + private class CountUpdate extends Update implements IChildrenCountUpdate { private IChildrenCountUpdate fUpdate; - + CountUpdate(IChildrenCountUpdate delegate) { super(delegate); fUpdate = delegate; } - + /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate#setChildCount(int) */ @@ -136,18 +136,18 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati public void setChildCount(int numChildren) { fUpdate.setChildCount(numChildren); } - + } - + private class HasUpdate extends Update implements IHasChildrenUpdate { private IHasChildrenUpdate fUpdate; - + HasUpdate(IHasChildrenUpdate delegate) { super(delegate); fUpdate = delegate; } - + /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdate#setHasChilren(boolean) */ @@ -155,13 +155,13 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati public void setHasChilren(boolean hasChildren) { fUpdate.setHasChilren(hasChildren); } - + } - + private class ChildrenUpdate extends Update implements IChildrenUpdate { private IChildrenUpdate fUpdate; - + ChildrenUpdate(IChildrenUpdate delegate) { super(delegate); fUpdate = delegate; @@ -189,9 +189,9 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati public void setChild(Object child, int offset) { fUpdate.setChild(child, offset); } - + } - + /** * The memento request has to override {@link #getElement()} to provide the element * that a memento is requested for (which could be any element in the view, not just @@ -219,9 +219,9 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati public TreePath getElementPath() { return fUpdate.getElementPath(); } - + } - + private class ElementCompare extends MementoRequest implements IElementCompareRequest { private IElementCompareRequest fRequest; @@ -236,12 +236,12 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati public void setEqual(boolean equal) { fRequest.setEqual(equal); } - + } /** * Creates a new register group proxy for the given stack frame. - * + * * @param frame stack frame * @throws DebugException exception if unable to retrieve register groups */ @@ -249,12 +249,12 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati fFrame = frame; init(frame); } - + /* (non-Javadoc) - * + * * A register group proxy is equal to other stack frames that have the same * register groups. - * + * * @see java.lang.Object#equals(java.lang.Object) */ @Override @@ -279,7 +279,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /** * Initializes the register groups for this stack frame. - * + * * @param frame stack frame */ private void init(IStackFrame frame) throws DebugException { @@ -288,7 +288,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati /** * Returns cached register groups for this stack frame. - * + * * @return register groups */ protected IRegisterGroup[] getRegisterGroups() { @@ -329,7 +329,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati return factory.getColumnPresentationId(context, fFrame); } return null; - } + } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate[]) @@ -363,7 +363,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati } else { cancelUpdates(updates); } - + } /* (non-Javadoc) @@ -381,11 +381,11 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati } else { cancelUpdates(updates); } - } - + } + /** * Cancels a collection of update requests. - * + * * @param updates updates to cancel */ private void cancelUpdates(IViewerUpdate[] updates) { @@ -448,6 +448,6 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati } else { cancelUpdates(requests); } - } - + } + } 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 fb3ac0c4f..c463a0979 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 @@ -24,20 +24,20 @@ import org.eclipse.debug.ui.IDebugUIConstants; * @since 3.4 */ 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); + return new RegisterGroupProxy((IStackFrame) source); } else if ( IDebugUIConstants.ID_BREAKPOINT_VIEW.equals(context.getId()) ) { return new DefaultBreakpointsViewInput(context); } else { return DebugPlugin.getDefault().getExpressionManager(); } - + } /* (non-Javadoc) @@ -45,8 +45,8 @@ public class StackFrameViewerInputProvider extends ViewerInputProvider { */ @Override protected boolean supportsContextId(String id) { - return IDebugUIConstants.ID_REGISTER_VIEW.equals(id) || - IDebugUIConstants.ID_EXPRESSION_VIEW.equals(id) || + return IDebugUIConstants.ID_REGISTER_VIEW.equals(id) || + 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/VariableColumnFactoryAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnFactoryAdapter.java index 9098c00d7..f6cac3a78 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 @@ -20,7 +20,7 @@ import org.eclipse.debug.ui.IDebugUIConstants; /** * Factory for default variable column presentation. - * + * * @since 3.2 */ public class VariableColumnFactoryAdapter implements IColumnPresentationFactory { @@ -31,9 +31,9 @@ public class VariableColumnFactoryAdapter implements IColumnPresentationFactory @Override public IColumnPresentation createColumnPresentation(IPresentationContext context, Object element) { String id = context.getId(); - if (IDebugUIConstants.ID_VARIABLE_VIEW.equals(id) || - IDebugUIConstants.ID_REGISTER_VIEW.equals(id) || - IDebugUIConstants.ID_EXPRESSION_VIEW.equals(id)) + if (IDebugUIConstants.ID_VARIABLE_VIEW.equals(id) || + IDebugUIConstants.ID_REGISTER_VIEW.equals(id) || + IDebugUIConstants.ID_EXPRESSION_VIEW.equals(id)) { if (element instanceof IStackFrame || element instanceof IExpressionManager) { return new VariableColumnPresentation(); @@ -48,9 +48,9 @@ public class VariableColumnFactoryAdapter implements IColumnPresentationFactory @Override public String getColumnPresentationId(IPresentationContext context, Object element) { String id = context.getId(); - if (IDebugUIConstants.ID_VARIABLE_VIEW.equals(id) || - IDebugUIConstants.ID_REGISTER_VIEW.equals(id) || - IDebugUIConstants.ID_EXPRESSION_VIEW.equals(id)) + if (IDebugUIConstants.ID_VARIABLE_VIEW.equals(id) || + IDebugUIConstants.ID_REGISTER_VIEW.equals(id) || + IDebugUIConstants.ID_EXPRESSION_VIEW.equals(id)) { if (element instanceof IStackFrame || element instanceof IExpressionManager) { return IDebugUIConstants.COLUMN_PRESENTATION_ID_VARIABLE; 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 35489d86b..bbb7e24e1 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -15,18 +15,18 @@ import org.eclipse.debug.ui.IDebugUIConstants; /** * Columns for Java variables. - * + * * @since 3.2 */ 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} @@ -48,12 +48,12 @@ public class VariableColumnPresentation extends AbstractColumnPresentation { */ @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, + + private static final String[] ALL_COLUMNS = new String[]{IDebugUIConstants.COLUMN_ID_VARIABLE_NAME, IDebugUIConstants.COLUMN_ID_VARIABLE_TYPE, IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE, IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE_TYPE}; - private static final String[] INITIAL_COLUMNS = new String[]{IDebugUIConstants.COLUMN_ID_VARIABLE_NAME, - IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE}; - + private static final String[] INITIAL_COLUMNS = new String[]{IDebugUIConstants.COLUMN_ID_VARIABLE_NAME, + IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE}; + /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getColumns() */ 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 840200f04..6286da372 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Wind River Systems - initial API and implementation * IBM Corporation - bug fixing @@ -18,12 +18,12 @@ import org.eclipse.jface.viewers.ICellModifier; /** * Watch expressions modifier can change the expression name but not its value. - * + * * @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) */ @@ -31,7 +31,7 @@ public class WatchExpressionCellModifier implements ICellModifier { public boolean canModify(Object element, String property) { if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) { return element instanceof IWatchExpression; - } + } return false; } @@ -42,7 +42,7 @@ public class WatchExpressionCellModifier implements ICellModifier { public Object getValue(Object element, String property) { if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) { return DefaultLabelProvider.escapeSpecialChars( ((IWatchExpression)element).getExpressionText() ); - } + } return null; } @@ -56,8 +56,8 @@ public class WatchExpressionCellModifier implements ICellModifier { if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) { if (element instanceof IWatchExpression) { if (value instanceof String) { - // The value column displays special characters - // escaped, so encode the string with any special + // The value column displays special characters + // escaped, so encode the string with any special // characters escaped properly String expressionText = DefaultLabelProvider.encodeEsacpedChars((String)value); IWatchExpression expression = (IWatchExpression) element; |