diff options
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch')
16 files changed, 385 insertions, 385 deletions
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 39825b009..c5ec83c5f 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 @@ -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 *******************************************************************************/ @@ -16,9 +16,9 @@ import org.eclipse.jface.action.Action; import org.eclipse.ui.PlatformUI; /** - * Action that controls the preference for whether elements should be + * Action that controls the preference for whether elements should be * automatically expanded in the breadcrumb drop down viewers. - * + * * @since 3.5 */ class BreadcrumbDropDownAutoExpandAction extends Action { @@ -27,19 +27,19 @@ class BreadcrumbDropDownAutoExpandAction extends Action { /** * Creates a new action to set the debug view mode. - * + * * @param view Reference to the debug view. * in auto mode. */ public BreadcrumbDropDownAutoExpandAction(LaunchView view) { super(IInternalDebugCoreConstants.EMPTY_STRING, AS_CHECK_BOX); fLaunchView = view; - + setText(LaunchViewMessages.BreadcrumbDropDownAutoExpandAction_label); - setToolTipText(LaunchViewMessages.BreadcrumbDropDownAutoExpandAction_tooltip); - setDescription(LaunchViewMessages.BreadcrumbDropDownAutoExpandAction_description); + setToolTipText(LaunchViewMessages.BreadcrumbDropDownAutoExpandAction_tooltip); + setDescription(LaunchViewMessages.BreadcrumbDropDownAutoExpandAction_description); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DEBUG_VIEW_DROP_DOWN_AUTOEXPAND_ACTION); - + setChecked(fLaunchView.getBreadcrumbDropDownAutoExpand()); } @@ -48,7 +48,7 @@ class BreadcrumbDropDownAutoExpandAction extends Action { */ @Override public void run() { - fLaunchView.setBreadcrumbDropDownAutoExpand(isChecked()); - } + 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 997f2a89f..9ae17da01 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 @@ -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 * Pawel Piech - Wind River - adapted to use in Debug view @@ -20,13 +20,13 @@ import org.eclipse.ui.IWorkbenchPartSite; /** * Fake part to used to create the breadcrumb page. - * + * * @since 3.5 */ class BreadcrumbWorkbenchPart implements IWorkbenchPart { private IWorkbenchPartSite fSite = null; - + /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ 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 928c937be..c9c19a6fc 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 @@ -91,28 +91,28 @@ import org.eclipse.debug.ui.sourcelookup.ISourceDisplay; * DebugElementAdapterFactory */ public class DebugElementAdapterFactory implements IAdapterFactory { - + private static IModelProxyFactory fgModelProxyFactoryAdapter = new DefaultModelProxyFactory(); private static ISourceDisplay fgStackFrameSourceDisplayAdapter = new StackFrameSourceDisplayAdapter(); private static IModelSelectionPolicyFactory fgModelSelectionPolicyFactoryAdapter = new DefaultModelSelectionPolicyFactory(); - + private static IAsynchronousLabelAdapter fgDebugLabelAdapter = new AsynchronousDebugLabelAdapter(); private static IAsynchronousLabelAdapter fgMemoryBlockLabelAdapter = new MemoryBlockLabelAdapter(); private static IAsynchronousLabelAdapter fgTableRenderingLineLabelAdapter = new MemorySegmentLabelAdapter(); - + private static IElementLabelProvider fgLPDebugElement = new DebugElementLabelProvider(); private static IElementLabelProvider fgLPVariable = new VariableLabelProvider(); private static IElementLabelProvider fgLPExpression = new ExpressionLabelProvider(); private static IElementLabelProvider fgLPRegisterGroup = new RegisterGroupLabelProvider(); - private static IElementLabelProvider fgLPMemoryBlock = new MemoryBlockLabelProvider(); + private static IElementLabelProvider fgLPMemoryBlock = new MemoryBlockLabelProvider(); private static IElementLabelProvider fgLPBreakpoint = new BreakpointLabelProvider(); - private static IElementLabelProvider fgLPBreakpointContainer = new BreakpointContainerLabelProvider(); + private static IElementLabelProvider fgLPBreakpointContainer = new BreakpointContainerLabelProvider(); private static IElementEditor fgEEVariable = new VariableEditor(); private static IElementEditor fgEEWatchExpression = new WatchExpressionEditor(); - + private static IAsynchronousContentAdapter fgAsyncMemoryRetrieval = new MemoryRetrievalContentAdapter(); private static IAsynchronousContentAdapter fgAsyncMemoryBlock = new MemoryBlockContentAdapter(); - + private static IElementContentProvider fgCPLaunchManger = new LaunchManagerContentProvider(); private static IElementContentProvider fgCPLaunch = new LaunchContentProvider(); private static IElementContentProvider fgCPProcess = new ProcessContentProvider(); @@ -120,14 +120,14 @@ public class DebugElementAdapterFactory implements IAdapterFactory { private static IElementContentProvider fgCPThread = new ThreadContentProvider(); private static IElementContentProvider fgCPFrame = new StackFrameContentProvider(); private static IElementContentProvider fgCPVariable = new VariableContentProvider(); - private static IElementContentProvider fgCPExpressionManager = new ExpressionManagerContentProvider(); + private static IElementContentProvider fgCPExpressionManager = new ExpressionManagerContentProvider(); private static IElementContentProvider fgCPExpression = new ExpressionContentProvider(); private static IElementContentProvider fgCPRegisterGroup = new RegisterGroupContentProvider(); private static IElementContentProvider fgCPMemoryRetrieval = new MemoryRetrievalContentProvider(); - private static IElementContentProvider fgCPMemoryBlock = new MemoryBlockContentProvider(); + private static IElementContentProvider fgCPMemoryBlock = new MemoryBlockContentProvider(); private static IElementContentProvider fgCPBreakpointManager = new BreakpointManagerContentProvider(); private static IElementContentProvider fgCPBreakpoint = new BreakpointContentProvider(); - + private static IElementMementoProvider fgMPFrame = new StackFrameMementoProvider(); private static IElementMementoProvider fgMPVariable = new VariableMementoProvider(); private static IElementMementoProvider fgMPExpression = new ExpressionMementoProvider(); @@ -137,12 +137,12 @@ public class DebugElementAdapterFactory implements IAdapterFactory { private static IElementMementoProvider fgMPBreakpointManagerInput = new BreakpointManagerInputMementoProvider(); private static IElementMementoProvider fgMPBreakpointContainer = new BreakpointContainerMementoProvider(); private static IElementMementoProvider fgMPBreakpoint = new BreakpointMementoProvider(); - + private static IColumnPresentationFactory fgVariableColumnFactory = new VariableColumnFactoryAdapter(); - + private static IViewerInputProvider fgDefaultViewerInputProvider = new DefaultViewerInputProvider(); private static IViewerInputProvider fgStackFrameViewerInputProvider = new StackFrameViewerInputProvider(); - + /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ @@ -152,7 +152,7 @@ public class DebugElementAdapterFactory implements IAdapterFactory { if (adapterType.isInstance(adaptableObject)) { return (T) adaptableObject; } - + if (adapterType.equals(IAsynchronousContentAdapter.class)) { if (adaptableObject instanceof IMemoryBlockRetrieval) { return (T) fgAsyncMemoryRetrieval; @@ -161,7 +161,7 @@ public class DebugElementAdapterFactory implements IAdapterFactory { return (T) fgAsyncMemoryBlock; } } - + if (adapterType.equals(IElementContentProvider.class)) { if (adaptableObject instanceof ILaunchManager) { return (T) fgCPLaunchManger; @@ -190,7 +190,7 @@ public class DebugElementAdapterFactory implements IAdapterFactory { } if (adaptableObject instanceof IExpressionManager) { return (T) fgCPExpressionManager; - } + } if (adaptableObject instanceof IExpression) { return (T) fgCPExpression; } @@ -199,26 +199,26 @@ public class DebugElementAdapterFactory implements IAdapterFactory { } if (adaptableObject instanceof IMemoryBlock) { return (T) fgCPMemoryBlock; - } + } if (adaptableObject instanceof DefaultBreakpointsViewInput) { return (T) fgCPBreakpointManager; } if (adaptableObject instanceof IBreakpoint) { return (T) fgCPBreakpoint; } - } - + } + if (adapterType.equals(IAsynchronousLabelAdapter.class)) { if (adaptableObject instanceof IMemoryBlock) { return (T) fgMemoryBlockLabelAdapter; } - + if (adaptableObject instanceof MemorySegment) { return (T) fgTableRenderingLineLabelAdapter; } return (T) fgDebugLabelAdapter; } - + if (adapterType.equals(IElementLabelProvider.class)) { if (adaptableObject instanceof IVariable) { return (T) fgLPVariable; @@ -231,16 +231,16 @@ public class DebugElementAdapterFactory implements IAdapterFactory { } if (adaptableObject instanceof IMemoryBlock) { return (T) fgLPMemoryBlock; - } + } if (adaptableObject instanceof IBreakpoint) { return (T) fgLPBreakpoint; } if (adaptableObject instanceof IBreakpointContainer) { return (T) fgLPBreakpointContainer; - } + } return (T) fgLPDebugElement; - } - + } + if (adapterType.equals(IModelProxyFactory.class)) { if (adaptableObject instanceof ILaunch || adaptableObject instanceof IDebugTarget || adaptableObject instanceof IProcess || adaptableObject instanceof ILaunchManager || @@ -253,25 +253,25 @@ public class DebugElementAdapterFactory implements IAdapterFactory { return (T) fgModelProxyFactoryAdapter; } } - + if (adapterType.equals(ISourceDisplay.class)) { if (adaptableObject instanceof IStackFrame) { return (T) fgStackFrameSourceDisplayAdapter; } } - + if (adapterType.equals(IModelSelectionPolicyFactory.class)) { if (adaptableObject instanceof IDebugElement) { return (T) fgModelSelectionPolicyFactoryAdapter; } } - + if (adapterType.equals(IColumnPresentationFactory.class)) { if (adaptableObject instanceof IStackFrame || adaptableObject instanceof IExpressionManager) { return (T) fgVariableColumnFactory; } - } - + } + if (adapterType.equals(IElementMementoProvider.class)) { if (adaptableObject instanceof IStackFrame) { return (T) fgMPFrame; @@ -301,7 +301,7 @@ public class DebugElementAdapterFactory implements IAdapterFactory { return (T) fgMPBreakpointManagerInput; } } - + if (adapterType.equals(IElementEditor.class)) { if (adaptableObject instanceof IVariable) { return (T) fgEEVariable; @@ -310,15 +310,15 @@ public class DebugElementAdapterFactory implements IAdapterFactory { return (T) fgEEWatchExpression; } } - + if (adapterType.equals(IViewerInputProvider.class)) { if (adaptableObject instanceof IStackFrame) { return (T) fgStackFrameViewerInputProvider; } else { return (T) fgDefaultViewerInputProvider; } - } - + } + return null; } 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 04acbd126..cb012b88a 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 @@ -27,7 +27,7 @@ import org.eclipse.swt.graphics.RGB; /** * Translates images, colors, and fonts into image descriptors, RGBs, and font * data for workbench adapters. Also provides labels. - * + * * @since 3.1 */ public class DebugElementHelper { @@ -51,7 +51,7 @@ public class DebugElementHelper { /** * 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) { @@ -61,7 +61,7 @@ public class DebugElementHelper { /** * 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 @@ -85,7 +85,7 @@ public class DebugElementHelper { /** * Returns a label for the given debug element. - * + * * @param o object for which a label is required */ public static String getLabel(Object o) { @@ -94,7 +94,7 @@ public class DebugElementHelper { /** * Returns a model presentation to use to retrieve lables & images. - * + * * @return a model presentation to use to retrieve lables & images */ public static DelegatingModelPresentation getPresentation() { @@ -107,7 +107,7 @@ public class DebugElementHelper { /** * 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 @@ -123,7 +123,7 @@ public class DebugElementHelper { /** * 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 @@ -147,7 +147,7 @@ public class DebugElementHelper { /** * 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 @@ -163,7 +163,7 @@ public class DebugElementHelper { /** * 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 @@ -187,7 +187,7 @@ public class DebugElementHelper { /** * 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 */ @@ -202,7 +202,7 @@ public class DebugElementHelper { /** * 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 @@ -225,7 +225,7 @@ public class DebugElementHelper { /** * Returns whether the UI thread is required for computing the label for the * given object. - * + * * @param object object a label is being computed for * @return whether the UI thread is required */ 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 38f9c6900..becca2d09 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 @@ -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 *******************************************************************************/ @@ -17,38 +17,38 @@ import org.eclipse.ui.PlatformUI; /** * Action that controls whether Debug actions are shown in Launch view. - * + * * @since 3.8 */ class DebugToolBarAction extends Action { private final LaunchView fLaunchView; - + /** * Creates a new action to set the debug view mode. - * + * * @param view Reference to the debug view. */ public DebugToolBarAction(LaunchView view) { super(IInternalDebugCoreConstants.EMPTY_STRING, AS_CHECK_BOX); fLaunchView = view; - + setText(LaunchViewMessages.DebugToolBarAction_View_label); - setToolTipText(LaunchViewMessages.DebugToolBarAction_View_tooltip); - setDescription(LaunchViewMessages.DebugToolBarAction_View_description); + setToolTipText(LaunchViewMessages.DebugToolBarAction_View_tooltip); + setDescription(LaunchViewMessages.DebugToolBarAction_View_description); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DEBUG_TOOLBAR_VIEW_ACTION); } public void setShowingDebugToolbar(boolean showingToolbar) { setChecked(showingToolbar); } - + /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ @Override public void run() { - fLaunchView.setDebugToolbarInView(isChecked()); - } + 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 712f05126..3da6ebbbe 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 @@ -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 *******************************************************************************/ @@ -21,9 +21,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.PlatformUI; /** - * Action that controls the view mode for Debug view (auto vs. breadcrumb, vs. - * tree view). - * + * Action that controls the view mode for Debug view (auto vs. breadcrumb, vs. + * tree view). + * * @since 3.5 */ class DebugViewModeAction extends Action { @@ -34,7 +34,7 @@ class DebugViewModeAction extends Action { /** * Creates a new action to set the debug view mode. - * + * * @param view Reference to the debug view. * @param mode The mode to be set by this action. * @param parent The view's parent control used to calculate view size @@ -45,29 +45,29 @@ class DebugViewModeAction extends Action { fLaunchView = view; fParent = parent; fMode = mode; - + if (mode == IDebugPreferenceConstants.DEBUG_VIEW_MODE_AUTO) { setText(LaunchViewMessages.DebugViewModeAction_Auto_label); - setToolTipText(LaunchViewMessages.DebugViewModeAction_Auto_tooltip); + setToolTipText(LaunchViewMessages.DebugViewModeAction_Auto_tooltip); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_AUTO)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_AUTO)); - setDescription(LaunchViewMessages.DebugViewModeAction_Auto_description); + setDescription(LaunchViewMessages.DebugViewModeAction_Auto_description); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DEBUG_VIEW_MODE_AUTO_ACTION); } else if (mode == IDebugPreferenceConstants.DEBUG_VIEW_MODE_FULL) { - setText(LaunchViewMessages.DebugViewModeAction_Full_label); - setToolTipText(LaunchViewMessages.DebugViewModeAction_Full_tooltip); + setText(LaunchViewMessages.DebugViewModeAction_Full_label); + setToolTipText(LaunchViewMessages.DebugViewModeAction_Full_tooltip); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_HIDE)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_HIDE)); - setDescription(LaunchViewMessages.DebugViewModeAction_Full_description); + setDescription(LaunchViewMessages.DebugViewModeAction_Full_description); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DEBUG_VIEW_MODE_FULL_ACTION); } else { setText(LaunchViewMessages.DebugViewModeAction_Compact_label); - setToolTipText(LaunchViewMessages.DebugViewModeAction_Compact_tooltip); - setDescription(LaunchViewMessages.DebugViewModeAction_Compact_description); + setToolTipText(LaunchViewMessages.DebugViewModeAction_Compact_tooltip); + setDescription(LaunchViewMessages.DebugViewModeAction_Compact_description); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DEBUG_VIEW_COMPACT_LAYOUT)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DEBUG_VIEW_COMPACT_LAYOUT)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DEBUG_VIEW_MODE_COMPACT_ACTION); - } + } } /* (non-Javadoc) @@ -75,9 +75,9 @@ class DebugViewModeAction extends Action { */ @Override public void run() { - fLaunchView.setViewMode(fMode, fParent); - } - + fLaunchView.setViewMode(fMode, fParent); + } + /** * Returns the view mode set by this action. * @return the mode of the action diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/Decoration.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/Decoration.java index 6f5cc4c71..2c0c2994c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/Decoration.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/Decoration.java @@ -16,15 +16,15 @@ import org.eclipse.debug.core.model.IThread; * A decoration in an editor, created by the debugger. */ public abstract class Decoration { - + /** * Removes this decoration */ public abstract void remove(); - + /** * Returns the thread this decoration decorates. - * + * * @return thread associated with this decoration */ public abstract IThread getThread(); 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 d44ec65a5..e3fac7213 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 @@ -30,7 +30,7 @@ public class DecorationManager { /** * Adds the given decoration for the given stack frame. - * + * * @param decoration * @param frame */ @@ -48,7 +48,7 @@ public class DecorationManager { /** * Removes any decorations for the given debug target. - * + * * @param target to remove editor decorations for */ public static void removeDecorations(IDebugTarget target) { @@ -57,7 +57,7 @@ public class DecorationManager { /** * Removes any decorations for the given thread - * + * * @param thread thread to remove decorations for */ public static void removeDecorations(IThread thread) { 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 0caeab28c..e7f41e33e 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 @@ -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/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java index 1973cff96..f3b492b2f 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 @@ -136,11 +136,11 @@ import org.eclipse.ui.progress.IWorkbenchSiteProgressService; import org.eclipse.ui.progress.UIJob; import org.eclipse.ui.texteditor.IUpdate; -public class LaunchView extends AbstractDebugView - implements ISelectionChangedListener, IPerspectiveListener2, IPageListener, IShowInTarget, IShowInSource, +public class LaunchView extends AbstractDebugView + implements ISelectionChangedListener, IPerspectiveListener2, IPageListener, IShowInTarget, IShowInSource, IShowInTargetList, IPartListener2, IViewerUpdateListener, IContextManagerListener, IModelChangedListener { - + public static final String ID_CONTEXT_ACTIVITY_BINDINGS = "contextActivityBindings"; //$NON-NLS-1$ private static final String TERMINATE = "terminate"; //$NON-NLS-1$ @@ -160,48 +160,48 @@ public class LaunchView extends AbstractDebugView private static final String STEP_INTO = "step_into"; //$NON-NLS-1$ public static final String TERMINATE_AND_REMOVE = "terminate_and_remove"; //$NON-NLS-1$ - + private static final String TERMINATE_ALL = "terminate_all"; //$NON-NLS-1$ public static final String TERMINATE_AND_RELAUNCH = "terminate_relaunch"; //$NON-NLS-1$ - + private static final String TOGGLE_STEP_FILTERS = "toggle_step_filters"; //$NON-NLS-1$ private static final String RESTART = "restart"; //$NON-NLS-1$ private static final int BREADCRUMB_TRIGGER_HEIGHT_DEFAULT = 30; // pixels - + private static final int BREADCRUMB_TRIGGER_RANGE = 5; // pixels - + private static final int BREADCRUMB_STICKY_RANGE = 20; // pixels - + /** * Whether this view is in the active page of a perspective. */ - private boolean fIsActive = true; - + private boolean fIsActive = true; + /** * Model presentation or <code>null</code> if none */ private IDebugModelPresentation fPresentation = null; - + private IPresentationContext fPresentationContext; - + private EditLaunchConfigurationAction fEditConfigAction = null; private AddToFavoritesAction fAddToFavoritesAction = null; private EditSourceLookupPathAction fEditSourceAction = null; private LookupSourceAction fLookupAction = null; /** - * Current view mode (auto vs. breadcrumb, vs. tree view). - * + * Current view mode (auto vs. breadcrumb, vs. tree view). + * * @since 3.5 */ private String fCurrentViewMode = IDebugPreferenceConstants.DEBUG_VIEW_MODE_AUTO; - + /** * Actions for selecting the view mode (auto vs. breadcrumb, vs. tree view). - * + * * @since 3.5 */ private DebugViewModeAction[] fDebugViewModeActions; @@ -210,25 +210,25 @@ public class LaunchView extends AbstractDebugView * Action which shows or hides the Debug view toolbar. */ private DebugToolBarAction fDebugToolBarAction; - + /** * Action that controls the breadcrumb drop-down auto-expand behavior. - * + * * @since 3.5 */ private BreadcrumbDropDownAutoExpandAction fBreadcrumbDropDownAutoExpandAction; - + /** * Context service for this view. Used to track whether debug toolbar * action set is active. - * + * * @since 3.8 */ private IContextService fContextService; - + /** * Preference name for the view's memento. - * + * * @since 3.5 */ private String PREF_STATE_MEMENTO = "pref_state_memento."; //$NON-NLS-1$ @@ -236,7 +236,7 @@ public class LaunchView extends AbstractDebugView /** * Key for a view preference for whether the elements in breadcrumb's * drop-down viewer should be automatically expanded. - * + * * @since 3.5 */ private static final String BREADCRUMB_DROPDOWN_AUTO_EXPAND = DebugUIPlugin.getUniqueIdentifier() + ".BREADCRUMB_DROPDOWN_AUTO_EXPAND"; //$NON-NLS-1$ @@ -244,26 +244,26 @@ public class LaunchView extends AbstractDebugView /** * Preference for whether the elements in breadcrumb's * drop-down viewer should be automatically expanded. - * + * * @since 3.5 */ private boolean fBreadcrumbDropDownAutoExpand = false; - + /** * Action handlers. Maps action identifiers to IHandler's. - * + * * @since 3.6 */ private Map<String, IHandler2> fHandlers = new HashMap<String, IHandler2>(); - + private boolean fDebugToolbarInView = true; - + private Set<String> fDebugToolbarPerspectives = new TreeSet<String>(); - + /** - * Page-book page for the breadcrumb viewer. This page is activated in - * Debug view when the height of the view is reduced to just one line. - * + * Page-book page for the breadcrumb viewer. This page is activated in + * Debug view when the height of the view is reduced to just one line. + * * @since 3.5 */ private class BreadcrumbPage extends Page { @@ -282,7 +282,7 @@ public class LaunchView extends AbstractDebugView super.init(pageSite); pageSite.setSelectionProvider(fCrumb.getSelectionProvider()); } - + @Override public Control getControl() { return fControl; @@ -292,7 +292,7 @@ public class LaunchView extends AbstractDebugView public void setFocus() { fCrumb.activate(); } - + IDebugContextProvider getContextProvider() { return fCrumb.getContextProvider(); } @@ -300,7 +300,7 @@ public class LaunchView extends AbstractDebugView int getHeight() { return fCrumb.getHeight(); } - + @Override public void dispose() { fCrumb.dispose(); @@ -308,13 +308,13 @@ public class LaunchView extends AbstractDebugView } private BreadcrumbPage fBreadcrumbPage; - + class TreeViewerContextProvider extends AbstractDebugContextProvider implements IModelChangedListener { - + private ISelection fContext = null; private TreeModelViewer fViewer = null; private Visitor fVisitor = new Visitor(); - + class Visitor implements IModelDeltaVisitor { @Override public boolean visit(IModelDelta delta, int depth) { @@ -332,12 +332,12 @@ public class LaunchView extends AbstractDebugView } } return true; - } + } } - + /** * Returns a tree path for the node, *not* including the root element. - * + * * @param node * model delta * @return corresponding tree path @@ -352,51 +352,51 @@ public class LaunchView extends AbstractDebugView } return new TreePath(list.toArray()); } - + public TreeViewerContextProvider(TreeModelViewer viewer) { super(LaunchView.this); fViewer = viewer; fViewer.addModelChangedListener(this); } - - protected void dispose() { + + protected void dispose() { fContext = null; fViewer.removeModelChangedListener(this); } - + /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextProvider#getActiveContext() */ @Override public synchronized ISelection getActiveContext() { return fContext; - } - + } + protected void activate(ISelection selection) { synchronized (this) { fContext = selection; } fire(new DebugContextEvent(this, selection, DebugContextEvent.ACTIVATED)); } - + protected void possibleChange(TreePath element, int type) { DebugContextEvent event = null; synchronized (this) { if (fContext instanceof ITreeSelection) { ITreeSelection ss = (ITreeSelection) fContext; - TreePath[] ssPaths = ss.getPaths(); + TreePath[] ssPaths = ss.getPaths(); for (int i = 0; i < ssPaths.length; i++) { if (ssPaths[i].startsWith(element, null)) { if (ssPaths[i].getSegmentCount() == element.getSegmentCount()) { event = new DebugContextEvent(this, fContext, type); } else { - // if parent of the currently selected element + // if parent of the currently selected element // changes, issue event to update STATE only event = new DebugContextEvent(this, fContext, DebugContextEvent.STATE); } } } - } + } } if (event == null) { return; @@ -434,35 +434,35 @@ public class LaunchView extends AbstractDebugView public void modelChanged(IModelDelta delta, IModelProxy proxy) { delta.accept(fVisitor); } - + } - + /** * Context provider */ private TreeViewerContextProvider fTreeViewerDebugContextProvider; /** - * The PageBookView, which is a base class of this class does not make it - * easy to control which page is currently active. It is intended that the - * page book pages are associated with workbench parts, and the parts are - * in turn associated with PageRec records. + * The PageBookView, which is a base class of this class does not make it + * easy to control which page is currently active. It is intended that the + * page book pages are associated with workbench parts, and the parts are + * in turn associated with PageRec records. * <p> - * PageRec is needed in order to properly active a page book page, by + * PageRec is needed in order to properly active a page book page, by * calling showPageRec(), so in this class we need to add some hooks in - * order to obtain the page record for the tree viewer page and the - * breadcrumb page.</p><p> - * For the default page, we override the showPageRec() + * order to obtain the page record for the tree viewer page and the + * breadcrumb page.</p><p> + * For the default page, we override the showPageRec() * to determine if the default page is being shown and if it is, we save * its record for later use. showPageRec() is always called for the default * page after it is created. For the breadcrumb page, we use the page book - * view mechanism to create the page based on a workbench part, but we have + * view mechanism to create the page based on a workbench part, but we have * to create a dummy part in order for this to work. - * </p> + * </p> * <p> * See bug 262845 and 262870. * </p> - * + * * @see #createPartControl(Composite) * @see BreadcrumbWorkbenchPart * @eee #doCreatePage(IWorkbenchPart) @@ -483,7 +483,7 @@ public class LaunchView extends AbstractDebugView private class ContextProviderProxy extends AbstractDebugContextProvider implements IDebugContextListener { private IDebugContextProvider fActiveProvider; private IDebugContextProvider[] fProviders; - + ContextProviderProxy(IDebugContextProvider[] providers) { super(LaunchView.this); fProviders = providers; @@ -492,7 +492,7 @@ public class LaunchView extends AbstractDebugView fProviders[i].addDebugContextListener(this); } } - + void setActiveProvider(IDebugContextProvider provider) { if (!provider.equals(fActiveProvider)) { ISelection activeContext = getActiveContext(); @@ -503,7 +503,7 @@ public class LaunchView extends AbstractDebugView } } } - + @Override public ISelection getActiveContext() { ISelection activeContext = fActiveProvider.getActiveContext(); @@ -519,7 +519,7 @@ public class LaunchView extends AbstractDebugView fire(new DebugContextEvent(this, event.getContext(), event.getFlags())); } } - + void dispose() { for (int i = 0; i < fProviders.length; i++) { fProviders[i].removeDebugContextListener(this); @@ -528,9 +528,9 @@ public class LaunchView extends AbstractDebugView fActiveProvider = null; } } - + private ContextProviderProxy fContextProviderProxy; - + /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId() */ @@ -538,7 +538,7 @@ public class LaunchView extends AbstractDebugView protected String getHelpContextId() { return IDebugHelpContextIds.DEBUG_VIEW; } - + /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#createActions() */ @@ -549,8 +549,8 @@ public class LaunchView extends AbstractDebugView fAddToFavoritesAction = new AddToFavoritesAction(); fEditSourceAction = new EditSourceLookupPathAction(this); fLookupAction = new LookupSourceAction(this); - setAction(FIND_ACTION, new VirtualFindAction((TreeModelViewer) getViewer())); - + setAction(FIND_ACTION, new VirtualFindAction((TreeModelViewer) getViewer())); + addCapabilityAction(new TerminateCommandAction(), TERMINATE); addCapabilityAction(new DisconnectCommandAction(), DISCONNECT); addCapabilityAction(new SuspendCommandAction(), SUSPEND); @@ -569,30 +569,30 @@ public class LaunchView extends AbstractDebugView addCapabilityAction(new TerminateAllAction(), TERMINATE_ALL); addCapabilityAction(new ToggleStepFiltersAction(), TOGGLE_STEP_FILTERS); } - + /** * Sets the handler associated with the given action identifier. - * + * * @param id action identifier * @param handler handler */ private void setHandler(String id, IHandler2 handler) { fHandlers.put(id, handler); } - + /** * Returns the handler associated with the given action identifier or <code>null</code>. - * + * * @param id action identifier * @return handler or <code>null</code> */ public IHandler2 getHandler(String id) { return fHandlers.get(id); } - + /** * Initializes the action and associates it with the given id. - * + * * @param capability * @param actionID */ @@ -600,23 +600,23 @@ public class LaunchView extends AbstractDebugView capability.init(this); setAction(actionID, capability); } - + /** * Disposes the given action. - * + * * @param actionID */ private void disposeCommandAction(String actionID) { DebugCommandAction action = (DebugCommandAction) getAction(actionID); action.dispose(); } - + /** * Override the default implementation to create the breadcrumb page. - * + * * @since 3.5 * @see #fDefaultPageRec - */ + */ @Override public void createPartControl(final Composite parent) { super.createPartControl(parent); @@ -626,8 +626,8 @@ public class LaunchView extends AbstractDebugView // Add view as a selection listener to the site. getSite().getSelectionProvider().addSelectionChangedListener(this); - - // Set the tree viewer as the selection provider to the default page. + + // Set the tree viewer as the selection provider to the default page. // The page book view handles switching the between page selection // providers as needed. ((IPageBookViewPage)getDefaultPage()).getSite().setSelectionProvider(getViewer()); @@ -635,7 +635,7 @@ public class LaunchView extends AbstractDebugView // Call the PageBookView part listener to indirectly create the breadcrumb page. // This call eventually calls doCreatePage() implemented below. partActivated(new BreadcrumbWorkbenchPart(getSite())); - + fContextProviderProxy = new ContextProviderProxy( new IDebugContextProvider[] {fTreeViewerDebugContextProvider, fBreadcrumbPage.getContextProvider()}); DebugUITools.getDebugContextManager().getContextService(getSite().getWorkbenchWindow()).addDebugContextProvider(fContextProviderProxy); @@ -648,10 +648,10 @@ public class LaunchView extends AbstractDebugView for (int i = 0; i < fDebugViewModeActions.length; i++) { fDebugViewModeActions[i].setChecked(fDebugViewModeActions[i].getMode().equals(mode)); } - + createDebugToolBarInViewActions(parent); - - // Add a resize listener for the view to activate breadcrumb as needed. + + // Add a resize listener for the view to activate breadcrumb as needed. parent.addControlListener(new ControlListener() { @Override public void controlMoved(ControlEvent e) { @@ -666,35 +666,35 @@ public class LaunchView extends AbstractDebugView } } }); - - fContextService.addContextManagerListener(this); + + fContextService.addContextManagerListener(this); } /** - * Copies the view's global action handlers created by createActions(), + * Copies the view's global action handlers created by createActions(), * into the page site's action bars. This is necessary because the page * book view resets the view site's global actions after each page switch * (see bug 264618). - * + * * @param page Page to copy the global actions into. - * + * * @since 3.5 */ private void setGlobalActionBarsToPage(IPageBookViewPage page) { IActionBars pageActionBars = page.getSite().getActionBars(); - // Set the view site action bars created by createActions() to the + // Set the view site action bars created by createActions() to the // default page site. IActionBars bars = getViewSite().getActionBars(); pageActionBars.setGlobalActionHandler(FIND_ACTION, bars.getGlobalActionHandler(FIND_ACTION)); - pageActionBars.setGlobalActionHandler(COPY_ACTION, bars.getGlobalActionHandler(COPY_ACTION)); + pageActionBars.setGlobalActionHandler(COPY_ACTION, bars.getGlobalActionHandler(COPY_ACTION)); } - + /** * Override the default implementation to create the breadcrumb page. - * + * * @since 3.5 * @see #fDefaultPageRec - */ + */ @Override protected PageRec doCreatePage(IWorkbenchPart part) { if (part instanceof BreadcrumbWorkbenchPart) { @@ -706,13 +706,13 @@ public class LaunchView extends AbstractDebugView } return null; } - + /** * Override the default implementation to create the breadcrumb page. - * + * * @since 3.5 * @see #fDefaultPageRec - */ + */ @Override protected boolean isImportant(IWorkbenchPart part) { return part instanceof BreadcrumbWorkbenchPart; @@ -721,36 +721,36 @@ public class LaunchView extends AbstractDebugView /** * Override the default implementation to gain access at the default * page record. - * + * * @since 3.5 * @see #fDefaultPageRec - */ + */ @Override protected void showPageRec(PageRec pageRec) { if (pageRec.page == getDefaultPage()) { fDefaultPageRec = pageRec; } - + super.showPageRec(pageRec); - } + } /** * Creates actions for controlling view mode. - * + * * @param parent The view's parent control used to calculate view size * in auto mode. */ private void createViewModeActions(final Composite parent) { IActionBars actionBars = getViewSite().getActionBars(); IMenuManager viewMenu = actionBars.getMenuManager(); - + fDebugViewModeActions = new DebugViewModeAction[3]; fDebugViewModeActions[0] = new DebugViewModeAction(this, IDebugPreferenceConstants.DEBUG_VIEW_MODE_AUTO, parent); fDebugViewModeActions[1] = new DebugViewModeAction(this, IDebugPreferenceConstants.DEBUG_VIEW_MODE_FULL, parent); fDebugViewModeActions[2] = new DebugViewModeAction(this, IDebugPreferenceConstants.DEBUG_VIEW_MODE_COMPACT, parent); fBreadcrumbDropDownAutoExpandAction = new BreadcrumbDropDownAutoExpandAction(this); viewMenu.add(new Separator()); - + final MenuManager modeSubmenu = new MenuManager(LaunchViewMessages.LaunchView_ViewModeMenu_label); modeSubmenu.setRemoveAllWhenShown(true); modeSubmenu.add(fDebugViewModeActions[0]); @@ -759,7 +759,7 @@ public class LaunchView extends AbstractDebugView modeSubmenu.add(new Separator()); modeSubmenu.add(fBreadcrumbDropDownAutoExpandAction); viewMenu.add(modeSubmenu); - + modeSubmenu.addMenuListener(new IMenuListener() { @Override public void menuAboutToShow(IMenuManager manager) { @@ -774,34 +774,34 @@ public class LaunchView extends AbstractDebugView /** * Creates actions for controlling view mode. - * + * * @param parent The view's parent control used to calculate view size * in auto mode. */ private void createDebugToolBarInViewActions(final Composite parent) { IActionBars actionBars = getViewSite().getActionBars(); IMenuManager viewMenu = actionBars.getMenuManager(); - + fDebugToolBarAction = new DebugToolBarAction(this); viewMenu.add(fDebugToolBarAction); updateCheckedDebugToolBarAction(); } - + /** - * Sets the current view mode. If needed, the active view page is changed. - * + * Sets the current view mode. If needed, the active view page is changed. + * * @param mode New mode to set. * @param parent The view's parent control used to calculate view size * in auto mode. - * + * * @since 3.5 */ void setViewMode(String mode, Composite parent) { if (fCurrentViewMode.equals(mode)) { return; } - + fCurrentViewMode = mode; if (IDebugPreferenceConstants.DEBUG_VIEW_MODE_COMPACT.equals(mode)) { showBreadcrumbPage(); @@ -814,11 +814,11 @@ public class LaunchView extends AbstractDebugView } /** - * Based on the current view size, select the active view page + * Based on the current view size, select the active view page * (tree viewer vs. breadcrumb). - * + * * @param parent View pane control. - * + * * @since 3.5 */ private void autoSelectViewPage(Composite parent) { @@ -830,17 +830,17 @@ public class LaunchView extends AbstractDebugView } if (parent.getClientArea().height < breadcrumbHeight + BREADCRUMB_TRIGGER_RANGE) { showBreadcrumbPage(); - } - else if (parent.getClientArea().height > breadcrumbHeight + BREADCRUMB_STICKY_RANGE) + } + else if (parent.getClientArea().height > breadcrumbHeight + BREADCRUMB_STICKY_RANGE) { showTreeViewerPage(); } } - + /** * Shows the tree viewer in the Debug view. - * + * * @since 3.5 */ void showTreeViewerPage() { @@ -855,7 +855,7 @@ public class LaunchView extends AbstractDebugView /** * Shows the breadcrumb in the Debug view. - * + * * @since 3.5 */ void showBreadcrumbPage() { @@ -867,13 +867,13 @@ public class LaunchView extends AbstractDebugView setFocus(); } fBreadcrumbPage.fCrumb.debugContextChanged(new DebugContextEvent( - fTreeViewerDebugContextProvider, - fTreeViewerDebugContextProvider.getActiveContext(), + fTreeViewerDebugContextProvider, + fTreeViewerDebugContextProvider.getActiveContext(), DebugContextEvent.ACTIVATED)); fContextProviderProxy.setActiveProvider(fBreadcrumbPage.getContextProvider()); } } - + /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#createViewer(org.eclipse.swt.widgets.Composite) */ @@ -884,15 +884,15 @@ public class LaunchView extends AbstractDebugView TreeModelViewer viewer = new TreeModelViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.VIRTUAL, fPresentationContext); - + viewer.addSelectionChangedListener(fTreeViewerSelectionChangedListener); viewer.addViewerUpdateListener(this); viewer.addModelChangedListener(this); - + viewer.setInput(DebugPlugin.getDefault().getLaunchManager()); //setEventHandler(new LaunchViewEventHandler(this)); fTreeViewerDebugContextProvider = new TreeViewerContextProvider(viewer); - + return viewer; } @@ -901,7 +901,7 @@ public class LaunchView extends AbstractDebugView site.getWorkbenchWindow().addPageListener(this); site.getWorkbenchWindow().addPerspectiveListener(this); } - + private void preferenceInit(IViewSite site) { PREF_STATE_MEMENTO = PREF_STATE_MEMENTO + site.getId(); IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore(); @@ -920,7 +920,7 @@ public class LaunchView extends AbstractDebugView Boolean auto = mem.getBoolean(BREADCRUMB_DROPDOWN_AUTO_EXPAND); if(auto != null) { setBreadcrumbDropDownAutoExpand(auto.booleanValue()); - } + } } String preference = DebugUIPlugin.getDefault().getPreferenceStore().getString( @@ -931,7 +931,7 @@ public class LaunchView extends AbstractDebugView IPerspectiveDescriptor perspective = getSite().getPage().getPerspective(); fDebugToolbarInView = isDebugToolbarShownInPerspective(perspective); } - + /* (non-Javadoc) * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite) */ @@ -972,11 +972,11 @@ public class LaunchView extends AbstractDebugView } catch (IOException e) { } } - + StringBuffer buffer= new StringBuffer(); for (Iterator<String> itr = fDebugToolbarPerspectives.iterator(); itr.hasNext();) { - buffer.append(itr.next()).append(','); - } + buffer.append(itr.next()).append(','); + } getPreferenceStore().setValue(IDebugPreferenceConstants.DEBUG_VIEW_TOOLBAR_HIDDEN_PERSPECTIVES, buffer.toString()); super.partDeactivated(part); @@ -989,7 +989,7 @@ public class LaunchView extends AbstractDebugView public void saveViewerState(IMemento memento) { memento.putBoolean(BREADCRUMB_DROPDOWN_AUTO_EXPAND, getBreadcrumbDropDownAutoExpand()); } - + /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager) */ @@ -1006,25 +1006,25 @@ public class LaunchView extends AbstractDebugView if (fDebugToolbarInView) { addDebugToolbarActions(tbm); } - } + } protected void addDebugToolbarActions(IToolBarManager tbm) { tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESUME)); tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(SUSPEND)); tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE)); tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(DISCONNECT)); - + tbm.appendToGroup(IDebugUIConstants.STEP_INTO_GROUP, getAction(STEP_INTO)); tbm.appendToGroup(IDebugUIConstants.STEP_OVER_GROUP, getAction(STEP_OVER)); tbm.appendToGroup(IDebugUIConstants.STEP_RETURN_GROUP, getAction(STEP_RETURN)); tbm.appendToGroup(IDebugUIConstants.EMPTY_STEP_GROUP, getAction(DROP_TO_FRAME)); - + tbm.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS)); - } - + } + /** - * Removes the toolbar actions contributed by this view from the toolbar + * Removes the toolbar actions contributed by this view from the toolbar * manager. * @param tbm */ @@ -1033,30 +1033,30 @@ public class LaunchView extends AbstractDebugView tbm.remove(new ActionContributionItem(getAction(SUSPEND))); tbm.remove(new ActionContributionItem(getAction(TERMINATE))); tbm.remove(new ActionContributionItem(getAction(DISCONNECT))); - + tbm.remove(new ActionContributionItem(getAction(STEP_INTO))); tbm.remove(new ActionContributionItem(getAction(STEP_OVER))); tbm.remove(new ActionContributionItem(getAction(STEP_RETURN))); - + tbm.remove(new ActionContributionItem(getAction(DROP_TO_FRAME))); - + tbm.remove(new ActionContributionItem(getAction(TOGGLE_STEP_FILTERS))); } - + public boolean isDebugToolbarInView() { return fDebugToolbarInView; } - + public boolean isDebugToolbarShownInPerspective(IPerspectiveDescriptor perspective) { return perspective == null || fDebugToolbarPerspectives.contains(perspective.getId()); } - + public void setDebugToolbarInView(boolean show) { if (show == isDebugToolbarInView()) { return; } fDebugToolbarInView = show; - + // Update the perspectives set. IPerspectiveDescriptor perspective = getSite().getPage().getPerspective(); if (perspective != null) { @@ -1075,12 +1075,12 @@ public class LaunchView extends AbstractDebugView removeDebugToolbarActions(tbm); } getViewSite().getActionBars().updateActionBars(); - + // Update system property used by contributed actions. System.setProperty(IDebugUIConstants.DEBUG_VIEW_TOOBAR_VISIBLE, Boolean.toString(show)); } - - + + /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#dispose() */ @@ -1116,11 +1116,11 @@ public class LaunchView extends AbstractDebugView } super.dispose(); } - + private void disposeActions() { PropertyDialogAction properties = (PropertyDialogAction) getAction("Properties"); //$NON-NLS-1$ properties.dispose(); - + disposeCommandAction(TERMINATE); disposeCommandAction(DISCONNECT); disposeCommandAction(SUSPEND); @@ -1139,7 +1139,7 @@ public class LaunchView extends AbstractDebugView /** * The selection has changed in the viewer. Show the * associated source code if it is a stack frame. - * + * * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ @Override @@ -1160,11 +1160,11 @@ public class LaunchView extends AbstractDebugView Object o= ss.getFirstElement(); if (o == null || o instanceof IStackFrame) { return; - } + } StructuredViewer viewer = (StructuredViewer) getViewer(); viewer.refresh(o); } - + /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor) */ @@ -1183,7 +1183,7 @@ public class LaunchView extends AbstractDebugView public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) { setActive(page.findView(getSite().getId()) != null); } - + /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveListener2#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IWorkbenchPartReference, java.lang.String) */ @@ -1215,7 +1215,7 @@ public class LaunchView extends AbstractDebugView @Override public void pageOpened(IWorkbenchPage page) { } - + /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugView#getPresentation(java.lang.String) */ @@ -1223,15 +1223,15 @@ public class LaunchView extends AbstractDebugView public IDebugModelPresentation getPresentation(String id) { return ((DelegatingModelPresentation)fPresentation).getPresentation(id); } - + /* (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; - + Object element = sel != null && sel.size() > 0 ? sel.getFirstElement() : null; + menu.add(new Separator(IDebugUIConstants.EMPTY_EDIT_GROUP)); menu.add(new Separator(IDebugUIConstants.EDIT_GROUP)); menu.add(getAction(FIND_ACTION)); @@ -1260,10 +1260,10 @@ public class LaunchView extends AbstractDebugView action.setEnabled(action.isApplicableForSelection() && !(element instanceof ILaunch)); menu.add(action); menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); - + menu.appendToGroup(IDebugUIConstants.LAUNCH_GROUP, getAction(TERMINATE_AND_REMOVE)); menu.appendToGroup(IDebugUIConstants.LAUNCH_GROUP, getAction(TERMINATE_ALL)); - + menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESUME)); menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(SUSPEND)); menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE)); @@ -1272,37 +1272,37 @@ public class LaunchView extends AbstractDebugView menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESTART)); } menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(DISCONNECT)); - + menu.appendToGroup(IDebugUIConstants.STEP_INTO_GROUP, getAction(STEP_INTO)); menu.appendToGroup(IDebugUIConstants.STEP_OVER_GROUP, getAction(STEP_OVER)); menu.appendToGroup(IDebugUIConstants.STEP_RETURN_GROUP, getAction(STEP_RETURN)); - + menu.appendToGroup(IDebugUIConstants.EMPTY_STEP_GROUP, getAction(DROP_TO_FRAME)); - + 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(); - if (oldContexts.contains(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET) != - newContexts.contains(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET)) + if (oldContexts.contains(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET) != + newContexts.contains(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET)) { updateCheckedDebugToolBarAction(); } } } - + private void updateCheckedDebugToolBarAction() { fDebugToolBarAction.setChecked(isDebugToolbarInView()); } - + /** * Updates the enabled state of the given action based on the selection * and adds to the menu if enabled. - * + * * @param menu menu to add the action to * @param action action to add if enabled * @param selection selection to update enabled state for @@ -1311,33 +1311,33 @@ public class LaunchView extends AbstractDebugView action.selectionChanged(selection); if (action.isEnabled()) { menu.add(action); - } + } } - + /** * Sets whether this view is in the active page of a * perspective. Since a page can have more than one * perspective, this view only show's source when in * the active perspective/page. - * + * * @param active whether this view is in the active page of a * perspective */ protected void setActive(boolean active) { fIsActive = active; - } + } /** * Returns whether this view is in the active page of * the active perspective and has been fully created. - * + * * @return whether this view is in the active page of * the active perspective and has been fully created. */ protected boolean isActive() { return fIsActive && getViewer() != null; } - + /* (non-Javadoc) * @see org.eclipse.ui.part.IShowInTarget#show(org.eclipse.ui.part.ShowInContext) */ @@ -1370,9 +1370,9 @@ public class LaunchView extends AbstractDebugView */ @Override public ShowInContext getShowInContext() { - if (isActive()) { + if (isActive()) { IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection(); - if (selection.size() == 1) { + if (selection.size() == 1) { Object object = selection.getFirstElement(); if (object instanceof IAdaptable) { IAdaptable adaptable = (IAdaptable) object; @@ -1385,15 +1385,15 @@ public class LaunchView extends AbstractDebugView } return null; } - + /* (non-Javadoc) * @see org.eclipse.ui.part.IShowInTargetList#getShowInTargetIds() */ @Override public String[] getShowInTargetIds() { - if (isActive()) { + if (isActive()) { IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection(); - if (selection.size() == 1) { + if (selection.size() == 1) { Object object = selection.getFirstElement(); if (object instanceof IAdaptable) { IAdaptable adaptable = (IAdaptable) object; @@ -1447,7 +1447,7 @@ public class LaunchView extends AbstractDebugView public void partActivated(IWorkbenchPartReference partRef) { // Ensure that the system property matches the debug toolbar state. // Bug 385400 - System.setProperty(IDebugUIConstants.DEBUG_VIEW_TOOBAR_VISIBLE, + System.setProperty(IDebugUIConstants.DEBUG_VIEW_TOOBAR_VISIBLE, Boolean.toString(isDebugToolbarShownInPerspective(getSite().getPage().getPerspective())) ); } @@ -1487,7 +1487,7 @@ public class LaunchView extends AbstractDebugView super.becomesVisible(); getViewer().refresh(); } - + /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.IViewerUpdateListener#updateComplete(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor) */ @@ -1500,7 +1500,7 @@ 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) */ @@ -1513,7 +1513,7 @@ public class LaunchView extends AbstractDebugView */ @Override public synchronized void viewerUpdatesBegin() { - IWorkbenchSiteProgressService progressService = + IWorkbenchSiteProgressService progressService = getSite().getAdapter(IWorkbenchSiteProgressService.class); if (progressService != null) { progressService.incrementBusy(); @@ -1525,48 +1525,48 @@ public class LaunchView extends AbstractDebugView */ @Override public synchronized void viewerUpdatesComplete() { - IWorkbenchSiteProgressService progressService = + IWorkbenchSiteProgressService progressService = getSite().getAdapter(IWorkbenchSiteProgressService.class); if (progressService != null) { progressService.decrementBusy(); - } - } - + } + } + @Override public void modelChanged(IModelDelta delta, IModelProxy proxy) { updateFindAction(); } - + private void updateFindAction() { IAction action= getAction(FIND_ACTION); if (action instanceof IUpdate) { ((IUpdate) action).update(); } } - + /** * Returns whether the breadcrumb viewer is currently visible in the view. - * + * * @since 3.5 */ boolean isBreadcrumbVisible() { return fBreadcrumbPage.equals(getCurrentPage()); } - + /** - * Returns whether the elements in breadcrumb's drop-down viewer should be + * Returns whether the elements in breadcrumb's drop-down viewer should be * automatically expanded. - * + * * @since 3.5 */ boolean getBreadcrumbDropDownAutoExpand() { return fBreadcrumbDropDownAutoExpand; } - + /** - * Sets whether the elements in breadcrumb's drop-down viewer should be + * Sets whether the elements in breadcrumb's drop-down viewer should be * automatically expanded. - * + * * @since 3.5 */ void setBreadcrumbDropDownAutoExpand(boolean expand) { 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 00597dbb4..0c74d79b9 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 @@ -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 @@ -69,26 +69,26 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo Input(TreePath path) { fPath = path; } - + @Override public boolean equals(Object obj) { - return obj instanceof Input && + return obj instanceof Input && ((fPath == null && ((Input)obj).fPath == null) || (fPath != null && fPath.equals( ((Input)obj).fPath ))); } - + @Override public int hashCode() { return fPath == null ? 0 : fPath.hashCode(); } } - + private static class ContentProvider implements ITreePathContentProvider { private static final Object[] EMPTY_ELEMENTS_ARRAY = new Object[0]; - - public Input fInput; - + + public Input fInput; + @Override public Object[] getChildren(TreePath parentPath) { if (hasChildren(parentPath)) { @@ -107,9 +107,9 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo public boolean hasChildren(TreePath parentPath) { if ( parentPath.getSegmentCount() == 0) { return fInput != null; - } else if (fInput != null && - fInput.fPath != null && - fInput.fPath.getSegmentCount() > parentPath.getSegmentCount()) + } else if (fInput != null && + fInput.fPath != null && + fInput.fPath.getSegmentCount() > parentPath.getSegmentCount()) { for (int i = 0; i < parentPath.getSegmentCount(); i++) { if (i >= fInput.fPath.getSegmentCount()) { @@ -129,8 +129,8 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo @Override public Object[] getElements(Object inputElement) { - if (fInput != null && - fInput.fPath != null) + if (fInput != null && + fInput.fPath != null) { return getChildren(TreePath.EMPTY); } else { @@ -152,7 +152,7 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } } } - + private class LabelProvider extends BaseLabelProvider implements ITreePathLabelProvider { @Override public void updateLabel(ViewerLabel label, TreePath elementPath) { @@ -171,31 +171,31 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo label.setFont(treeViewerLabel.getFont()); label.setForeground(treeViewerLabel.getForeground()); label.setBackground(treeViewerLabel.getBackground()); - + } - } + } } } - + private final LaunchView fView; private final TreeModelViewer fTreeViewer; private final IDebugContextProvider fTreeViewerContextProvider; private Input fBreadcrumbInput; - static final private Object fgEmptyDebugContextElement = new Object(); + static final private Object fgEmptyDebugContextElement = new Object(); private BreadcrumbViewer fViewer; private boolean fRefreshBreadcrumb = false; - + private class BreadcrumbContextProvider extends AbstractDebugContextProvider implements IDebugContextListener, ISelectionChangedListener { - + private ISelection fBreadcrumbSelection = null; - + BreadcrumbContextProvider() { super(fView); fViewer.addSelectionChangedListener(this); fBreadcrumbSelection = fViewer.getSelection(); fTreeViewerContextProvider.addDebugContextListener(this); } - + @Override public ISelection getActiveContext() { if (fBreadcrumbSelection != null && !fBreadcrumbSelection.isEmpty()) { @@ -205,17 +205,17 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo return treeViewerSelection != null ? treeViewerSelection : StructuredSelection.EMPTY; } } - + void dispose() { fViewer.removeSelectionChangedListener(this); fTreeViewerContextProvider.removeDebugContextListener(this); } - + @Override public void debugContextChanged(DebugContextEvent event) { fire(new DebugContextEvent(this, getActiveContext(), event.getFlags())); } - + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection oldContext = getActiveContext(); @@ -227,7 +227,7 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } private BreadcrumbContextProvider fBreadcrumbContextProvider; - + public LaunchViewBreadcrumb(LaunchView view, TreeModelViewer treeViewer, IDebugContextProvider contextProvider) { fView = view; fTreeViewer = treeViewer; @@ -236,7 +236,7 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo fBreadcrumbInput = new Input( getPathForSelection(fTreeViewerContextProvider.getActiveContext()) ); fTreeViewerContextProvider.addDebugContextListener(this); } - + @Override protected void activateBreadcrumb() { } @@ -260,7 +260,7 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } }; - // Force the layout of the breadcrumb viewer so that we may calcualte + // Force the layout of the breadcrumb viewer so that we may calcualte // its proper size. parent.pack(true); @@ -268,11 +268,11 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo fViewer.setLabelProvider(new LabelProvider()); createMenuManager(); - + fViewer.setInput(getCurrentInput()); - + fBreadcrumbContextProvider = new BreadcrumbContextProvider(); - + return fViewer; } @@ -306,7 +306,7 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } }); } - + @Override protected Object getCurrentInput() { return fBreadcrumbInput; @@ -333,12 +333,12 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo @Override public void debugContextChanged(DebugContextEvent event) { if (fView.isBreadcrumbVisible()) { - fBreadcrumbInput = new Input(getPathForSelection(event.getContext())); + fBreadcrumbInput = new Input(getPathForSelection(event.getContext())); if ((event.getFlags() & DebugContextEvent.ACTIVATED) != 0) { setInput(getCurrentInput()); - + // If the context was activated, then clear the selection in breadcrumb - // so that the activated context will become the active context for the + // so that the activated context will become the active context for the // window. fViewer.setSelection(StructuredSelection.EMPTY); } else { @@ -346,11 +346,11 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } } } - + @Override public void labelUpdateStarted(ILabelUpdate update) { } - + @Override public void labelUpdateComplete(ILabelUpdate update) { if (fBreadcrumbInput != null && fBreadcrumbInput.fPath != null) { @@ -361,11 +361,11 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } } } - + @Override public void labelUpdatesBegin() { } - + @Override public void labelUpdatesComplete() { boolean refresh = false; @@ -384,36 +384,36 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo }.schedule(); } } - + IDebugContextProvider getContextProvider() { return fBreadcrumbContextProvider; } - + int getHeight() { return fViewer.getControl().getSize().y; } - + void clearSelection() { fViewer.setSelection(StructuredSelection.EMPTY); } - + private TreePath getPathForSelection(ISelection selection) { if (selection instanceof ITreeSelection && !selection.isEmpty()) { return ((ITreeSelection)selection).getPaths()[0]; } return null; } - + public Control createDropDownControl(Composite parent, final IBreadcrumbDropDownSite site, TreePath paramPath) { - + TreeViewerDropDown dropDownTreeViewer = new TreeViewerDropDown() { - + SubTreeModelViewer fDropDownViewer; - + @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, + composite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.VIRTUAL | SWT.POP_UP, fTreeViewer.getPresentationContext()); Object launchViewInput = fTreeViewer.getInput(); @@ -421,12 +421,12 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo ViewerFilter[] filters = fTreeViewer.getFilters(); fDropDownViewer.setFilters(filters); - + ModelDelta stateDelta = new ModelDelta(launchViewInput, IModelDelta.NO_CHANGE); fTreeViewer.saveElementState(TreePath.EMPTY, stateDelta, IModelDelta.EXPAND | IModelDelta.SELECT); - + // If we do not want to expand the elements in the drop-down. - // Prune the delta to only select the element in the + // Prune the delta to only select the element in the // top-most list. if (!fView.getBreadcrumbDropDownAutoExpand()) { final ModelDelta prunedDelta = new ModelDelta(launchViewInput, IModelDelta.NO_CHANGE); @@ -442,19 +442,19 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo // Build up the delta copy along the path of the drop-down element. copy = copy.addNode( delta.getElement(), delta.getIndex(), delta.getFlags(), delta.getChildCount()); - } - - // If the delta is for the drop-down element, set its select flag and stop traversing + } + + // If the delta is for the drop-down element, set its select flag and stop traversing // the delta.. if (deltaPath.equals(path)) { copy.setFlags(IModelDelta.SELECT | IModelDelta.REVEAL); return false; } - + // Continue traversing the delta. return true; } - + private TreePath getViewerTreePath(IModelDelta node) { ArrayList<Object> list = new ArrayList<Object>(); IModelDelta parentDelta = node.getParentDelta(); @@ -468,9 +468,9 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo }); stateDelta = prunedDelta; } - + fDropDownViewer.updateViewer(stateDelta); - + fDropDownViewer.addLabelUpdateListener(new ILabelUpdateListener() { @Override public void labelUpdateComplete(ILabelUpdate update) {} @@ -499,16 +499,16 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo if (fTreeViewer.getControl().isDisposed()) { return; } - + if (selection != null && (selection instanceof ITreeSelection) && !selection.isEmpty()) { // Create the path to the root element of the drop-down viewer. Need to calcualte - // indexes and counts for the delta in order for the selection from the drop-down + // indexes and counts for the delta in order for the selection from the drop-down // viewer to work properly. TreeModelContentProvider contentProvider = (TreeModelContentProvider)fTreeViewer.getContentProvider(); TreePath path = TreePath.EMPTY; int count = fTreeViewer.getChildCount(path); count = contentProvider.viewToModelCount(path, count); - ModelDelta rootDelta = + ModelDelta rootDelta = new ModelDelta(fTreeViewer.getInput(), -1, IModelDelta.NO_CHANGE, count); TreePath rootPath = fDropDownViewer.getRootPath(); ModelDelta delta = rootDelta; @@ -521,10 +521,10 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo count = contentProvider.viewToModelCount(path, count); delta = delta.addNode(rootPath.getSegment(i), index, IModelDelta.NO_CHANGE, count); } - + // Create the delta and save the drop-down viewer's state to it. fDropDownViewer.saveElementState(TreePath.EMPTY, delta, IModelDelta.EXPAND | IModelDelta.SELECT); - + // Add the IModelDelta.FORCE flag to override the current selection in view. rootDelta.accept(new IModelDeltaVisitor(){ @Override @@ -536,23 +536,23 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo } }); - // If elements in the drop-down were auto-expanded, then collapse the drop-down's sub tree in the + // If elements in the drop-down were auto-expanded, then collapse the drop-down's sub tree in the // full viewer. After the drop-down's full expansion state is saved out to the tree viewer, the - // tree viewer will accurately reflect the state changes made by the user. + // tree viewer will accurately reflect the state changes made by the user. if (fView.getBreadcrumbDropDownAutoExpand()) { fTreeViewer.collapseToLevel(rootPath, AbstractTreeViewer.ALL_LEVELS); - } - + } + // Save the state of the drop-down out into the tree viewer. fTreeViewer.updateViewer(rootDelta); fViewer.setSelection(StructuredSelection.EMPTY); site.close(); } - + super.openElement(selection); } }; - + return dropDownTreeViewer.createDropDown(parent, site, paramPath); } 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 cffa5ecb0..494856be0 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 @@ -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 @@ -24,15 +24,15 @@ import org.eclipse.swt.widgets.TreeItem; import org.eclipse.swt.widgets.Widget; /** - * Copy action for debug view. This action is specialized from the standard + * Copy action for debug view. This action is specialized from the standard * copy action in a couple of ways: * <ul> - * <li>If debug view is in debug mode, then the selected element in + * <li>If debug view is in debug mode, then the selected element in * breadcrumb is translated into the tree viewer, and then copied</li> - * <li> If an item is selected all the item's children are copied into + * <li> If an item is selected all the item's children are copied into * clipbard.</li> * </ul> - * + * * @since 3.5 */ public class LaunchViewCopyToClipboardActionDelegate extends VirtualCopyToClipboardActionDelegate { @@ -76,10 +76,10 @@ public class LaunchViewCopyToClipboardActionDelegate extends VirtualCopyToClipbo } } else if (item instanceof Tree) { collectChildItems(set, ((Tree)item).getItems()); - } + } return set.toArray(new TreeItem[set.size()]); } - + 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 06b9c4dea..5abc9ad87 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 @@ -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,11 +23,11 @@ import org.eclipse.ui.part.EditorPart; /** * Editor used when no source if found for a stack frame. - * + * * @since 2.1 */ public class SourceNotFoundEditor extends EditorPart implements IReusableEditor { - + /** * Text widget used for this editor */ 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 6d94c489a..70e456ecc 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 @@ -25,16 +25,16 @@ import com.ibm.icu.text.MessageFormat; /** * Editor input for a stack frame for which source could not be located. - * + * * @since 2.1 */ public class SourceNotFoundEditorInput extends PlatformObject implements IEditorInput { - + /** * Associated stack frame */ private IStackFrame fFrame; - + /** * Stack frame text (cached on creation) */ @@ -43,7 +43,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor /** * Constructs an editor input for the given stack frame, * to indicate source could not be found. - * + * * @param frame stack frame */ public SourceNotFoundEditorInput(IStackFrame frame) { @@ -77,7 +77,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor try { return fFrame.getName(); } catch (DebugException e) { - return DebugUIViewsMessages.SourceNotFoundEditorInput_Source_Not_Found_1; + return DebugUIViewsMessages.SourceNotFoundEditorInput_Source_Not_Found_1; } } 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 639f708ef..511cfbf4b 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 @@ -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 *******************************************************************************/ @@ -18,11 +18,11 @@ import org.eclipse.ui.IEditorPart; * A reminder to remove any annotations created by an editor presentation */ public class StandardDecoration extends Decoration { - + private IThread fThread; private IEditorPart fEditor; private IDebugEditorPresentation fPresentation; - + public StandardDecoration(IDebugEditorPresentation presentation, IEditorPart editorPart, IThread thread) { fThread = thread; fEditor = editorPart; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/TerminateAndRemoveHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/TerminateAndRemoveHandler.java index f2de925f8..a94ec1fcd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/TerminateAndRemoveHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/TerminateAndRemoveHandler.java @@ -18,7 +18,7 @@ import org.eclipse.debug.internal.ui.commands.actions.DebugActionHandler; * @since 3.6 */ public class TerminateAndRemoveHandler extends DebugActionHandler { - + public TerminateAndRemoveHandler() { super(LaunchView.TERMINATE_AND_REMOVE); } |