Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Pazderski2019-05-18 18:03:52 -0400
committerPaul Pazderski2019-06-14 08:39:45 -0400
commit4e5b4450176cf71c5f3620377ec4d7ef39392c0c (patch)
tree2f248a44fd5072a873c92f9fc18f748b3aad39c0 /org.eclipse.debug.ui/ui/org/eclipse/debug/internal
parenta27187cb1a408caaadf5eca6909bbe03a8b297a4 (diff)
downloadeclipse.platform.debug-4e5b4450176cf71c5f3620377ec4d7ef39392c0c.tar.gz
eclipse.platform.debug-4e5b4450176cf71c5f3620377ec4d7ef39392c0c.tar.xz
eclipse.platform.debug-4e5b4450176cf71c5f3620377ec4d7ef39392c0c.zip
Bug 547304 - [cleanup] Fix wrong space/tab indentationI20190616-1800I20190615-1800I20190614-1800
This change fixes space or mixed tab/space indentations in all Java files. This also includes two or three space indentations and even fix most stray single spaces in indentations. The change includes only whitespace formatting and no code changes. Change-Id: I95f385f1587b72776aee5d955b66e82539dedc3c
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug/internal')
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CompositeDebugImageDescriptor.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java18
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java70
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIAdapterFactory.java24
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java512
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java58
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java68
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IDebugHelpContextIds.java44
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java796
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java228
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java176
-rwxr-xr-xorg.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SWTFactory.java140
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariableValueEditorManager.java120
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java250
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetRunToLineAction.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleBreakpointsTargetManager.java1152
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AbstractBreakpointsViewAction.java28
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointSelectionAction.java38
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointWorkingSetAction.java46
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ClearDefaultBreakpointGroupAction.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsActionDelegate.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/EditBreakpointGroupAction.java26
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java62
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java116
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java48
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java88
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java152
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SetDefaultBreakpointGroupAction.java24
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ToggleDefaultGroupAction.java68
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/WorkingSetsAction.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointSortBy/SortBreakpointsByAction.java26
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/AccessWatchpointToggleAction.java26
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java68
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsExpandAllAction.java84
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/EnableBreakpointsAction.java28
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModificationWatchpointToggleAction.java26
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModifyWatchpointAction.java132
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/OpenBreakpointMarkerAction.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java30
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java76
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ToggleBreakpointObjectActionDelegate.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java92
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressionAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EnableWatchExpressionAction.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ReevaluateWatchExpressionAction.java52
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/SelectAllExpressionsAction.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionAction.java70
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java32
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchHandler.java160
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java74
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneAssignValueAction.java34
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java120
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointContainer.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointOrganizer.java52
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointUIConstants.java80
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/OtherBreakpointCategory.java78
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandActionDelegate.java24
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandService.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java48
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandHandler.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandHandler.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ExecuteActionRequest.java28
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/IEnabledTarget.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java54
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandActionDelegate.java38
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandHandler.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandActionDelegate.java38
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandHandler.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandActionDelegate.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandActionDelegate.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandActionDelegate.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandHandler.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java48
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandActionDelegate.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandHandler.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java102
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java176
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandActionDelegate.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandHandler.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java50
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandActionDelegate.java22
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandHandler.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextSourceProvider.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java72
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java112
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/LaunchSuspendTrigger.java40
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/AsynchronousDebugLabelAdapter.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultBreakpointsViewInput.java28
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultVariableCellModifier.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryRetrievalContentAdapter.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameViewerInputProvider.java18
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnFactoryAdapter.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/WatchExpressionCellModifier.java24
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationTabGroup.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/DebugTextHover.java84
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/ExpressionInformationControlCreator.java188
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java218
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java18
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java86
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java18
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java20
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java38
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java20
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java66
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java102
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java240
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java58
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SaveScopeResourcesHandler.java38
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectFavoritesDialog.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingType.java82
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java72
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java1908
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointMementoProvider.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugElementLabelProvider.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugElementMementoProvider.java54
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/DebugTargetContentProvider.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementContentProvider.java146
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementLabelProvider.java84
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java104
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionLabelProvider.java224
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerContentProvider.java196
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/MemoryRetrievalContentProvider.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/StackFrameContentProvider.java30
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableContentProvider.java312
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableLabelProvider.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ViewerInputProvider.java64
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/IDebugPreferenceConstants.java54
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java114
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java24
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerViewer.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java214
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupResult.java142
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupService.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java66
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PasswordPrompt.java54
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java294
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousRequestMonitor.java252
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousSchedulingRuleFactory.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java108
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java646
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java186
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java82
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelRequestMonitor.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java138
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/PartPresentationContext.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableUpdatePolicy.java144
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/AbstractBreadcrumb.java72
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItem.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDetails.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDropDown.java192
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java230
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/IBreadcrumbDropDownSite.java30
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/TreeViewerDropDown.java392
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java112
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenUpdate.java54
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementCompareRequest.java80
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementMementoRequest.java30
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/FilterTransform.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java62
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/IInternalTreeModelViewer.java524
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ITreeModelContentProvider.java434
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ITreeModelLabelProvider.java82
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java1428
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java2580
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/MementoUpdate.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/SubTreeModelViewer.java964
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TimeTriggeredProgressMonitorDialog.java130
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java2010
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java268
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerAdapterService.java128
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerInputUpdate.java146
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerStateTracker.java2086
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerUpdateMonitor.java242
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java240
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java282
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ICheckUpdate.java24
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ICheckboxModelProxy.java34
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IElementContentProvider.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IElementMementoProvider.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ILabelUpdate.java58
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IModelProxy.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IModelProxy2.java30
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IModelSelectionPolicy.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IPresentationContext.java154
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IStateUpdateListener.java30
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IStatusMonitor.java30
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ITreeModelViewer.java438
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IViewerUpdate.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IVirtualItemListener.java30
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/IVirtualItemValidator.java28
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ModelDelta.java306
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/PresentationContext.java252
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/TreeModelViewer.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/TreeModelViewerFilter.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ViewerInputService.java34
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java996
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTree.java332
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTreeModelViewer.java318
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AbstractModelProxy.java86
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AsynchronousContentAdapter.java148
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/AsynchronousLabelAdapter.java102
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/IAsynchronousContentAdapter.java42
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/IAsynchronousLabelAdapter.java20
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/IChildrenRequestMonitor.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/IContainerRequestMonitor.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/provisional/ILabelRequestMonitor.java50
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointManagerProxy.java132
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DebugTargetEventHandler.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DebugTargetProxy.java160
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultSelectionPolicy.java40
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultVariableViewModelProxy.java20
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultWatchExpressionModelProxy.java46
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/EventHandlerModelProxy.java410
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ExpressionEventHandler.java60
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ExpressionManagerModelProxy.java54
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchProxy.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ProcessProxy.java88
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ThreadEventHandler.java142
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/DebugUIViewsMessages.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java1210
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java1064
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java136
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointFactory.java46
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java94
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerManager.java132
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java56
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java38
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetElementAdapter.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java24
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsContentProvider.java370
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDragAdapter.java132
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDropAdapter.java80
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsLabelProvider.java116
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java610
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsViewer.java622
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ElementComparator.java30
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/FileBreakpointOrganizer.java20
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ProjectBreakpointOrganizer.java20
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java100
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java158
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java156
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleMessages.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java18
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java116
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java44
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java1202
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java454
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java234
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java22
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java20
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java710
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java226
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java84
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java332
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java1272
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java840
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewCopyToClipboardActionDelegate.java96
-rwxr-xr-xorg.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.java32
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java276
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java52
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/RenderingsUtil.java164
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingCellModifier.java318
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java34
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesViewMessages.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersViewMessages.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java20
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/EditVariableLogicalStructureAction.java70
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectLogicalStructureAction.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectionDragAdapter.java62
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java214
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AvailableDetailPanesAction.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java44
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java98
313 files changed, 22262 insertions, 22262 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java
index fd2fdc4e4..7f234f4e6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java
@@ -84,13 +84,13 @@ public abstract class AbstractDebugListSelectionDialog extends AbstractDebugSele
return false;
}
- @Override
+ @Override
protected void okPressed() {
ISelection selection = fViewer.getSelection();
if (selection instanceof IStructuredSelection) {
setResult(((IStructuredSelection) selection).toList());
}
super.okPressed();
- }
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java
index 9cc311402..14af78526 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java
@@ -152,8 +152,8 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog {
* @return viewer used in this dialog
*/
protected Viewer getViewer(){
- return fViewer;
- }
+ return fViewer;
+ }
@Override
protected Control createContents(Composite parent) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CompositeDebugImageDescriptor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CompositeDebugImageDescriptor.java
index d6c619bff..7d0e3b95d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CompositeDebugImageDescriptor.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CompositeDebugImageDescriptor.java
@@ -106,9 +106,9 @@ public class CompositeDebugImageDescriptor extends CompositeImageDescriptor {
return fBaseImage;
}
- protected void setBaseImage(Image image) {
- fBaseImage = image;
- }
+ protected void setBaseImage(Image image) {
+ fBaseImage = image;
+ }
protected int getFlags() {
return fFlags;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java
index f7281fee6..f8961d034 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java
@@ -66,15 +66,15 @@ public class DebugModelPropertyTester extends PropertyTester {
Platform.getAdapterManager().
getAdapter(receiver, IDebugModelProvider.class);
}
- if (modelProvider != null) {
- String[] ids = modelProvider.getModelIdentifiers();
- for (int i = 0; i < ids.length; i++) {
- if (ids[i].equals(expectedValue)) {
- return true;
- }
- }
- return false;
- }
+ if (modelProvider != null) {
+ String[] ids = modelProvider.getModelIdentifiers();
+ for (int i = 0; i < ids.length; i++) {
+ if (ids[i].equals(expectedValue)) {
+ return true;
+ }
+ }
+ return false;
+ }
// There is no element selected with an associated debug model.
// Return true iff the expected value is an empty string.
return "".equals(expectedValue); //$NON-NLS-1$
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java
index 3d06ce444..15048895a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java
@@ -51,7 +51,7 @@ public class DebugPluginImages {
// Use IPath and toOSString to build the names to ensure they have the slashes correct
private final static String CTOOL= ICONS_PATH + "etool16/"; //basic colors - size 16x16 //$NON-NLS-1$
- private final static String DTOOL= ICONS_PATH + "dtool16/"; //basic colors - size 16x16 //$NON-NLS-1$
+ private final static String DTOOL= ICONS_PATH + "dtool16/"; //basic colors - size 16x16 //$NON-NLS-1$
private final static String DLCL= ICONS_PATH + "dlcl16/"; //disabled - size 16x16 //$NON-NLS-1$
private final static String ELCL= ICONS_PATH + "elcl16/"; //enabled - size 16x16 //$NON-NLS-1$
private final static String OBJECT= ICONS_PATH + "obj16/"; //basic colors - size 16x16 //$NON-NLS-1$
@@ -66,7 +66,7 @@ public class DebugPluginImages {
// Actions
declareRegistryImage(IDebugUIConstants.IMG_ACT_DEBUG, CTOOL + "debug_exc.png"); //$NON-NLS-1$
declareRegistryImage(IDebugUIConstants.IMG_ACT_RUN, CTOOL + "run_exc.png"); //$NON-NLS-1$
- declareRegistryImage(IDebugUIConstants.IMG_ACT_SYNCED, ELCL + "synced.png"); //$NON-NLS-1$
+ declareRegistryImage(IDebugUIConstants.IMG_ACT_SYNCED, ELCL + "synced.png"); //$NON-NLS-1$
declareRegistryImage(IDebugUIConstants.IMG_SKIP_BREAKPOINTS, ELCL + "skip_brkp.png"); //$NON-NLS-1$
//menus
@@ -87,12 +87,12 @@ public class DebugPluginImages {
declareRegistryImage(IDebugUIConstants.IMG_LCL_TYPE_NAMES, ELCL + "tnames_co.png"); //$NON-NLS-1$
declareRegistryImage(IDebugUIConstants.IMG_LCL_DISCONNECT, ELCL + "disconnect_co.png"); //$NON-NLS-1$
declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE_ALL, ELCL + "rem_all_co.png"); //$NON-NLS-1$
- declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE, ELCL + "rem_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE, ELCL + "rem_co.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_LCL_SHOW_LOGICAL_STRUCTURE, ELCL + "var_cntnt_prvdr.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_LCL_COLLAPSE_ALL, ELCL + "collapseall.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_LCL_TERMINATE, ELCL + "terminate_co.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_LCL_RUN_TO_LINE, ELCL + "runtoline_co.png"); //$NON-NLS-1$
- declareRegistryImage(IDebugUIConstants.IMG_LCL_ADD, ELCL + "monitorexpression_tsk.png"); //$NON-NLS-1$
+ declareRegistryImage(IDebugUIConstants.IMG_LCL_ADD, ELCL + "monitorexpression_tsk.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_LCL_REMOVE_MEMORY, ELCL + "removememory_tsk.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_LCL_RESET_MEMORY, ELCL + "memoryreset_tsk.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_LCL_COPY_VIEW_TO_CLIPBOARD, ELCL + "copyviewtoclipboard_tsk.png"); //$NON-NLS-1$
@@ -110,7 +110,7 @@ public class DebugPluginImages {
declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_COLLAPSE_ALL, DLCL + "collapseall.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TERMINATE, DLCL + "terminate_co.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL, DLCL + "rem_all_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_REMOVE, DLCL + "rem_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_REMOVE, DLCL + "rem_co.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_RUN_TO_LINE, DLCL + "runtoline_co.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_MONITOR_EXPRESSION, DLCL + "monitorexpression_tsk.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_REMOVE_MEMORY, DLCL + "removememory_tsk.png"); //$NON-NLS-1$
@@ -125,20 +125,20 @@ public class DebugPluginImages {
declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_LINK_PROTO, DLCL + "link_proto.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_UNLINK_PROTO, DLCL + "unlink_proto.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_RESET_PROTO, DLCL + "reset_proto.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_DISCONNECT, DLCL + "disconnect_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_SUSPEND, DLCL + "suspend_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_RESUME, DLCL + "resume_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_STEP_RETURN, DLCL+ "stepreturn_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_STEP_OVER, DLCL + "stepover_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_STEP_INTO, DLCL + "stepinto_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_REMOVE, DLCL + "terminate_rem_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_ALL, DLCL + "terminate_all_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_RELAUNCH, DTOOL + "term_restart.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TOGGLE_STEP_FILTERS, DLCL+"stepbystep_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_NEXT_THREAD, DLCL+"next_thread_nav.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_PREVIOUS_THREAD, DLCL+"prev_thread_nav.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_RESTART, DLCL+"restart_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_EXPORT_CONFIG, DLCL + "export_config.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_DISCONNECT, DLCL + "disconnect_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_SUSPEND, DLCL + "suspend_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_RESUME, DLCL + "resume_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_STEP_RETURN, DLCL+ "stepreturn_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_STEP_OVER, DLCL + "stepover_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_STEP_INTO, DLCL + "stepinto_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_REMOVE, DLCL + "terminate_rem_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_ALL, DLCL + "terminate_all_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_RELAUNCH, DTOOL + "term_restart.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TOGGLE_STEP_FILTERS, DLCL+"stepbystep_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_NEXT_THREAD, DLCL+"next_thread_nav.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_PREVIOUS_THREAD, DLCL+"prev_thread_nav.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_RESTART, DLCL+"restart_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_EXPORT_CONFIG, DLCL + "export_config.png"); //$NON-NLS-1$
// enabled local toolbars
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE, ELCL + "toggledetailpane_co.png"); //$NON-NLS-1$
@@ -158,7 +158,7 @@ public class DebugPluginImages {
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_COPY_VIEW_TO_CLIPBOARD, ELCL + "copyviewtoclipboard_tsk.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_PRINT_TOP_VIEW_TAB, ELCL + "printview_tsk.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL, ELCL + "rem_all_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_REMOVE, ELCL + "rem_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_REMOVE, ELCL + "rem_co.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_HIERARCHICAL, ELCL + "hierarchicalLayout.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_FILTER_CONFIGS, ELCL + "filter_ps.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DUPLICATE_CONFIG, ELCL + "copy_edit_co.png"); //$NON-NLS-1$
@@ -168,21 +168,21 @@ public class DebugPluginImages {
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_LINK_PROTO, ELCL + "link_proto.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_UNLINK_PROTO, ELCL + "unlink_proto.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESET_PROTO, ELCL + "reset_proto.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_SUSPEND, ELCL + "suspend_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESUME, ELCL + "resume_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_RETURN, ELCL + "stepreturn_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_OVER, ELCL + "stepover_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO, ELCL + "stepinto_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DROP_TO_FRAME, ELCL + "drop_to_frame.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE, ELCL + "terminate_rem_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_ALL, ELCL + "terminate_all_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH, CTOOL + "term_restart.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TOGGLE_STEP_FILTERS, ELCL+"stepbystep_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STANDARD_OUT, ELCL+"writeout_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STANDARD_ERR, ELCL+"writeerr_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_NEXT_THREAD, ELCL+"next_thread_nav.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_PREVIOUS_THREAD, ELCL+"prev_thread_nav.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESTART, ELCL+"restart_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_SUSPEND, ELCL + "suspend_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESUME, ELCL + "resume_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_RETURN, ELCL + "stepreturn_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_OVER, ELCL + "stepover_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO, ELCL + "stepinto_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DROP_TO_FRAME, ELCL + "drop_to_frame.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE, ELCL + "terminate_rem_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_ALL, ELCL + "terminate_all_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH, CTOOL + "term_restart.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TOGGLE_STEP_FILTERS, ELCL+"stepbystep_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STANDARD_OUT, ELCL+"writeout_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STANDARD_ERR, ELCL+"writeerr_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_NEXT_THREAD, ELCL+"next_thread_nav.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_PREVIOUS_THREAD, ELCL+"prev_thread_nav.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESTART, ELCL+"restart_co.png"); //$NON-NLS-1$
declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_EXPORT_CONFIG, ELCL + "export_config.png"); //$NON-NLS-1$
//Object
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIAdapterFactory.java
index 2119bbb3c..ad3c95fa5 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIAdapterFactory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIAdapterFactory.java
@@ -39,21 +39,21 @@ public class DebugUIAdapterFactory implements IAdapterFactory {
if (adapterType == IPersistableElement.class) {
if (obj instanceof IBreakpoint) {
- return (T) new BreakpointPersistableElementAdapter((IBreakpoint)obj);
- }
+ return (T) new BreakpointPersistableElementAdapter((IBreakpoint)obj);
+ }
}
- if (adapterType == IWorkbenchAdapter.class) {
- if (obj instanceof IBreakpointContainer) {
- return (T) new BreakpointContainerWorkbenchAdapter();
- }
- }
+ if (adapterType == IWorkbenchAdapter.class) {
+ if (obj instanceof IBreakpointContainer) {
+ return (T) new BreakpointContainerWorkbenchAdapter();
+ }
+ }
- if (adapterType == IWorkbenchAdapter2.class) {
- if (obj instanceof IBreakpointContainer) {
- return (T) new BreakpointContainerWorkbenchAdapter();
- }
- }
+ if (adapterType == IWorkbenchAdapter2.class) {
+ if (obj instanceof IBreakpointContainer) {
+ return (T) new BreakpointContainerWorkbenchAdapter();
+ }
+ }
return null;
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java
index 85d727654..e75f65f61 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java
@@ -21,7 +21,7 @@ import org.eclipse.osgi.util.NLS;
public class DebugUIMessages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.debug.internal.ui.DebugUIMessages";//$NON-NLS-1$
- public static String AbstractAsyncTableRendering_2;
+ public static String AbstractAsyncTableRendering_2;
public static String AbstractDebugCheckboxSelectionDialog_0;
@@ -51,7 +51,7 @@ public class DebugUIMessages extends NLS {
public static String SwitchMemoryBlockAction_4;
- public static String WorkingDirectoryStatusHandler_0;
+ public static String WorkingDirectoryStatusHandler_0;
public static String WorkingDirectoryStatusHandler_Eclipse_Runtime_1;
public static String DebugUITools_3;
@@ -299,7 +299,7 @@ public class DebugUIMessages extends NLS {
//
// Elements
//
- public static String ExpressionManagerContentProvider_1;
+ public static String ExpressionManagerContentProvider_1;
static {
// load message values from bundle file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
index 6049c5fa0..cf4f3b231 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
@@ -205,18 +205,18 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
*/
private LaunchingResourceManager fContextLaunchingManager = null;
- /**
- * Image descriptor registry used for images with common overlays.
- *
- * @since 3.1
- */
- private ImageDescriptorRegistry fImageDescriptorRegistry;
-
- /**
- * A set of <code>ISaveParticipant</code>s that want to contribute to saving via this plugin
- *
- * @since 3.3
- */
+ /**
+ * Image descriptor registry used for images with common overlays.
+ *
+ * @since 3.1
+ */
+ private ImageDescriptorRegistry fImageDescriptorRegistry;
+
+ /**
+ * A set of <code>ISaveParticipant</code>s that want to contribute to saving via this plugin
+ *
+ * @since 3.3
+ */
private Set<ISaveParticipant> fSaveParticipants = new HashSet<>();
/**
@@ -226,31 +226,31 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
*/
private IPropertyChangeListener fThemeListener;
- /**
- * Dummy launch node representing a launch that is waiting
- * for a build to finish before proceeding. This node exists
- * to provide immediate feedback to the user in the Debug view and
- * allows termination, which equates to cancellation of the launch.
- */
+ /**
+ * Dummy launch node representing a launch that is waiting
+ * for a build to finish before proceeding. This node exists
+ * to provide immediate feedback to the user in the Debug view and
+ * allows termination, which equates to cancellation of the launch.
+ */
public static class PendingLaunch extends Launch {
- private Job fJob;
- public PendingLaunch(ILaunchConfiguration launchConfiguration, String mode, Job job) {
- super(launchConfiguration, mode, null);
- fJob= job;
- }
-
- // Allow the user to terminate the dummy launch as a means to
- // cancel the launch while waiting for a build to finish.
- @Override
+ private Job fJob;
+ public PendingLaunch(ILaunchConfiguration launchConfiguration, String mode, Job job) {
+ super(launchConfiguration, mode, null);
+ fJob= job;
+ }
+
+ // Allow the user to terminate the dummy launch as a means to
+ // cancel the launch while waiting for a build to finish.
+ @Override
public boolean canTerminate() {
- return true;
- }
+ return true;
+ }
- @Override
+ @Override
public void terminate() throws DebugException {
- fJob.cancel();
- }
- }
+ fJob.cancel();
+ }
+ }
/**
* Constructs the debug UI plug-in
@@ -424,11 +424,11 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
@Override
public void stop(BundleContext context) throws Exception {
try {
- if (fProcessConsoleManager != null) {
- fProcessConsoleManager.shutdown();
- }
+ if (fProcessConsoleManager != null) {
+ fProcessConsoleManager.shutdown();
+ }
- BreakpointOrganizerManager.getDefault().shutdown();
+ BreakpointOrganizerManager.getDefault().shutdown();
if (fPerspectiveManager != null) {
fPerspectiveManager.shutdown();
@@ -446,15 +446,15 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
fgPresentation.dispose();
}
- if (fImageDescriptorRegistry != null) {
- fImageDescriptorRegistry.dispose();
- }
+ if (fImageDescriptorRegistry != null) {
+ fImageDescriptorRegistry.dispose();
+ }
- if (fgDefaultLabelProvider != null) {
- fgDefaultLabelProvider.dispose();
- }
+ if (fgDefaultLabelProvider != null) {
+ fgDefaultLabelProvider.dispose();
+ }
- SourceLookupFacility.shutdown();
+ SourceLookupFacility.shutdown();
DebugElementHelper.dispose();
@@ -557,8 +557,8 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
launchManager.addLaunchListener(this);
}
- // start the breakpoint organizer manager
- BreakpointOrganizerManager.getDefault();
+ // start the breakpoint organizer manager
+ BreakpointOrganizerManager.getDefault();
getLaunchConfigurationManager().startup();
@@ -683,94 +683,94 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
}
/**
- * Open the launch configuration dialog on the specified launch
- * configuration. The dialog displays the tabs for a single configuration
- * only (a tree of launch configuration is not displayed)
- * <p>
- * If a status is specified, a status handler is consulted to handle the
- * status. The status handler is passed the instance of the launch
- * configuration dialog that is opened. This gives the status handler an
- * opportunity to perform error handling/initialization as required.
- * </p>
- * @param shell the parent shell for the launch configuration dialog
- * @param configuration the configuration to display
- * @param groupIdentifier group identifier of the launch group the launch configuration
- * belongs to
- * @param status the status to display, or <code>null</code> if none
- * @param showCancel if the cancel button should be shown in the particular instance of the dialog
- * @return the return code from opening the launch configuration dialog -
- * one of <code>Window.OK</code> or <code>Window.CANCEL</code>
- *
- * @since 3.3
- *
- */
- public static int openLaunchConfigurationEditDialog(Shell shell, ILaunchConfiguration configuration, String groupIdentifier, IStatus status, boolean showCancel) {
- LaunchGroupExtension group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(groupIdentifier);
- if (group != null) {
- LaunchConfigurationEditDialog dialog = new LaunchConfigurationEditDialog(shell, configuration, group, showCancel);
- dialog.setInitialStatus(status);
- return dialog.open();
- }
- return Window.CANCEL;
- }
-
- /**
- * Open the launch configuration dialog on the specified launch
- * configuration. The dialog displays the tabs for a single configuration
- * only (a tree of launch configuration is not displayed)
- * <p>
- * If a status is specified, a status handler is consulted to handle the
- * status. The status handler is passed the instance of the launch
- * configuration dialog that is opened. This gives the status handler an
- * opportunity to perform error handling/initialization as required.
- * </p>
- * @param shell the parent shell for the launch configuration dialog
- * @param configuration the configuration to display
- * @param groupIdentifier group identifier of the launch group the launch configuration
- * belongs to
- * @param reservednames a set of launch configuration names that cannot be used when creating or renaming
- * the specified launch configuration
- * @param status the status to display, or <code>null</code> if none
- * @param setDefaults whether to set default values in the configuration
- * @return the return code from opening the launch configuration dialog -
- * one of <code>Window.OK</code> or <code>Window.CANCEL</code>
- *
- * @since 3.3
- *
- */
+ * Open the launch configuration dialog on the specified launch
+ * configuration. The dialog displays the tabs for a single configuration
+ * only (a tree of launch configuration is not displayed)
+ * <p>
+ * If a status is specified, a status handler is consulted to handle the
+ * status. The status handler is passed the instance of the launch
+ * configuration dialog that is opened. This gives the status handler an
+ * opportunity to perform error handling/initialization as required.
+ * </p>
+ * @param shell the parent shell for the launch configuration dialog
+ * @param configuration the configuration to display
+ * @param groupIdentifier group identifier of the launch group the launch configuration
+ * belongs to
+ * @param status the status to display, or <code>null</code> if none
+ * @param showCancel if the cancel button should be shown in the particular instance of the dialog
+ * @return the return code from opening the launch configuration dialog -
+ * one of <code>Window.OK</code> or <code>Window.CANCEL</code>
+ *
+ * @since 3.3
+ *
+ */
+ public static int openLaunchConfigurationEditDialog(Shell shell, ILaunchConfiguration configuration, String groupIdentifier, IStatus status, boolean showCancel) {
+ LaunchGroupExtension group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(groupIdentifier);
+ if (group != null) {
+ LaunchConfigurationEditDialog dialog = new LaunchConfigurationEditDialog(shell, configuration, group, showCancel);
+ dialog.setInitialStatus(status);
+ return dialog.open();
+ }
+ return Window.CANCEL;
+ }
+
+ /**
+ * Open the launch configuration dialog on the specified launch
+ * configuration. The dialog displays the tabs for a single configuration
+ * only (a tree of launch configuration is not displayed)
+ * <p>
+ * If a status is specified, a status handler is consulted to handle the
+ * status. The status handler is passed the instance of the launch
+ * configuration dialog that is opened. This gives the status handler an
+ * opportunity to perform error handling/initialization as required.
+ * </p>
+ * @param shell the parent shell for the launch configuration dialog
+ * @param configuration the configuration to display
+ * @param groupIdentifier group identifier of the launch group the launch configuration
+ * belongs to
+ * @param reservednames a set of launch configuration names that cannot be used when creating or renaming
+ * the specified launch configuration
+ * @param status the status to display, or <code>null</code> if none
+ * @param setDefaults whether to set default values in the configuration
+ * @return the return code from opening the launch configuration dialog -
+ * one of <code>Window.OK</code> or <code>Window.CANCEL</code>
+ *
+ * @since 3.3
+ *
+ */
public static int openLaunchConfigurationPropertiesDialog(Shell shell, ILaunchConfiguration configuration, String groupIdentifier, Set<String> reservednames, IStatus status, boolean setDefaults) {
- LaunchGroupExtension group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(groupIdentifier);
- if (group != null) {
- LaunchConfigurationPropertiesDialog dialog = new LaunchConfigurationPropertiesDialog(shell, configuration, group, reservednames);
- dialog.setInitialStatus(status);
- dialog.setDefaultsOnOpen(setDefaults);
- return dialog.open();
- }
- return Window.CANCEL;
- }
-
- /**
- * Opens the {@link LaunchConfigurationsDialog} on the given selection for the given group. A status
- * can be provided or <code>null</code> and the dialog can initialize the given {@link ILaunchConfiguration}
- * to its defaults when opening as well - as long as the specified configuration is an {@link ILaunchConfigurationWorkingCopy}.
- * @param shell the shell to open the dialog on
- * @param selection the non-null selection to show when the dialog opens
- * @param groupIdentifier the identifier of the launch group to open the dialog on
- * @param setDefaults if the default values should be set on the opened configuration - if there is one
- * @return the return code from the dialog.open() call
- * @since 3.6
- */
- public static int openLaunchConfigurationsDialog(Shell shell, IStructuredSelection selection, String groupIdentifier, boolean setDefaults) {
- LaunchGroupExtension group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(groupIdentifier);
- if (group != null) {
+ LaunchGroupExtension group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(groupIdentifier);
+ if (group != null) {
+ LaunchConfigurationPropertiesDialog dialog = new LaunchConfigurationPropertiesDialog(shell, configuration, group, reservednames);
+ dialog.setInitialStatus(status);
+ dialog.setDefaultsOnOpen(setDefaults);
+ return dialog.open();
+ }
+ return Window.CANCEL;
+ }
+
+ /**
+ * Opens the {@link LaunchConfigurationsDialog} on the given selection for the given group. A status
+ * can be provided or <code>null</code> and the dialog can initialize the given {@link ILaunchConfiguration}
+ * to its defaults when opening as well - as long as the specified configuration is an {@link ILaunchConfigurationWorkingCopy}.
+ * @param shell the shell to open the dialog on
+ * @param selection the non-null selection to show when the dialog opens
+ * @param groupIdentifier the identifier of the launch group to open the dialog on
+ * @param setDefaults if the default values should be set on the opened configuration - if there is one
+ * @return the return code from the dialog.open() call
+ * @since 3.6
+ */
+ public static int openLaunchConfigurationsDialog(Shell shell, IStructuredSelection selection, String groupIdentifier, boolean setDefaults) {
+ LaunchGroupExtension group = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(groupIdentifier);
+ if (group != null) {
LaunchConfigurationsDialog dialog = new LaunchConfigurationsDialog(shell, group);
dialog.setOpenMode(LaunchConfigurationsDialog.LAUNCH_CONFIGURATION_DIALOG_OPEN_ON_SELECTION);
dialog.setInitialSelection(selection);
dialog.setDefaultsOnOpen(setDefaults);
return dialog.open();
- }
- return Window.CANCEL;
- }
+ }
+ return Window.CANCEL;
+ }
/**
* Save all dirty editors in the workbench.
@@ -953,38 +953,38 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
}
public static boolean DEBUG_TEST_PRESENTATION_ID(IPresentationContext context) {
- if (context == null) {
- return true;
- }
- return DEBUG_PRESENTATION_ID == null || DEBUG_PRESENTATION_ID.equals(context.getId());
+ if (context == null) {
+ return true;
+ }
+ return DEBUG_PRESENTATION_ID == null || DEBUG_PRESENTATION_ID.equals(context.getId());
}
/**
- * Return the ILaunch associated with a model element, or null if there is
- * no such association.
- *
- * @param element the model element
- * @return the ILaunch associated with the element, or null.
- * @since 3.6
- */
- public static ILaunch getLaunch(Object element) {
- // support for custom models
- ILaunch launch= (ILaunch)DebugPlugin.getAdapter(element, ILaunch.class);
- if (launch == null) {
- // support for standard debug model
- if (element instanceof IDebugElement) {
- launch= ((IDebugElement)element).getLaunch();
- } else if (element instanceof ILaunch) {
- launch= ((ILaunch)element);
- } else if (element instanceof IProcess) {
- launch= ((IProcess)element).getLaunch();
- }
- }
- return launch;
- }
-
-
- /**
+ * Return the ILaunch associated with a model element, or null if there is
+ * no such association.
+ *
+ * @param element the model element
+ * @return the ILaunch associated with the element, or null.
+ * @since 3.6
+ */
+ public static ILaunch getLaunch(Object element) {
+ // support for custom models
+ ILaunch launch= (ILaunch)DebugPlugin.getAdapter(element, ILaunch.class);
+ if (launch == null) {
+ // support for standard debug model
+ if (element instanceof IDebugElement) {
+ launch= ((IDebugElement)element).getLaunch();
+ } else if (element instanceof ILaunch) {
+ launch= ((ILaunch)element);
+ } else if (element instanceof IProcess) {
+ launch= ((IProcess)element).getLaunch();
+ }
+ }
+ return launch;
+ }
+
+
+ /**
* Save dirty editors before launching, according to preferences.
*
* @return whether to proceed with launch
@@ -1199,33 +1199,33 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
workingCopy.setAttribute(ATTR_LAUNCHING_CONFIG_HANDLE, configuration.getMemento());
final ILaunch pendingLaunch = new PendingLaunch(workingCopy, mode, this);
DebugPlugin.getDefault().getLaunchManager().addLaunch(pendingLaunch);
- IJobChangeListener listener= new IJobChangeListener() {
- @Override
+ IJobChangeListener listener= new IJobChangeListener() {
+ @Override
public void sleeping(IJobChangeEvent event) {}
- @Override
+ @Override
public void scheduled(IJobChangeEvent event) {}
- @Override
+ @Override
public void running(IJobChangeEvent event) {}
- @Override
+ @Override
public void awake(IJobChangeEvent event) {}
- @Override
+ @Override
public void aboutToRun(IJobChangeEvent event) {}
- @Override
+ @Override
public void done(IJobChangeEvent event) {
- DebugPlugin dp = DebugPlugin.getDefault();
- if (dp != null) {
- dp.getLaunchManager().removeLaunch(pendingLaunch);
- }
- removeJobChangeListener(this);
- }
- };
- addJobChangeListener(listener);
+ DebugPlugin dp = DebugPlugin.getDefault();
+ if (dp != null) {
+ dp.getLaunchManager().removeLaunch(pendingLaunch);
+ }
+ removeJobChangeListener(this);
+ }
+ };
+ addJobChangeListener(listener);
try {
jobManager.join(ResourcesPlugin.FAMILY_MANUAL_BUILD, new SubProgressMonitor(monitor, 1));
jobManager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, new SubProgressMonitor(monitor, 1));
}
catch (InterruptedException e) {/*just continue.*/}
- DebugPlugin.getDefault().getLaunchManager().removeLaunch(pendingLaunch);
+ DebugPlugin.getDefault().getLaunchManager().removeLaunch(pendingLaunch);
}
else {
monitor.worked(2); /* don't wait for jobs to finish */
@@ -1273,28 +1273,28 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
*
* @return label without accelerators
*/
- public static String removeAccelerators(String label) {
- String title = label;
- if (title != null) {
- // strip out any '&' (accelerators)
- int index = title.indexOf('&');
- if (index == 0) {
- title = title.substring(1);
- } else if (index > 0) {
- //DBCS languages use "(&X)" format
- if (title.charAt(index - 1) == '(' && title.length() >= index + 3 && title.charAt(index + 2) == ')') {
- String first = title.substring(0, index - 1);
- String last = title.substring(index + 3);
- title = first + last;
- } else if (index < (title.length() - 1)) {
- String first = title.substring(0, index);
- String last = title.substring(index + 1);
- title = first + last;
- }
- }
- }
- return title;
- }
+ public static String removeAccelerators(String label) {
+ String title = label;
+ if (title != null) {
+ // strip out any '&' (accelerators)
+ int index = title.indexOf('&');
+ if (index == 0) {
+ title = title.substring(1);
+ } else if (index > 0) {
+ //DBCS languages use "(&X)" format
+ if (title.charAt(index - 1) == '(' && title.length() >= index + 3 && title.charAt(index + 2) == ')') {
+ String first = title.substring(0, index - 1);
+ String last = title.substring(index + 3);
+ title = first + last;
+ } else if (index < (title.length() - 1)) {
+ String first = title.substring(0, index);
+ String last = title.substring(index + 1);
+ title = first + last;
+ }
+ }
+ }
+ return title;
+ }
/**
* Returns the label with any DBCS accelerator moved to the end of the string.
@@ -1303,52 +1303,52 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
*
* @return label with moved accelerator
*/
- public static String adjustDBCSAccelerator(String label) {
- String title = label;
- if (title != null) {
- // strip out any '&' (accelerators)
- int index = title.indexOf('&');
- if (index > 0) {
- //DBCS languages use "(&X)" format
- if (title.charAt(index - 1) == '(' && title.length() >= index + 3 && title.charAt(index + 2) == ')') {
- String first = title.substring(0, index - 1);
- String accel = title.substring(index - 1, index + 3);
- String last = title.substring(index + 3);
- title = first + last;
- if (title.endsWith("...")) { //$NON-NLS-1$
- title = title.substring(0, title.length() - 3);
- title = title + accel + "..."; //$NON-NLS-1$
- } else {
- title = title + accel;
- }
- }
- }
- }
- return title;
- }
-
- /**
- * Returns the image descriptor registry used for this plug-in.
- * @return the singleton {@link ImageDescriptorRegistry}
- *
- * @since 3.1
- */
- public static ImageDescriptorRegistry getImageDescriptorRegistry() {
- if (getDefault().fImageDescriptorRegistry == null) {
- getDefault().fImageDescriptorRegistry = new ImageDescriptorRegistry();
- }
- return getDefault().fImageDescriptorRegistry;
- }
-
- /**
- * Returns an image descriptor for the icon referenced by the given attribute
- * and configuration element, or <code>null</code> if none.
- *
- * @param element the configuration element
- * @param attr the name of the attribute
- * @return image descriptor or <code>null</code>
- */
- public static ImageDescriptor getImageDescriptor(IConfigurationElement element, String attr) {
+ public static String adjustDBCSAccelerator(String label) {
+ String title = label;
+ if (title != null) {
+ // strip out any '&' (accelerators)
+ int index = title.indexOf('&');
+ if (index > 0) {
+ //DBCS languages use "(&X)" format
+ if (title.charAt(index - 1) == '(' && title.length() >= index + 3 && title.charAt(index + 2) == ')') {
+ String first = title.substring(0, index - 1);
+ String accel = title.substring(index - 1, index + 3);
+ String last = title.substring(index + 3);
+ title = first + last;
+ if (title.endsWith("...")) { //$NON-NLS-1$
+ title = title.substring(0, title.length() - 3);
+ title = title + accel + "..."; //$NON-NLS-1$
+ } else {
+ title = title + accel;
+ }
+ }
+ }
+ }
+ return title;
+ }
+
+ /**
+ * Returns the image descriptor registry used for this plug-in.
+ * @return the singleton {@link ImageDescriptorRegistry}
+ *
+ * @since 3.1
+ */
+ public static ImageDescriptorRegistry getImageDescriptorRegistry() {
+ if (getDefault().fImageDescriptorRegistry == null) {
+ getDefault().fImageDescriptorRegistry = new ImageDescriptorRegistry();
+ }
+ return getDefault().fImageDescriptorRegistry;
+ }
+
+ /**
+ * Returns an image descriptor for the icon referenced by the given attribute
+ * and configuration element, or <code>null</code> if none.
+ *
+ * @param element the configuration element
+ * @param attr the name of the attribute
+ * @return image descriptor or <code>null</code>
+ */
+ public static ImageDescriptor getImageDescriptor(IConfigurationElement element, String attr) {
Bundle bundle = Platform.getBundle(element.getContributor().getName());
String iconPath = element.getAttribute(attr);
if (iconPath != null) {
@@ -1367,18 +1367,18 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
}
}
return null;
- }
-
- /**
- * Returns an image descriptor for the icon referenced by the given path
- * and contributor name, or <code>null</code> if none.
- *
- * @param name the name of the contributor
- * @param path the path of the icon (from the configuration element)
- * @return image descriptor or <code>null</code>
- * @since 3.3
- */
- public static ImageDescriptor getImageDescriptor(String name, String path) {
+ }
+
+ /**
+ * Returns an image descriptor for the icon referenced by the given path
+ * and contributor name, or <code>null</code> if none.
+ *
+ * @param name the name of the contributor
+ * @param path the path of the icon (from the configuration element)
+ * @return image descriptor or <code>null</code>
+ * @since 3.3
+ */
+ public static ImageDescriptor getImageDescriptor(String name, String path) {
Bundle bundle = Platform.getBundle(name);
if (path != null) {
URL iconURL = FileLocator.find(bundle , new Path(path), null);
@@ -1387,9 +1387,9 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
}
}
return null;
- }
+ }
- /**
+ /**
* Performs extra filtering for launch configurations based on the preferences set on the
* Launch Configurations page
* @param config the config to filter
@@ -1409,7 +1409,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
ret &= new LaunchConfigurationTypeFilter().select(null, null, config.getType());
}
catch(CoreException e) {
- DebugUIPlugin.log(e);
+ DebugUIPlugin.log(e);
}
}
return ret;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java
index 59de95449..955bda6f4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPreferenceInitializer.java
@@ -160,7 +160,7 @@ public class DebugUIPreferenceInitializer extends AbstractPreferenceInitializer
*
* @since 3.5
*/
- prefs.setDefault(IDebugPreferenceConstants.DEBUG_VIEW_MODE, IDebugPreferenceConstants.DEBUG_VIEW_MODE_AUTO);
+ prefs.setDefault(IDebugPreferenceConstants.DEBUG_VIEW_MODE, IDebugPreferenceConstants.DEBUG_VIEW_MODE_AUTO);
}
/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java
index 8c5021e06..9254cd8b2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java
@@ -441,38 +441,38 @@ public class DefaultLabelProvider implements ILabelProvider {
protected String getBreakpointImageKey(IBreakpoint breakpoint) {
if (breakpoint != null && breakpoint.getMarker().exists()) {
- try {
- boolean enabled = breakpoint.isEnabled();
- if (breakpoint instanceof IWatchpoint) {
- IWatchpoint watchpoint = (IWatchpoint) breakpoint;
- if (watchpoint.isAccess()) {
- if (watchpoint.isModification()) {
- //access and modification
- if (enabled) {
- return IDebugUIConstants.IMG_OBJS_WATCHPOINT;
- }
- return IDebugUIConstants.IMG_OBJS_WATCHPOINT_DISABLED;
- }
- if (enabled) {
- return IDebugUIConstants.IMG_OBJS_ACCESS_WATCHPOINT;
- }
- return IDebugUIConstants.IMG_OBJS_ACCESS_WATCHPOINT_DISABLED;
- } else if (watchpoint.isModification()) {
- if (enabled) {
- return IDebugUIConstants.IMG_OBJS_MODIFICATION_WATCHPOINT;
- }
- return IDebugUIConstants.IMG_OBJS_MODIFICATION_WATCHPOINT_DISABLED;
- } else {
- //neither access nor modification
- return IDebugUIConstants.IMG_OBJS_WATCHPOINT_DISABLED;
- }
- }
- if (enabled) {
+ try {
+ boolean enabled = breakpoint.isEnabled();
+ if (breakpoint instanceof IWatchpoint) {
+ IWatchpoint watchpoint = (IWatchpoint) breakpoint;
+ if (watchpoint.isAccess()) {
+ if (watchpoint.isModification()) {
+ //access and modification
+ if (enabled) {
+ return IDebugUIConstants.IMG_OBJS_WATCHPOINT;
+ }
+ return IDebugUIConstants.IMG_OBJS_WATCHPOINT_DISABLED;
+ }
+ if (enabled) {
+ return IDebugUIConstants.IMG_OBJS_ACCESS_WATCHPOINT;
+ }
+ return IDebugUIConstants.IMG_OBJS_ACCESS_WATCHPOINT_DISABLED;
+ } else if (watchpoint.isModification()) {
+ if (enabled) {
+ return IDebugUIConstants.IMG_OBJS_MODIFICATION_WATCHPOINT;
+ }
+ return IDebugUIConstants.IMG_OBJS_MODIFICATION_WATCHPOINT_DISABLED;
+ } else {
+ //neither access nor modification
+ return IDebugUIConstants.IMG_OBJS_WATCHPOINT_DISABLED;
+ }
+ }
+ if (enabled) {
return IDebugUIConstants.IMG_OBJS_BREAKPOINT;
}
return IDebugUIConstants.IMG_OBJS_BREAKPOINT_DISABLED;
- } catch (CoreException e) {
- }
+ } catch (CoreException e) {
+ }
}
return null;
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
index 94bf2b550..20694eba4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
@@ -146,14 +146,14 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
return getDefaultImage(item);
}
- @Override
+ @Override
public String getText(Object item) {
- IDebugModelPresentation lp= getConfiguredPresentation(item);
- if (lp != null) {
- return lp.getText(item);
- }
- return getDefaultText(item);
- }
+ IDebugModelPresentation lp= getConfiguredPresentation(item);
+ if (lp != null) {
+ return lp.getText(item);
+ }
+ return getDefaultText(item);
+ }
@Override
public IEditorInput getEditorInput(Object item) {
@@ -319,35 +319,35 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
return fLabelProviders;
}
- @Override
+ @Override
public Color getForeground(Object element) {
- IDebugModelPresentation presentation = getConfiguredPresentation(element);
- if (presentation instanceof IColorProvider) {
- IColorProvider colorProvider = (IColorProvider) presentation;
- return colorProvider.getForeground(element);
- }
- return null;
- }
-
- @Override
+ IDebugModelPresentation presentation = getConfiguredPresentation(element);
+ if (presentation instanceof IColorProvider) {
+ IColorProvider colorProvider = (IColorProvider) presentation;
+ return colorProvider.getForeground(element);
+ }
+ return null;
+ }
+
+ @Override
public Color getBackground(Object element) {
- IDebugModelPresentation presentation = getConfiguredPresentation(element);
- if (presentation instanceof IColorProvider) {
- IColorProvider colorProvider = (IColorProvider) presentation;
- return colorProvider.getBackground(element);
- }
- return null;
- }
-
- @Override
+ IDebugModelPresentation presentation = getConfiguredPresentation(element);
+ if (presentation instanceof IColorProvider) {
+ IColorProvider colorProvider = (IColorProvider) presentation;
+ return colorProvider.getBackground(element);
+ }
+ return null;
+ }
+
+ @Override
public Font getFont(Object element) {
- IDebugModelPresentation presentation = getConfiguredPresentation(element);
- if (presentation instanceof IFontProvider) {
- IFontProvider fontProvider = (IFontProvider) presentation;
- return fontProvider.getFont(element);
- }
- return null;
- }
+ IDebugModelPresentation presentation = getConfiguredPresentation(element);
+ if (presentation instanceof IFontProvider) {
+ IFontProvider fontProvider = (IFontProvider) presentation;
+ return fontProvider.getFont(element);
+ }
+ return null;
+ }
@Override
public Annotation getInstructionPointerAnnotation(IEditorPart editorPart, IStackFrame frame) {
@@ -371,7 +371,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
}
}
if (annotation == null) {
- boolean defaultAnnotation = id == null;
+ boolean defaultAnnotation = id == null;
if (id == null || text == null || (defaultAnnotation && image == null)) {
IThread thread = frame.getThread();
IStackFrame tos = null;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IDebugHelpContextIds.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IDebugHelpContextIds.java
index 439243b8a..d1d2216c4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IDebugHelpContextIds.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IDebugHelpContextIds.java
@@ -61,27 +61,27 @@ public interface IDebugHelpContextIds {
String DETAIL_PANE_PASTE_ACTION = PREFIX + "detail_pane_paste_action_context"; //$NON-NLS-1$
String DETAIL_PANE_SELECT_ALL_ACTION = PREFIX + "detail_pane_select_all_action_context"; //$NON-NLS-1$
String DETAIL_PANE_FIND_REPLACE_ACTION = PREFIX + "detail_pane_find_replace_action_context"; //$NON-NLS-1$
- String DETAIL_PANE_WORD_WRAP_ACTION = PREFIX + "detail_pane_word_wrap_action_context"; //$NON-NLS-1$
- String DETAIL_PANE_MAX_LENGTH_ACTION = PREFIX + "detail_pane_max_length_action_context"; //$NON-NLS-1$
- String CONSOLE_TERMINATE_ACTION = PREFIX + "console_terminate_action_context"; //$NON-NLS-1$
- String CONSOLE_REMOVE_ALL_TERMINATED = PREFIX + "console_remove_all_terminated_context"; //$NON-NLS-1$
- String CONSOLE_REMOVE_LAUNCH = PREFIX + "console_remove_launch_context"; //$NON-NLS-1$;
- String CONSOLE_SHOW_PREFERENCES = PREFIX + "console_show_preferences_action_context"; //$NON-NLS-1$
- String SHOW_COLUMNS_ACTION = PREFIX + "show_columns_context"; //$NON-NLS-1$;
- String CONFIGURE_COLUMNS_ACTION = PREFIX + "configure_columns_context"; //$NON-NLS-1$;
- String MEMORY_VIEW_PANE_ORIENTATION_ACTION = PREFIX + "memory_view_pane_orientation_action_context"; //$NON-NLS-1$
- String SHOW_WHEN_STDOUT_CHANGES_ACTION = PREFIX + "show_stdout_action_context"; //$NON-NLS-1$
- String SHOW_WHEN_STDERR_CHANGES_ACTION = PREFIX + "show_stderr_action_context"; //$NON-NLS-1$
- String HORIZONTAL_DETAIL_PANE_LAYOUT_ACTION = PREFIX + "horizontal_detail_pane_layout_action_context"; //$NON-NLS-1$
- String VERTICAL_DETAIL_PANE_LAYOUT_ACTION = PREFIX + "vertical_detail_pane_layout_action_context"; //$NON-NLS-1$
- String DETAIL_PANE_HIDDEN_LAYOUT_ACTION = PREFIX + "detail_pane_hidden_layout_action_context"; //$NON-NLS-1$
- String DEBUG_VIEW_MODE_AUTO_ACTION = PREFIX + "debug_view_mode_auto_action_context"; //$NON-NLS-1$
- String DEBUG_VIEW_MODE_FULL_ACTION = PREFIX + "debug_view_mode_full_action_context"; //$NON-NLS-1$
- String DEBUG_VIEW_MODE_COMPACT_ACTION = PREFIX + "debug_view_mode_compact_action_context"; //$NON-NLS-1$
- String DEBUG_VIEW_DROP_DOWN_AUTOEXPAND_ACTION = PREFIX + "debug_view_drop_down_autoexpand_action_context"; //$NON-NLS-1$
- String DEBUG_TOOLBAR_VIEW_ACTION = PREFIX + "debug_toolbar_view_action_context"; //$NON-NLS-1$
- String DEBUG_TOOLBAR_WINDOW_ACTION = PREFIX + "debug_toolbar_window_action_context"; //$NON-NLS-1$
- String DEBUG_TOOLBAR_BOTH_ACTION = PREFIX + "debug_toolbar_both_action_context"; //$NON-NLS-1$
+ String DETAIL_PANE_WORD_WRAP_ACTION = PREFIX + "detail_pane_word_wrap_action_context"; //$NON-NLS-1$
+ String DETAIL_PANE_MAX_LENGTH_ACTION = PREFIX + "detail_pane_max_length_action_context"; //$NON-NLS-1$
+ String CONSOLE_TERMINATE_ACTION = PREFIX + "console_terminate_action_context"; //$NON-NLS-1$
+ String CONSOLE_REMOVE_ALL_TERMINATED = PREFIX + "console_remove_all_terminated_context"; //$NON-NLS-1$
+ String CONSOLE_REMOVE_LAUNCH = PREFIX + "console_remove_launch_context"; //$NON-NLS-1$;
+ String CONSOLE_SHOW_PREFERENCES = PREFIX + "console_show_preferences_action_context"; //$NON-NLS-1$
+ String SHOW_COLUMNS_ACTION = PREFIX + "show_columns_context"; //$NON-NLS-1$;
+ String CONFIGURE_COLUMNS_ACTION = PREFIX + "configure_columns_context"; //$NON-NLS-1$;
+ String MEMORY_VIEW_PANE_ORIENTATION_ACTION = PREFIX + "memory_view_pane_orientation_action_context"; //$NON-NLS-1$
+ String SHOW_WHEN_STDOUT_CHANGES_ACTION = PREFIX + "show_stdout_action_context"; //$NON-NLS-1$
+ String SHOW_WHEN_STDERR_CHANGES_ACTION = PREFIX + "show_stderr_action_context"; //$NON-NLS-1$
+ String HORIZONTAL_DETAIL_PANE_LAYOUT_ACTION = PREFIX + "horizontal_detail_pane_layout_action_context"; //$NON-NLS-1$
+ String VERTICAL_DETAIL_PANE_LAYOUT_ACTION = PREFIX + "vertical_detail_pane_layout_action_context"; //$NON-NLS-1$
+ String DETAIL_PANE_HIDDEN_LAYOUT_ACTION = PREFIX + "detail_pane_hidden_layout_action_context"; //$NON-NLS-1$
+ String DEBUG_VIEW_MODE_AUTO_ACTION = PREFIX + "debug_view_mode_auto_action_context"; //$NON-NLS-1$
+ String DEBUG_VIEW_MODE_FULL_ACTION = PREFIX + "debug_view_mode_full_action_context"; //$NON-NLS-1$
+ String DEBUG_VIEW_MODE_COMPACT_ACTION = PREFIX + "debug_view_mode_compact_action_context"; //$NON-NLS-1$
+ String DEBUG_VIEW_DROP_DOWN_AUTOEXPAND_ACTION = PREFIX + "debug_view_drop_down_autoexpand_action_context"; //$NON-NLS-1$
+ String DEBUG_TOOLBAR_VIEW_ACTION = PREFIX + "debug_toolbar_view_action_context"; //$NON-NLS-1$
+ String DEBUG_TOOLBAR_WINDOW_ACTION = PREFIX + "debug_toolbar_window_action_context"; //$NON-NLS-1$
+ String DEBUG_TOOLBAR_BOTH_ACTION = PREFIX + "debug_toolbar_both_action_context"; //$NON-NLS-1$
// Views
String DEBUG_VIEW = PREFIX + "debug_view_context"; //$NON-NLS-1$
@@ -91,7 +91,7 @@ public interface IDebugHelpContextIds {
String LAUNCH_CONFIGURATION_VIEW = PREFIX + "launch_configuration_view_context"; //$NON-NLS-1$
String REGISTERS_VIEW = PREFIX + "registers_view_context"; //$NON-NLS-1$
String PROCESS_CONSOLE = PREFIX + "process_console_context"; //$NON-NLS-1$
- String MODULES_VIEW = PREFIX + "modules_view_context"; //$NON-NLS-1$
+ String MODULES_VIEW = PREFIX + "modules_view_context"; //$NON-NLS-1$
// Preference pages
String DEBUG_PREFERENCE_PAGE = PREFIX + "debug_preference_page_context"; //$NON-NLS-1$
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java
index fb4a8a76e..270fa4468 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java
@@ -24,288 +24,288 @@ import org.eclipse.debug.ui.IDebugUIConstants;
public interface IInternalDebugUIConstants {
- String DIALOGSTORE_LASTEXTJAR= "org.eclipse.debug.ui.lastextjar"; //$NON-NLS-1$
-
- //Folders
- String ID_NAVIGATOR_FOLDER_VIEW= "org.eclipse.debug.internal.ui.NavigatorFolderView"; //$NON-NLS-1$
- String ID_TOOLS_FOLDER_VIEW= "org.eclipse.debug.internal.ui.ToolsFolderView"; //$NON-NLS-1$
- String ID_CONSOLE_FOLDER_VIEW= "org.eclipse.debug.internal.ui.ConsoleFolderView"; //$NON-NLS-1$
- String ID_OUTLINE_FOLDER_VIEW= "org.eclipse.debug.internal.ui.OutlineFolderView"; //$NON-NLS-1$
-
- // tool images
- String IMG_LCL_COLLAPSE_ALL = "IMG_LCL_COLLAPSE_ALL"; //$NON-NLS-1$
- String IMG_LCL_TERMINATE = "IMG_LCL_TERMINATE"; //$NON-NLS-1$
- String IMG_LCL_SHOW_LOGICAL_STRUCTURE = "IMG_LCL_SHOW_LOGICAL_STRUCTURE"; //$NON-NLS-1$
- String IMG_LCL_RUN_TO_LINE= "IMG_LCL_RUN_TO_LINE"; //$NON-NLS-1$
- String IMG_SRC_LOOKUP_MENU = "IMG_SRC_LOOKUP_MENU"; //$NON-NLS-1$
-
- /**
- * @deprecated Use IDebugUIConstants#IMG_LCL_ADD
- */
- @Deprecated String IMG_LCL_MONITOR_EXPRESSION= IDebugUIConstants.IMG_LCL_ADD;
- String IMG_LCL_REMOVE_MEMORY= "IMG_LCL_REMOVE_MEMORY"; //$NON-NLS-1$
- String IMG_LCL_RESET_MEMORY= "IMG_LCL_RESET_MEMORY";//$NON-NLS-1$
- String IMG_LCL_COPY_VIEW_TO_CLIPBOARD = "IMG_LCL_COPY_VIEW_TO_CLIPBOARD"; //$NON-NLS-1$
- String IMG_LCL_PRINT_TOP_VIEW_TAB = "IMG_LCL_PRINT_TOP_VIEW_TAB"; //$NON-NLS-1$
-
- // disabled local tool images
- String IMG_DLCL_LOCK= "IMG_DLCL_LOCK"; //$NON-NLS-1$
- String IMG_DLCL_DETAIL_PANE= "IMG_DLCL_DETAIL_PANE"; //$NON-NLS-1$
- String IMG_DLCL_CHANGE_VARIABLE_VALUE= "IMG_DLCL_CHANGE_VARIABLE_VALUE"; //$NON-NLS-1$
- String IMG_DLCL_TYPE_NAMES= "IMG_DLCL_TYPE_NAMES"; //$NON-NLS-1$
- String IMG_DLCL_SHOW_LOGICAL_STRUCTURE= "IMG_DLCL_SHOW_LOGICAL_STRUCTURE"; //$NON-NLS-1$
- String IMG_DLCL_DETAIL_PANE_UNDER= "IMG_DLCL_DETAIL_PANE_UNDER"; //$NON-NLS-1$
- String IMG_DLCL_DETAIL_PANE_RIGHT= "IMG_DLCL_DETAIL_PANE_RIGHT"; //$NON-NLS-1$
- String IMG_DLCL_DETAIL_PANE_HIDE= "IMG_DLCL_DETAIL_PANE_HIDE"; //$NON-NLS-1$
- String IMG_DLCL_DETAIL_PANE_AUTO= "IMG_DLCL_DETAIL_PANE_AUTO"; //$NON-NLS-1$
- String IMG_DLCL_COLLAPSE_ALL = "IMG_DLCL_COLLAPSE_ALL"; //$NON-NLS-1$
- String IMG_DLCL_TERMINATE = "IMG_DLCL_TERMINATE"; //$NON-NLS-1$
- String IMG_DLCL_REMOVE_ALL = "IMG_DLCL_REMOVE_ALL"; //$NON-NLS-1$
- String IMG_DLCL_REMOVE = "IMG_DLCL_REMOVE"; //$NON-NLS-1$
- String IMG_DLCL_RUN_TO_LINE= "IMG_DLCL_RUN_TO_LINE"; //$NON-NLS-1$
- String IMG_SRC_LOOKUP_MENU_DLCL = "IMG_SRC_LOOKUP_MENU_DISABLED"; //$NON-NLS-1$
- String IMG_DLCL_MONITOR_EXPRESSION= "IMG_DLCL_MONITOR_EXPRESSION"; //$NON-NLS-1$
- String IMG_DLCL_REMOVE_MEMORY= "IMG_DLCL_REMOVE_MEMORY"; //$NON-NLS-1$
- String IMG_DLCL_RESET_MEMORY= "IMG_DLCL_RESET_MEMORY"; //$NON-NLS-1$
- String IMG_DLCL_COPY_VIEW_TO_CLIPBOARD= "IMG_DLCL_COPY_VIEW_TO_CLIPBOARD"; //$NON-NLS-1$
- String IMG_DLCL_PRINT_TOP_VIEW_TAB= "IMG_DLCL_PRINT_TOP_VIEW_TAB"; //$NON-NLS-1$
- String IMG_DLCL_NEW_CONFIG = "IMG_DLCL_NEW_CONFIG"; //$NON-NLS-1$
- String IMG_DLCL_DUPLICATE_CONFIG = "IMG_DLCL_DUPLICATE_CONFIG"; //$NON-NLS-1$
- String IMG_DLCL_DELETE_CONFIG = "IMG_DLCL_DELETE_CONFIG"; //$NON-NLS-1$
- String IMG_DLCL_FILTER_CONFIGS = "IMG_DLCL_FILTER_CONFIGS"; //$NON-NLS-1$
- String IMG_DLCL_NEW_PROTO = "IMG_DLCL_NEW_PROTO"; //$NON-NLS-1$
- String IMG_DLCL_LINK_PROTO = "IMG_DLCL_LINK_PROTO"; //$NON-NLS-1$
- String IMG_DLCL_UNLINK_PROTO = "IMG_DLCL_UNLINK_PROTO"; //$NON-NLS-1$
- String IMG_DLCL_RESET_PROTO = "IMG_DLCL_RESET_PROTO"; //$NON-NLS-1$
- String IMG_DLCL_SUSPEND = "IMG_DLCL_SUSPEND"; //$NON-NLS-1$
- String IMG_DLCL_RESUME = "IMG_DLCL_RESUME"; //$NON-NLS-1$
- String IMG_DLCL_STEP_RETURN = "IMG_DLCL_STEP_RETURN"; //$NON-NLS-1$
- String IMG_DLCL_STEP_OVER = "IMG_DLCL_STEP_OVER"; //$NON-NLS-1$
- String IMG_DLCL_STEP_INTO = "IMG_DLCL_STEP_INTO"; //$NON-NLS-1$
- String IMG_DLCL_TERMINATE_AND_REMOVE = "IMG_DLCL_TERMINATE_AND_REMOVE"; //$NON-NLS-1$
- String IMG_DLCL_TERMINATE_ALL = "IMG_DLCL_TERMINATE_ALL"; //$NON-NLS-1$
- String IMG_DLCL_TERMINATE_AND_RELAUNCH = "IMG_DLCL_TERMINATE_AND_RELAUNCH"; //$NON-NLS-1$
- String IMG_DLCL_TOGGLE_STEP_FILTERS = "IMG_DLCL_TOGGLE_STEP_FILTERS"; //$NON-NLS-1$
- String IMG_DLCL_NEXT_THREAD = "IMG_DLCL_NEXT_THREAD"; //$NON-NLS-1$
- String IMG_DLCL_PREVIOUS_THREAD = "IMG_DLCL_PREVIOUS_THREAD"; //$NON-NLS-1$
- String IMG_DLCL_RESTART = "IMG_DLCL_RESTART"; //$NON-NLS-1$
+ String DIALOGSTORE_LASTEXTJAR= "org.eclipse.debug.ui.lastextjar"; //$NON-NLS-1$
+
+ //Folders
+ String ID_NAVIGATOR_FOLDER_VIEW= "org.eclipse.debug.internal.ui.NavigatorFolderView"; //$NON-NLS-1$
+ String ID_TOOLS_FOLDER_VIEW= "org.eclipse.debug.internal.ui.ToolsFolderView"; //$NON-NLS-1$
+ String ID_CONSOLE_FOLDER_VIEW= "org.eclipse.debug.internal.ui.ConsoleFolderView"; //$NON-NLS-1$
+ String ID_OUTLINE_FOLDER_VIEW= "org.eclipse.debug.internal.ui.OutlineFolderView"; //$NON-NLS-1$
+
+ // tool images
+ String IMG_LCL_COLLAPSE_ALL = "IMG_LCL_COLLAPSE_ALL"; //$NON-NLS-1$
+ String IMG_LCL_TERMINATE = "IMG_LCL_TERMINATE"; //$NON-NLS-1$
+ String IMG_LCL_SHOW_LOGICAL_STRUCTURE = "IMG_LCL_SHOW_LOGICAL_STRUCTURE"; //$NON-NLS-1$
+ String IMG_LCL_RUN_TO_LINE= "IMG_LCL_RUN_TO_LINE"; //$NON-NLS-1$
+ String IMG_SRC_LOOKUP_MENU = "IMG_SRC_LOOKUP_MENU"; //$NON-NLS-1$
+
+ /**
+ * @deprecated Use IDebugUIConstants#IMG_LCL_ADD
+ */
+ @Deprecated String IMG_LCL_MONITOR_EXPRESSION= IDebugUIConstants.IMG_LCL_ADD;
+ String IMG_LCL_REMOVE_MEMORY= "IMG_LCL_REMOVE_MEMORY"; //$NON-NLS-1$
+ String IMG_LCL_RESET_MEMORY= "IMG_LCL_RESET_MEMORY";//$NON-NLS-1$
+ String IMG_LCL_COPY_VIEW_TO_CLIPBOARD = "IMG_LCL_COPY_VIEW_TO_CLIPBOARD"; //$NON-NLS-1$
+ String IMG_LCL_PRINT_TOP_VIEW_TAB = "IMG_LCL_PRINT_TOP_VIEW_TAB"; //$NON-NLS-1$
+
+ // disabled local tool images
+ String IMG_DLCL_LOCK= "IMG_DLCL_LOCK"; //$NON-NLS-1$
+ String IMG_DLCL_DETAIL_PANE= "IMG_DLCL_DETAIL_PANE"; //$NON-NLS-1$
+ String IMG_DLCL_CHANGE_VARIABLE_VALUE= "IMG_DLCL_CHANGE_VARIABLE_VALUE"; //$NON-NLS-1$
+ String IMG_DLCL_TYPE_NAMES= "IMG_DLCL_TYPE_NAMES"; //$NON-NLS-1$
+ String IMG_DLCL_SHOW_LOGICAL_STRUCTURE= "IMG_DLCL_SHOW_LOGICAL_STRUCTURE"; //$NON-NLS-1$
+ String IMG_DLCL_DETAIL_PANE_UNDER= "IMG_DLCL_DETAIL_PANE_UNDER"; //$NON-NLS-1$
+ String IMG_DLCL_DETAIL_PANE_RIGHT= "IMG_DLCL_DETAIL_PANE_RIGHT"; //$NON-NLS-1$
+ String IMG_DLCL_DETAIL_PANE_HIDE= "IMG_DLCL_DETAIL_PANE_HIDE"; //$NON-NLS-1$
+ String IMG_DLCL_DETAIL_PANE_AUTO= "IMG_DLCL_DETAIL_PANE_AUTO"; //$NON-NLS-1$
+ String IMG_DLCL_COLLAPSE_ALL = "IMG_DLCL_COLLAPSE_ALL"; //$NON-NLS-1$
+ String IMG_DLCL_TERMINATE = "IMG_DLCL_TERMINATE"; //$NON-NLS-1$
+ String IMG_DLCL_REMOVE_ALL = "IMG_DLCL_REMOVE_ALL"; //$NON-NLS-1$
+ String IMG_DLCL_REMOVE = "IMG_DLCL_REMOVE"; //$NON-NLS-1$
+ String IMG_DLCL_RUN_TO_LINE= "IMG_DLCL_RUN_TO_LINE"; //$NON-NLS-1$
+ String IMG_SRC_LOOKUP_MENU_DLCL = "IMG_SRC_LOOKUP_MENU_DISABLED"; //$NON-NLS-1$
+ String IMG_DLCL_MONITOR_EXPRESSION= "IMG_DLCL_MONITOR_EXPRESSION"; //$NON-NLS-1$
+ String IMG_DLCL_REMOVE_MEMORY= "IMG_DLCL_REMOVE_MEMORY"; //$NON-NLS-1$
+ String IMG_DLCL_RESET_MEMORY= "IMG_DLCL_RESET_MEMORY"; //$NON-NLS-1$
+ String IMG_DLCL_COPY_VIEW_TO_CLIPBOARD= "IMG_DLCL_COPY_VIEW_TO_CLIPBOARD"; //$NON-NLS-1$
+ String IMG_DLCL_PRINT_TOP_VIEW_TAB= "IMG_DLCL_PRINT_TOP_VIEW_TAB"; //$NON-NLS-1$
+ String IMG_DLCL_NEW_CONFIG = "IMG_DLCL_NEW_CONFIG"; //$NON-NLS-1$
+ String IMG_DLCL_DUPLICATE_CONFIG = "IMG_DLCL_DUPLICATE_CONFIG"; //$NON-NLS-1$
+ String IMG_DLCL_DELETE_CONFIG = "IMG_DLCL_DELETE_CONFIG"; //$NON-NLS-1$
+ String IMG_DLCL_FILTER_CONFIGS = "IMG_DLCL_FILTER_CONFIGS"; //$NON-NLS-1$
+ String IMG_DLCL_NEW_PROTO = "IMG_DLCL_NEW_PROTO"; //$NON-NLS-1$
+ String IMG_DLCL_LINK_PROTO = "IMG_DLCL_LINK_PROTO"; //$NON-NLS-1$
+ String IMG_DLCL_UNLINK_PROTO = "IMG_DLCL_UNLINK_PROTO"; //$NON-NLS-1$
+ String IMG_DLCL_RESET_PROTO = "IMG_DLCL_RESET_PROTO"; //$NON-NLS-1$
+ String IMG_DLCL_SUSPEND = "IMG_DLCL_SUSPEND"; //$NON-NLS-1$
+ String IMG_DLCL_RESUME = "IMG_DLCL_RESUME"; //$NON-NLS-1$
+ String IMG_DLCL_STEP_RETURN = "IMG_DLCL_STEP_RETURN"; //$NON-NLS-1$
+ String IMG_DLCL_STEP_OVER = "IMG_DLCL_STEP_OVER"; //$NON-NLS-1$
+ String IMG_DLCL_STEP_INTO = "IMG_DLCL_STEP_INTO"; //$NON-NLS-1$
+ String IMG_DLCL_TERMINATE_AND_REMOVE = "IMG_DLCL_TERMINATE_AND_REMOVE"; //$NON-NLS-1$
+ String IMG_DLCL_TERMINATE_ALL = "IMG_DLCL_TERMINATE_ALL"; //$NON-NLS-1$
+ String IMG_DLCL_TERMINATE_AND_RELAUNCH = "IMG_DLCL_TERMINATE_AND_RELAUNCH"; //$NON-NLS-1$
+ String IMG_DLCL_TOGGLE_STEP_FILTERS = "IMG_DLCL_TOGGLE_STEP_FILTERS"; //$NON-NLS-1$
+ String IMG_DLCL_NEXT_THREAD = "IMG_DLCL_NEXT_THREAD"; //$NON-NLS-1$
+ String IMG_DLCL_PREVIOUS_THREAD = "IMG_DLCL_PREVIOUS_THREAD"; //$NON-NLS-1$
+ String IMG_DLCL_RESTART = "IMG_DLCL_RESTART"; //$NON-NLS-1$
String IMG_DLCL_EXPORT_CONFIG = "IMG_DLCL_EXPORT_CONFIG"; //$NON-NLS-1$
- //TODO: Move this IDebugUIConstants. Created too late in 3.2 cycle to add API.
- //The enabled icon is already API.
- String IMG_DLCL_DISCONNECT= "IMG_DLCL_DISCONNECT"; //$NON-NLS-1$
-
- // enabled local tool images
- String IMG_ELCL_LOCK= "IMG_ELCL_LOCK"; //$NON-NLS-1$
- String IMG_ELCL_DETAIL_PANE= "IMG_ELCL_DETAIL_PANE"; //$NON-NLS-1$
- String IMG_ELCL_CHANGE_VARIABLE_VALUE= "IMG_ELCL_CHANGE_VARIABLE_VALUE"; //$NON-NLS-1$
- String IMG_ELCL_TYPE_NAMES= "IMG_ELCL_TYPE_NAMES"; //$NON-NLS-1$
- String IMG_ELCL_SHOW_LOGICAL_STRUCTURE= "IMG_ELCL_SHOW_LOGICAL_STRUCTURE"; //$NON-NLS-1$
- String IMG_ELCL_DETAIL_PANE_UNDER= "IMG_ELCL_DETAIL_PANE_UNDER"; //$NON-NLS-1$
- String IMG_ELCL_DETAIL_PANE_RIGHT= "IMG_ELCL_DETAIL_PANE_RIGHT"; //$NON-NLS-1$
- String IMG_ELCL_DETAIL_PANE_HIDE= "IMG_ELCL_DETAIL_PANE_HIDE"; //$NON-NLS-1$
- String IMG_ELCL_DETAIL_PANE_AUTO= "IMG_ELCL_DETAIL_PANE_AUTO"; //$NON-NLS-1$
- String IMG_ELCL_COLLAPSE_ALL = "IMG_ELCL_COLLAPSE_ALL"; //$NON-NLS-1$
- String IMG_ELCL_TERMINATE = "IMG_ELCL_TERMINATE"; //$NON-NLS-1$
- String IMG_SRC_LOOKUP_MENU_ELCL = "IMG_SRC_LOOKUP_MENU_ENABLED"; //$NON-NLS-1$
- String IMG_ELCL_MONITOR_EXPRESSION= "IMG_ELCL_MONITOR_EXPRESSION"; //$NON-NLS-1$
- String IMG_ELCL_REMOVE_MEMORY= "IMG_ELCL_REMOVE_MEMORY"; //$NON-NLS-1$
- String IMG_ELCL_RESET_MEMORY= "IMG_ELCL_RESET_MEMORY"; //$NON-NLS-1$
- String IMG_ELCL_COPY_VIEW_TO_CLIPBOARD= "IMG_ELCL_COPY_VIEW_TO_CLIPBOARD"; //$NON-NLS-1$
- String IMG_ELCL_PRINT_TOP_VIEW_TAB= "IMG_ELCL_PRINT_TOP_VIEW_TAB"; //$NON-NLS-1$
- String IMG_ELCL_REMOVE_ALL = "IMG_ELCL_REMOVE_ALL"; //$NON-NLS-1$
- String IMG_ELCL_REMOVE = "IMG_ELCL_REMOVE"; //$NON-NLS-1$
- String IMG_ELCL_HIERARCHICAL = "IMG_ELCL_HIERARCHICAL"; //$NON-NLS-1$
- String IMG_ELCL_HELP = "IMG_ELCL_HELP"; //$NON-NLS-1$
- String IMG_ELCL_NEW_CONFIG = "IMG_ELCL_NEW_CONFIG"; //$NON-NLS-1$
- String IMG_ELCL_DELETE_CONFIG = "IMG_ELCL_DELETE_CONFIG"; //$NON-NLS-1$
- String IMG_ELCL_FILTER_CONFIGS = "IMG_ELCL_FILTER_CONFIGS"; //$NON-NLS-1$
- String IMG_ELCL_DUPLICATE_CONFIG = "IMG_ELCL_DUPLICATE_CONFIG"; //$NON-NLS-1$
- String IMG_ELCL_NEW_PROTO = "IMG_ELCL_NEW_PROTO"; //$NON-NLS-1$
- String IMG_ELCL_LINK_PROTO = "IMG_ELCL_LINK_PROTO"; //$NON-NLS-1$
- String IMG_ELCL_UNLINK_PROTO = "IMG_ELCL_UNLINK_PROTO"; //$NON-NLS-1$
- String IMG_ELCL_RESET_PROTO = "IMG_ELCL_RESET_PROTO"; //$NON-NLS-1$
- String IMG_ELCL_SUSPEND = "IMG_ELCL_SUSPEND"; //$NON-NLS-1$
- String IMG_ELCL_RESUME = "IMG_ELCL_RESUME"; //$NON-NLS-1$
- String IMG_ELCL_STEP_RETURN = "IMG_ELCL_STEP_RETURN"; //$NON-NLS-1$
- String IMG_ELCL_STEP_OVER = "IMG_ELCL_STEP_OVER"; //$NON-NLS-1$
- String IMG_ELCL_STEP_INTO = "IMG_ELCL_STEP_INTO"; //$NON-NLS-1$
- String IMG_ELCL_DROP_TO_FRAME = "IMG_ELCL_DROP_TO_FRAME"; //$NON-NLS-1$
- String IMG_ELCL_TERMINATE_AND_REMOVE = "IMG_ELCL_TERMINATE_AND_REMOVE"; //$NON-NLS-1$
- String IMG_ELCL_TERMINATE_ALL = "IMG_ELCL_TERMINATE_ALL"; //$NON-NLS-1$
- String IMG_ELCL_TERMINATE_AND_RELAUNCH = "IMG_ELCL_TERMINATE_AND_RELAUNCH"; //$NON-NLS-1$
- String IMG_ELCL_TOGGLE_STEP_FILTERS = "IMG_ELCL_TOGGLE_STEP_FILTERS"; //$NON-NLS-1$
- String IMG_ELCL_STANDARD_OUT = "IMG_ELCL_STANDARD_OUT"; //$NON-NLS-1$
- String IMG_ELCL_STANDARD_ERR = "IMG_ELCL_STANDARD_ERR"; //$NON-NLS-1$
- String IMG_ELCL_NEXT_THREAD = "IMG_ELCL_NEXT_THREAD"; //$NON-NLS-1$
- String IMG_ELCL_PREVIOUS_THREAD = "IMG_ELCL_PREVIOUS_THREAD"; //$NON-NLS-1$
- String IMG_ELCL_RESTART = "IMG_ELCL_RESTART"; //$NON-NLS-1$
- String IMG_ELCL_DEBUG_VIEW_COMPACT_LAYOUT = "IMG_ELCL_DEBUG_VIEW_BREADCRUMB_LAYOUT"; //$NON-NLS-1$
+ //TODO: Move this IDebugUIConstants. Created too late in 3.2 cycle to add API.
+ //The enabled icon is already API.
+ String IMG_DLCL_DISCONNECT= "IMG_DLCL_DISCONNECT"; //$NON-NLS-1$
+
+ // enabled local tool images
+ String IMG_ELCL_LOCK= "IMG_ELCL_LOCK"; //$NON-NLS-1$
+ String IMG_ELCL_DETAIL_PANE= "IMG_ELCL_DETAIL_PANE"; //$NON-NLS-1$
+ String IMG_ELCL_CHANGE_VARIABLE_VALUE= "IMG_ELCL_CHANGE_VARIABLE_VALUE"; //$NON-NLS-1$
+ String IMG_ELCL_TYPE_NAMES= "IMG_ELCL_TYPE_NAMES"; //$NON-NLS-1$
+ String IMG_ELCL_SHOW_LOGICAL_STRUCTURE= "IMG_ELCL_SHOW_LOGICAL_STRUCTURE"; //$NON-NLS-1$
+ String IMG_ELCL_DETAIL_PANE_UNDER= "IMG_ELCL_DETAIL_PANE_UNDER"; //$NON-NLS-1$
+ String IMG_ELCL_DETAIL_PANE_RIGHT= "IMG_ELCL_DETAIL_PANE_RIGHT"; //$NON-NLS-1$
+ String IMG_ELCL_DETAIL_PANE_HIDE= "IMG_ELCL_DETAIL_PANE_HIDE"; //$NON-NLS-1$
+ String IMG_ELCL_DETAIL_PANE_AUTO= "IMG_ELCL_DETAIL_PANE_AUTO"; //$NON-NLS-1$
+ String IMG_ELCL_COLLAPSE_ALL = "IMG_ELCL_COLLAPSE_ALL"; //$NON-NLS-1$
+ String IMG_ELCL_TERMINATE = "IMG_ELCL_TERMINATE"; //$NON-NLS-1$
+ String IMG_SRC_LOOKUP_MENU_ELCL = "IMG_SRC_LOOKUP_MENU_ENABLED"; //$NON-NLS-1$
+ String IMG_ELCL_MONITOR_EXPRESSION= "IMG_ELCL_MONITOR_EXPRESSION"; //$NON-NLS-1$
+ String IMG_ELCL_REMOVE_MEMORY= "IMG_ELCL_REMOVE_MEMORY"; //$NON-NLS-1$
+ String IMG_ELCL_RESET_MEMORY= "IMG_ELCL_RESET_MEMORY"; //$NON-NLS-1$
+ String IMG_ELCL_COPY_VIEW_TO_CLIPBOARD= "IMG_ELCL_COPY_VIEW_TO_CLIPBOARD"; //$NON-NLS-1$
+ String IMG_ELCL_PRINT_TOP_VIEW_TAB= "IMG_ELCL_PRINT_TOP_VIEW_TAB"; //$NON-NLS-1$
+ String IMG_ELCL_REMOVE_ALL = "IMG_ELCL_REMOVE_ALL"; //$NON-NLS-1$
+ String IMG_ELCL_REMOVE = "IMG_ELCL_REMOVE"; //$NON-NLS-1$
+ String IMG_ELCL_HIERARCHICAL = "IMG_ELCL_HIERARCHICAL"; //$NON-NLS-1$
+ String IMG_ELCL_HELP = "IMG_ELCL_HELP"; //$NON-NLS-1$
+ String IMG_ELCL_NEW_CONFIG = "IMG_ELCL_NEW_CONFIG"; //$NON-NLS-1$
+ String IMG_ELCL_DELETE_CONFIG = "IMG_ELCL_DELETE_CONFIG"; //$NON-NLS-1$
+ String IMG_ELCL_FILTER_CONFIGS = "IMG_ELCL_FILTER_CONFIGS"; //$NON-NLS-1$
+ String IMG_ELCL_DUPLICATE_CONFIG = "IMG_ELCL_DUPLICATE_CONFIG"; //$NON-NLS-1$
+ String IMG_ELCL_NEW_PROTO = "IMG_ELCL_NEW_PROTO"; //$NON-NLS-1$
+ String IMG_ELCL_LINK_PROTO = "IMG_ELCL_LINK_PROTO"; //$NON-NLS-1$
+ String IMG_ELCL_UNLINK_PROTO = "IMG_ELCL_UNLINK_PROTO"; //$NON-NLS-1$
+ String IMG_ELCL_RESET_PROTO = "IMG_ELCL_RESET_PROTO"; //$NON-NLS-1$
+ String IMG_ELCL_SUSPEND = "IMG_ELCL_SUSPEND"; //$NON-NLS-1$
+ String IMG_ELCL_RESUME = "IMG_ELCL_RESUME"; //$NON-NLS-1$
+ String IMG_ELCL_STEP_RETURN = "IMG_ELCL_STEP_RETURN"; //$NON-NLS-1$
+ String IMG_ELCL_STEP_OVER = "IMG_ELCL_STEP_OVER"; //$NON-NLS-1$
+ String IMG_ELCL_STEP_INTO = "IMG_ELCL_STEP_INTO"; //$NON-NLS-1$
+ String IMG_ELCL_DROP_TO_FRAME = "IMG_ELCL_DROP_TO_FRAME"; //$NON-NLS-1$
+ String IMG_ELCL_TERMINATE_AND_REMOVE = "IMG_ELCL_TERMINATE_AND_REMOVE"; //$NON-NLS-1$
+ String IMG_ELCL_TERMINATE_ALL = "IMG_ELCL_TERMINATE_ALL"; //$NON-NLS-1$
+ String IMG_ELCL_TERMINATE_AND_RELAUNCH = "IMG_ELCL_TERMINATE_AND_RELAUNCH"; //$NON-NLS-1$
+ String IMG_ELCL_TOGGLE_STEP_FILTERS = "IMG_ELCL_TOGGLE_STEP_FILTERS"; //$NON-NLS-1$
+ String IMG_ELCL_STANDARD_OUT = "IMG_ELCL_STANDARD_OUT"; //$NON-NLS-1$
+ String IMG_ELCL_STANDARD_ERR = "IMG_ELCL_STANDARD_ERR"; //$NON-NLS-1$
+ String IMG_ELCL_NEXT_THREAD = "IMG_ELCL_NEXT_THREAD"; //$NON-NLS-1$
+ String IMG_ELCL_PREVIOUS_THREAD = "IMG_ELCL_PREVIOUS_THREAD"; //$NON-NLS-1$
+ String IMG_ELCL_RESTART = "IMG_ELCL_RESTART"; //$NON-NLS-1$
+ String IMG_ELCL_DEBUG_VIEW_COMPACT_LAYOUT = "IMG_ELCL_DEBUG_VIEW_BREADCRUMB_LAYOUT"; //$NON-NLS-1$
String IMG_ELCL_EXPORT_CONFIG = "IMG_ELCL_EXPORT_CONFIG"; //$NON-NLS-1$
- String IMG_OBJS_COMMON_TAB = "IMG_OBJS_COMMON_TAB"; //$NON-NLS-1$
- String IMG_OBJS_REFRESH_TAB = "IMG_OBJS_REFRESH_TAB"; //$NON-NLS-1$
- String IMG_OBJS_PERSPECTIVE_TAB = "IMG_OBJS_PERSPECTIVE_TAB"; //$NON-NLS-1$
- String IMG_OBJS_ARRAY_PARTITION = "IMG_OBJS_ARRAY_PARTITION"; //$NON-NLS-1$
- String IMG_SRC_LOOKUP_TAB = "IMG_SRC_LOOKUP_TAB"; //$NON-NLS-1$
- String IMG_OBJECT_MEMORY_CHANGED="IMG_OBJECT_MEMORY_CHANGED"; //$NON-NLS-1$
- String IMG_OBJECT_MEMORY="IMG_OBJECT_MEMORY"; //$NON-NLS-1$
- String IMG_OBJS_BREAKPOINT_TYPE="IMG_OBJ_BREAKPOINT_TYPE"; //$NON-NLS-1$
- String IMG_OBJS_LAUNCH_GROUP = "IMG_OBJ_LAUNCH_GROUP"; //$NON-NLS-1$
- String IMG_OBJS_CHECK = "IMG_OBJS_CHECK"; //$NON-NLS-1$
- String IMG_OBJS_UNCHECK = "IMG_OBJS_UNCHECK"; //$NON-NLS-1$
- String IMG_OBJS_PROTO_TAB = "IMG_OBJS_PROTO_TAB"; //$NON-NLS-1$
-
- // wizard images
- String IMG_WIZBAN_IMPORT_BREAKPOINTS = "IMG_WIZBAN_IMPORT_BREAKPOINTS"; //$NON-NLS-1$
- String IMG_WIZBAN_EXPORT_BREAKPOINTS = "IMG_WIZBAN_EXPORT_BREAKPOINTS"; //$NON-NLS-1$
- String IMG_WIZBAN_IMPORT_CONFIGS = "IMG_WIZBAN_IMPORT_CONFIGS"; //$NON-NLS-1$
- String IMG_WIZBAN_EXPORT_CONFIGS = "IMG_WIZBAN_EXPORT_CONFIGS"; //$NON-NLS-1$
- String IMG_ADD_SRC_LOC_WIZ = "IMG_ADD_SRC_LOCATION"; //$NON-NLS-1$
- String IMG_EDIT_SRC_LOC_WIZ = "IMG_EDIT_SRC_LOCATION"; //$NON-NLS-1$
- String IMG_ADD_SRC_DIR_WIZ = "IMG_ADD_SRC_DIRECTORY"; //$NON-NLS-1$
- String IMG_EDIT_SRC_DIR_WIZ = "IMG_EDIT_SRC_DIRECTORY"; //$NON-NLS-1$
-
- // internal preferences
- /**
- * XML for perspective settings - see PerspectiveManager.
- * @since 3.0
- */
- String PREF_LAUNCH_PERSPECTIVES = IDebugUIConstants.PLUGIN_ID + ".PREF_LAUNCH_PERSPECTIVES"; //$NON-NLS-1$
-
- /**
- * Preference for enabling/disabling launch configuration filtering based on project accessibility status
- *
- * @since 3.2
- */
- String PREF_FILTER_LAUNCH_CLOSED = IDebugUIConstants.PLUGIN_ID + ".PREF_FILTER_LAUNCH_CLOSED"; //$NON-NLS-1$
-
- /**
- * Preference for enabling/disabling launch configuration filtering based on project context
- *
- * @since 3.2
- */
- String PREF_FILTER_LAUNCH_DELETED = IDebugUIConstants.PLUGIN_ID + ".PREF_FILTER_LAUNCH_DELETED"; //$NON-NLS-1$
-
- /**
- * Preference for enabling/disabling filtering based on selected items from the launch configuration type table
- * @since 3.2
- */
- String PREF_FILTER_LAUNCH_TYPES = IDebugUIConstants.PLUGIN_ID + ".PREF_FILTER_LAUNCH_TYPES"; //$NON-NLS-1$
-
- /**
- * Preference that saves which launch configuration types have been checked on the Launch Configurations pref page
- * @since 3.2
- */
- String PREF_FILTER_TYPE_LIST = IDebugUIConstants.PLUGIN_ID + ".PREF_FILTER_TYPE_LIST"; //$NON-NLS-1$
-
- /**
- * Preference for filtering launch configurations based on the currently active working sets
- * @since 3.2
- */
- String PREF_FILTER_WORKING_SETS = IDebugUIConstants.PLUGIN_ID + ".PREF_FILTER_WORKING_SETS"; //$NON-NLS-1$
-
- /**
- * Transparent overlay image identifier.
- */
- String IMG_OVR_TRANSPARENT = "IMG_OVR_TRANSPARENT"; //$NON-NLS-1$
+ String IMG_OBJS_COMMON_TAB = "IMG_OBJS_COMMON_TAB"; //$NON-NLS-1$
+ String IMG_OBJS_REFRESH_TAB = "IMG_OBJS_REFRESH_TAB"; //$NON-NLS-1$
+ String IMG_OBJS_PERSPECTIVE_TAB = "IMG_OBJS_PERSPECTIVE_TAB"; //$NON-NLS-1$
+ String IMG_OBJS_ARRAY_PARTITION = "IMG_OBJS_ARRAY_PARTITION"; //$NON-NLS-1$
+ String IMG_SRC_LOOKUP_TAB = "IMG_SRC_LOOKUP_TAB"; //$NON-NLS-1$
+ String IMG_OBJECT_MEMORY_CHANGED="IMG_OBJECT_MEMORY_CHANGED"; //$NON-NLS-1$
+ String IMG_OBJECT_MEMORY="IMG_OBJECT_MEMORY"; //$NON-NLS-1$
+ String IMG_OBJS_BREAKPOINT_TYPE="IMG_OBJ_BREAKPOINT_TYPE"; //$NON-NLS-1$
+ String IMG_OBJS_LAUNCH_GROUP = "IMG_OBJ_LAUNCH_GROUP"; //$NON-NLS-1$
+ String IMG_OBJS_CHECK = "IMG_OBJS_CHECK"; //$NON-NLS-1$
+ String IMG_OBJS_UNCHECK = "IMG_OBJS_UNCHECK"; //$NON-NLS-1$
+ String IMG_OBJS_PROTO_TAB = "IMG_OBJS_PROTO_TAB"; //$NON-NLS-1$
+
+ // wizard images
+ String IMG_WIZBAN_IMPORT_BREAKPOINTS = "IMG_WIZBAN_IMPORT_BREAKPOINTS"; //$NON-NLS-1$
+ String IMG_WIZBAN_EXPORT_BREAKPOINTS = "IMG_WIZBAN_EXPORT_BREAKPOINTS"; //$NON-NLS-1$
+ String IMG_WIZBAN_IMPORT_CONFIGS = "IMG_WIZBAN_IMPORT_CONFIGS"; //$NON-NLS-1$
+ String IMG_WIZBAN_EXPORT_CONFIGS = "IMG_WIZBAN_EXPORT_CONFIGS"; //$NON-NLS-1$
+ String IMG_ADD_SRC_LOC_WIZ = "IMG_ADD_SRC_LOCATION"; //$NON-NLS-1$
+ String IMG_EDIT_SRC_LOC_WIZ = "IMG_EDIT_SRC_LOCATION"; //$NON-NLS-1$
+ String IMG_ADD_SRC_DIR_WIZ = "IMG_ADD_SRC_DIRECTORY"; //$NON-NLS-1$
+ String IMG_EDIT_SRC_DIR_WIZ = "IMG_EDIT_SRC_DIRECTORY"; //$NON-NLS-1$
+
+ // internal preferences
+ /**
+ * XML for perspective settings - see PerspectiveManager.
+ * @since 3.0
+ */
+ String PREF_LAUNCH_PERSPECTIVES = IDebugUIConstants.PLUGIN_ID + ".PREF_LAUNCH_PERSPECTIVES"; //$NON-NLS-1$
+
+ /**
+ * Preference for enabling/disabling launch configuration filtering based on project accessibility status
+ *
+ * @since 3.2
+ */
+ String PREF_FILTER_LAUNCH_CLOSED = IDebugUIConstants.PLUGIN_ID + ".PREF_FILTER_LAUNCH_CLOSED"; //$NON-NLS-1$
+
+ /**
+ * Preference for enabling/disabling launch configuration filtering based on project context
+ *
+ * @since 3.2
+ */
+ String PREF_FILTER_LAUNCH_DELETED = IDebugUIConstants.PLUGIN_ID + ".PREF_FILTER_LAUNCH_DELETED"; //$NON-NLS-1$
+
+ /**
+ * Preference for enabling/disabling filtering based on selected items from the launch configuration type table
+ * @since 3.2
+ */
+ String PREF_FILTER_LAUNCH_TYPES = IDebugUIConstants.PLUGIN_ID + ".PREF_FILTER_LAUNCH_TYPES"; //$NON-NLS-1$
+
+ /**
+ * Preference that saves which launch configuration types have been checked on the Launch Configurations pref page
+ * @since 3.2
+ */
+ String PREF_FILTER_TYPE_LIST = IDebugUIConstants.PLUGIN_ID + ".PREF_FILTER_TYPE_LIST"; //$NON-NLS-1$
+
+ /**
+ * Preference for filtering launch configurations based on the currently active working sets
+ * @since 3.2
+ */
+ String PREF_FILTER_WORKING_SETS = IDebugUIConstants.PLUGIN_ID + ".PREF_FILTER_WORKING_SETS"; //$NON-NLS-1$
+
+ /**
+ * Transparent overlay image identifier.
+ */
+ String IMG_OVR_TRANSPARENT = "IMG_OVR_TRANSPARENT"; //$NON-NLS-1$
/**
* Logical Structure overlay image identifier.
*/
String IMG_OVR_SHOW_LOGICAL_STRUCTURE = "IMG_OVR_SHOW_LOGICAL_STRUCTURE"; //$NON-NLS-1$
- /**
- * Editor Id for the "Source Not Found" editor
- */
- String ID_SOURCE_NOT_FOUND_EDITOR = "org.eclipse.debug.ui.NoSourceFoundEditor"; //$NON-NLS-1$
-
- /**
- * Boolean preference indicating if contextual launch options should be visible
- * to the user rather than the "run as" menu.
- *
- * @since 3.3.0
- * CONTEXTLAUNCHING
- */
- String PREF_USE_CONTEXTUAL_LAUNCH = IDebugUIConstants.PLUGIN_ID + ".UseContextualLaunch"; //$NON-NLS-1$
-
- /**
- * Boolean preference indicating that if the selected resource is not launchable, then we should
- * launch the last configuration that was launched.
- *
- * @since 3.3.0
- * CONTEXTLAUNCHING
- */
- String PREF_LAUNCH_LAST_IF_NOT_LAUNCHABLE = IDebugUIConstants.PLUGIN_ID + ".LaunchLastIfNotLaunchable"; //$NON-NLS-1$
-
- /**
- * Boolean preference indicating if we should always consider the parent project when
- * a selected context is not runnable
- *
- * @since 3.3.0
- * CONTEXTLAUNCHING
- */
- String PREF_LAUNCH_PARENT_PROJECT = IDebugUIConstants.PLUGIN_ID + ".LaunchParentProject"; //$NON-NLS-1$
-
- /**
- * Boolean preference indicating if the user should be prompted prior to removing a launch configuration
- * from the launch history drop down
- *
- * @since 3.4
- */
- String PREF_REMOVE_FROM_LAUNCH_HISTORY = IDebugUIConstants.PLUGIN_ID + ".RemoveFromLaunchHistory"; //$NON-NLS-1$
-
- /**
- * String preference controlling whether editors are saved before launching.
- * Valid values are either "always", "never", or "prompt".
- * If "always" or "never", launching will save editors (or not) automatically.
- * If "prompt", the user will be prompted each time.
- *
- * @since 3.0
- */
- String PREF_SAVE_DIRTY_EDITORS_BEFORE_LAUNCH = IDebugUIConstants.PLUGIN_ID + ".save_dirty_editors_before_launch"; //$NON-NLS-1$
-
- /**
- * Preference specifying that all launches should be DEBUG_MODE if breakpoints exist in the workspace
- * @since 3.0
- */
- String PREF_RELAUNCH_IN_DEBUG_MODE = IDebugUIConstants.PLUGIN_ID + ".relaunch_in_debug_mode"; //$NON-NLS-1$
-
- /**
- * Preference specifying that launches should continue when compile errors exist.
- * @since 3.0
- */
- String PREF_CONTINUE_WITH_COMPILE_ERROR = IDebugUIConstants.PLUGIN_ID + ".cancel_launch_with_compile_errors"; //$NON-NLS-1$
-
- /**
- * Boolean preference controlling whether the debugger will force activate the debug
- * view when a breakpoint is hit.
- *
- * @since 3.0
- */
- String PREF_ACTIVATE_DEBUG_VIEW= IDebugUIConstants.PLUGIN_ID + ".activate_debug_view"; //$NON-NLS-1$
-
- /**
- * String preference controlling whether the debugger switching to
- * the associated perspective when launching.
- * Valid values are either "always", "never", or "prompt".
- * If "always" or "never", launching will switch perspectives (or not) automatically.
- * If "prompt", the user will be prompted each time.
- *
- * @since 3.0
- */
- String PREF_SWITCH_TO_PERSPECTIVE= IDebugUIConstants.PLUGIN_ID + ".switch_to_perspective"; //$NON-NLS-1$
-
- /**
- * String preference controlling whether the debugger switching to
- * the associated perspective when a launch suspends.
- * Valid values are either "always", "never", or "prompt".
- * If "always" or "never", suspension will switch perspectives (or not) automatically.
- * If "prompt", the user will be prompted each time.
- *
- * @since 3.0
- */
- String PREF_SWITCH_PERSPECTIVE_ON_SUSPEND= IDebugUIConstants.PLUGIN_ID + ".switch_perspective_on_suspend"; //$NON-NLS-1$
+ /**
+ * Editor Id for the "Source Not Found" editor
+ */
+ String ID_SOURCE_NOT_FOUND_EDITOR = "org.eclipse.debug.ui.NoSourceFoundEditor"; //$NON-NLS-1$
+
+ /**
+ * Boolean preference indicating if contextual launch options should be visible
+ * to the user rather than the "run as" menu.
+ *
+ * @since 3.3.0
+ * CONTEXTLAUNCHING
+ */
+ String PREF_USE_CONTEXTUAL_LAUNCH = IDebugUIConstants.PLUGIN_ID + ".UseContextualLaunch"; //$NON-NLS-1$
+
+ /**
+ * Boolean preference indicating that if the selected resource is not launchable, then we should
+ * launch the last configuration that was launched.
+ *
+ * @since 3.3.0
+ * CONTEXTLAUNCHING
+ */
+ String PREF_LAUNCH_LAST_IF_NOT_LAUNCHABLE = IDebugUIConstants.PLUGIN_ID + ".LaunchLastIfNotLaunchable"; //$NON-NLS-1$
+
+ /**
+ * Boolean preference indicating if we should always consider the parent project when
+ * a selected context is not runnable
+ *
+ * @since 3.3.0
+ * CONTEXTLAUNCHING
+ */
+ String PREF_LAUNCH_PARENT_PROJECT = IDebugUIConstants.PLUGIN_ID + ".LaunchParentProject"; //$NON-NLS-1$
+
+ /**
+ * Boolean preference indicating if the user should be prompted prior to removing a launch configuration
+ * from the launch history drop down
+ *
+ * @since 3.4
+ */
+ String PREF_REMOVE_FROM_LAUNCH_HISTORY = IDebugUIConstants.PLUGIN_ID + ".RemoveFromLaunchHistory"; //$NON-NLS-1$
+
+ /**
+ * String preference controlling whether editors are saved before launching.
+ * Valid values are either "always", "never", or "prompt".
+ * If "always" or "never", launching will save editors (or not) automatically.
+ * If "prompt", the user will be prompted each time.
+ *
+ * @since 3.0
+ */
+ String PREF_SAVE_DIRTY_EDITORS_BEFORE_LAUNCH = IDebugUIConstants.PLUGIN_ID + ".save_dirty_editors_before_launch"; //$NON-NLS-1$
+
+ /**
+ * Preference specifying that all launches should be DEBUG_MODE if breakpoints exist in the workspace
+ * @since 3.0
+ */
+ String PREF_RELAUNCH_IN_DEBUG_MODE = IDebugUIConstants.PLUGIN_ID + ".relaunch_in_debug_mode"; //$NON-NLS-1$
+
+ /**
+ * Preference specifying that launches should continue when compile errors exist.
+ * @since 3.0
+ */
+ String PREF_CONTINUE_WITH_COMPILE_ERROR = IDebugUIConstants.PLUGIN_ID + ".cancel_launch_with_compile_errors"; //$NON-NLS-1$
+
+ /**
+ * Boolean preference controlling whether the debugger will force activate the debug
+ * view when a breakpoint is hit.
+ *
+ * @since 3.0
+ */
+ String PREF_ACTIVATE_DEBUG_VIEW= IDebugUIConstants.PLUGIN_ID + ".activate_debug_view"; //$NON-NLS-1$
+
+ /**
+ * String preference controlling whether the debugger switching to
+ * the associated perspective when launching.
+ * Valid values are either "always", "never", or "prompt".
+ * If "always" or "never", launching will switch perspectives (or not) automatically.
+ * If "prompt", the user will be prompted each time.
+ *
+ * @since 3.0
+ */
+ String PREF_SWITCH_TO_PERSPECTIVE= IDebugUIConstants.PLUGIN_ID + ".switch_to_perspective"; //$NON-NLS-1$
+
+ /**
+ * String preference controlling whether the debugger switching to
+ * the associated perspective when a launch suspends.
+ * Valid values are either "always", "never", or "prompt".
+ * If "always" or "never", suspension will switch perspectives (or not) automatically.
+ * If "prompt", the user will be prompted each time.
+ *
+ * @since 3.0
+ */
+ String PREF_SWITCH_PERSPECTIVE_ON_SUSPEND= IDebugUIConstants.PLUGIN_ID + ".switch_perspective_on_suspend"; //$NON-NLS-1$
/**
* String preference controlling whether the debugger waits for a currently
@@ -328,135 +328,135 @@ public interface IInternalDebugUIConstants {
int ADD_UNIT_PER_LINE = 16; // number of addressable unit per line
int CHAR_PER_BYTE = 2; // number of characters to represent one byte
- /**
- * Memory view's rendering view pane identifier (value <code>"org.eclipse.debug.ui.MemoryView.RenderingViewPane"</code>).
- * @since 3.1
- */
- String ID_RENDERING_VIEW_PANE = RenderingViewPane.RENDERING_VIEW_PANE_ID;
-
- /**
- * Memory view's memory block tree viewer's identifier. (value <code>"org.eclipse.debug.ui.MemoryView.MemoryBlocksTreeViewPane"</code>).
- * @since 3.1
- */
- String ID_MEMORY_BLOCK_TREE_VIEWER = MemoryBlocksTreeViewPane.PANE_ID;
-
- /**
- * Memory view image identifier
- *
- * @since 3.0
- * */
- String IMG_CVIEW_MEMORY_VIEW= "IMG_CVIEW_MEMORY_VIEW"; //$NON-NLS-1$
-
-
- /**
- * Modules view image identifier
- *
- * @since 3.4
- * */
- String IMG_CVIEW_MODULES_VIEW= "IMG_CVIEW_MODULES_VIEW"; //$NON-NLS-1$
-
- /**
- * Boolean preference controlling whether the debug view tracks
- * views as the user manually opens/closes them for the purpose
- * of not automatically opening/closing such views.
- *
- * @since 3.0
- */
- String PREF_TRACK_VIEWS= IDebugUIConstants.PLUGIN_ID + ".track_views"; //$NON-NLS-1$
-
- /**
- * Comma separated list of view ids closed by the user, that have view context bindings.
- * @since 3.2
- */
- String PREF_USER_VIEW_BINDINGS = IDebugUIConstants.PLUGIN_ID + ".user_view_bindings"; //$NON-NLS-1$
-
- /**
- * Preference storing memento for the default breakpoint working set in
- * the breakpoints view.
- *
- * @since 3.1
- */
- String MEMENTO_BREAKPOINT_WORKING_SET_NAME = DebugUIPlugin.getUniqueIdentifier() + ".MEMENTO_BREAKPOINT_WORKING_SET_NAME"; //$NON-NLS-1$
-
- /**
- * Breakpoint working set identifier.
- *
- * @since 3.1
- * @deprecated There is an API equivalent constant that should be used, see
- * {@link IDebugUIConstants#BREAKPOINT_WORKINGSET_ID}
- */
+ /**
+ * Memory view's rendering view pane identifier (value <code>"org.eclipse.debug.ui.MemoryView.RenderingViewPane"</code>).
+ * @since 3.1
+ */
+ String ID_RENDERING_VIEW_PANE = RenderingViewPane.RENDERING_VIEW_PANE_ID;
+
+ /**
+ * Memory view's memory block tree viewer's identifier. (value <code>"org.eclipse.debug.ui.MemoryView.MemoryBlocksTreeViewPane"</code>).
+ * @since 3.1
+ */
+ String ID_MEMORY_BLOCK_TREE_VIEWER = MemoryBlocksTreeViewPane.PANE_ID;
+
+ /**
+ * Memory view image identifier
+ *
+ * @since 3.0
+ * */
+ String IMG_CVIEW_MEMORY_VIEW= "IMG_CVIEW_MEMORY_VIEW"; //$NON-NLS-1$
+
+
+ /**
+ * Modules view image identifier
+ *
+ * @since 3.4
+ * */
+ String IMG_CVIEW_MODULES_VIEW= "IMG_CVIEW_MODULES_VIEW"; //$NON-NLS-1$
+
+ /**
+ * Boolean preference controlling whether the debug view tracks
+ * views as the user manually opens/closes them for the purpose
+ * of not automatically opening/closing such views.
+ *
+ * @since 3.0
+ */
+ String PREF_TRACK_VIEWS= IDebugUIConstants.PLUGIN_ID + ".track_views"; //$NON-NLS-1$
+
+ /**
+ * Comma separated list of view ids closed by the user, that have view context bindings.
+ * @since 3.2
+ */
+ String PREF_USER_VIEW_BINDINGS = IDebugUIConstants.PLUGIN_ID + ".user_view_bindings"; //$NON-NLS-1$
+
+ /**
+ * Preference storing memento for the default breakpoint working set in
+ * the breakpoints view.
+ *
+ * @since 3.1
+ */
+ String MEMENTO_BREAKPOINT_WORKING_SET_NAME = DebugUIPlugin.getUniqueIdentifier() + ".MEMENTO_BREAKPOINT_WORKING_SET_NAME"; //$NON-NLS-1$
+
+ /**
+ * Breakpoint working set identifier.
+ *
+ * @since 3.1
+ * @deprecated There is an API equivalent constant that should be used, see
+ * {@link IDebugUIConstants#BREAKPOINT_WORKINGSET_ID}
+ */
@Deprecated String ID_BREAKPOINT_WORKINGSET = "org.eclipse.debug.ui.breakpointWorkingSet"; //$NON-NLS-1$
- /**
- * Address at the beginning of a page in a table rendering.
- * @since 3.1
- */
- String PROPERTY_PAGE_START_ADDRESS = "pageStart"; //$NON-NLS-1$
-
-
- /**
- * This constant is used as a "quick-fix" for the issue of breakpoint to working set
- * persistence when the state of a project changes.
- *
- * @since 3.2
- */
- String WORKING_SET_NAME = "workingset_name"; //$NON-NLS-1$
-
- /**
- * This constant is used as a "quick-fix" for the issue of breakpoint to working set
- * persistence when the state of a project changes.
- *
- * @since 3.2
- */
- String WORKING_SET_ID = "workingset_id"; //$NON-NLS-1$
-
- /**
- * Annotation type identifier for annotation of the an instruction
- * pointer with a dynamic image. Value is <code>org.eclipse.debug.ui.dynamicIP</code>,
- * identifying a <code>org.eclipse.ui.editors.markerAnnotationSpecification</code>
- * extension.
- *
- * @since 3.2
- */
- String ANNOTATION_TYPE_DYNAMIC_INSTRUCTION_POINTER = "org.eclipse.debug.ui.dynamicIP"; //$NON-NLS-1$
-
- /**
- * Identifier of the external tool builder launch category. Defined here since
- * external tools is actually a dependent plug-in.
- *
- * @since 3.4
- */
- String ID_EXTERNAL_TOOL_BUILDER_LAUNCH_CATEGORY = "org.eclipse.ui.externaltools.builder"; //$NON-NLS-1$
-
- //themes
-
- /**
- * Theme color definition for process console background color.
- *
- * @since 3.4
- */
- String THEME_CONSOLE_COLOR_BACKGROUND= "org.eclipse.debug.ui.console.background"; //$NON-NLS-1$
-
- /**
- * Theme color definition for process console standard out.
- *
- * @since 3.4
- */
- String THEME_CONSOLE_COLOR_STD_OUT= "org.eclipse.debug.ui.console.stream.out"; //$NON-NLS-1$
-
- /**
- * Theme color definition for process console standard in.
- *
- * @since 3.4
- */
- String THEME_CONSOLE_COLOR_STD_IN= "org.eclipse.debug.ui.console.stream.in"; //$NON-NLS-1$
-
- /**
- * Theme color definition for process console standard err.
- *
- * @since 3.4
- */
+ /**
+ * Address at the beginning of a page in a table rendering.
+ * @since 3.1
+ */
+ String PROPERTY_PAGE_START_ADDRESS = "pageStart"; //$NON-NLS-1$
+
+
+ /**
+ * This constant is used as a "quick-fix" for the issue of breakpoint to working set
+ * persistence when the state of a project changes.
+ *
+ * @since 3.2
+ */
+ String WORKING_SET_NAME = "workingset_name"; //$NON-NLS-1$
+
+ /**
+ * This constant is used as a "quick-fix" for the issue of breakpoint to working set
+ * persistence when the state of a project changes.
+ *
+ * @since 3.2
+ */
+ String WORKING_SET_ID = "workingset_id"; //$NON-NLS-1$
+
+ /**
+ * Annotation type identifier for annotation of the an instruction
+ * pointer with a dynamic image. Value is <code>org.eclipse.debug.ui.dynamicIP</code>,
+ * identifying a <code>org.eclipse.ui.editors.markerAnnotationSpecification</code>
+ * extension.
+ *
+ * @since 3.2
+ */
+ String ANNOTATION_TYPE_DYNAMIC_INSTRUCTION_POINTER = "org.eclipse.debug.ui.dynamicIP"; //$NON-NLS-1$
+
+ /**
+ * Identifier of the external tool builder launch category. Defined here since
+ * external tools is actually a dependent plug-in.
+ *
+ * @since 3.4
+ */
+ String ID_EXTERNAL_TOOL_BUILDER_LAUNCH_CATEGORY = "org.eclipse.ui.externaltools.builder"; //$NON-NLS-1$
+
+ //themes
+
+ /**
+ * Theme color definition for process console background color.
+ *
+ * @since 3.4
+ */
+ String THEME_CONSOLE_COLOR_BACKGROUND= "org.eclipse.debug.ui.console.background"; //$NON-NLS-1$
+
+ /**
+ * Theme color definition for process console standard out.
+ *
+ * @since 3.4
+ */
+ String THEME_CONSOLE_COLOR_STD_OUT= "org.eclipse.debug.ui.console.stream.out"; //$NON-NLS-1$
+
+ /**
+ * Theme color definition for process console standard in.
+ *
+ * @since 3.4
+ */
+ String THEME_CONSOLE_COLOR_STD_IN= "org.eclipse.debug.ui.console.stream.in"; //$NON-NLS-1$
+
+ /**
+ * Theme color definition for process console standard err.
+ *
+ * @since 3.4
+ */
String THEME_CONSOLE_COLOR_STD_ERR = "org.eclipse.debug.ui.console.stream.err"; //$NON-NLS-1$
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java
index c9132420d..f5d1db073 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java
@@ -95,11 +95,11 @@ public class InstructionPointerManager{
IDocumentProvider docProvider = textEditor.getDocumentProvider();
IEditorInput editorInput = textEditor.getEditorInput();
- // If there is no annotation model, there's nothing more to do
- IAnnotationModel annModel = docProvider.getAnnotationModel(editorInput);
- if (annModel == null) {
- return;
- }
+ // If there is no annotation model, there's nothing more to do
+ IAnnotationModel annModel = docProvider.getAnnotationModel(editorInput);
+ if (annModel == null) {
+ return;
+ }
// Create the Position object that specifies a location for the annotation
Position position = null;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java
index 8bf88af20..cdc78ef3b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java
@@ -127,17 +127,17 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
public Image getImage(Object element) {
initImageRegistry();
Image image = getPresentation().getImage(element);
- if (image == null) {
- image = getDefaultImage(element);
- }
- if (image != null) {
- int flags= computeAdornmentFlags(element);
- if (flags > 0) {
- CompositeDebugImageDescriptor descriptor= new CompositeDebugImageDescriptor(image, flags);
- return DebugUIPlugin.getImageDescriptorRegistry().get(descriptor);
- }
- }
- return image;
+ if (image == null) {
+ image = getDefaultImage(element);
+ }
+ if (image != null) {
+ int flags= computeAdornmentFlags(element);
+ if (flags > 0) {
+ CompositeDebugImageDescriptor descriptor= new CompositeDebugImageDescriptor(image, flags);
+ return DebugUIPlugin.getImageDescriptorRegistry().get(descriptor);
+ }
+ }
+ return image;
}
/**
@@ -150,81 +150,81 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
}
/**
- * Computes and return common adornment flags for the given element.
- *
- * @param element
- * @return adornment flags defined in CompositeDebugImageDescriptor
- */
- private int computeAdornmentFlags(Object element) {
- if (element instanceof IBreakpoint) {
- if (!DebugPlugin.getDefault().getBreakpointManager().isEnabled()) {
- return CompositeDebugImageDescriptor.SKIP_BREAKPOINT;
- }
- }
- return 0;
- }
-
- /**
- * Returns a default text label for the debug element
- */
- protected String getDefaultText(Object element) {
- return DebugUIPlugin.getDefaultLabelProvider().getText(element);
- }
-
- /**
- * Returns a default image for the debug element
- */
- protected Image getDefaultImage(Object element) {
- return DebugUIPlugin.getDefaultLabelProvider().getImage(element);
- }
-
- /**
+ * Computes and return common adornment flags for the given element.
+ *
+ * @param element
+ * @return adornment flags defined in CompositeDebugImageDescriptor
+ */
+ private int computeAdornmentFlags(Object element) {
+ if (element instanceof IBreakpoint) {
+ if (!DebugPlugin.getDefault().getBreakpointManager().isEnabled()) {
+ return CompositeDebugImageDescriptor.SKIP_BREAKPOINT;
+ }
+ }
+ return 0;
+ }
+
+ /**
+ * Returns a default text label for the debug element
+ */
+ protected String getDefaultText(Object element) {
+ return DebugUIPlugin.getDefaultLabelProvider().getText(element);
+ }
+
+ /**
+ * Returns a default image for the debug element
+ */
+ protected Image getDefaultImage(Object element) {
+ return DebugUIPlugin.getDefaultLabelProvider().getImage(element);
+ }
+
+ /**
* @see IDebugModelPresentation#getText(Object)
*/
@Override
public String getText(Object element) {
- if (!(element instanceof IndexedVariablePartition)) {
- // Attempt to delegate
- String text = getPresentation().getText(element);
- if (text != null) {
- return text;
- }
- }
- // If no delegate returned a text label, use the default
- if (showVariableTypeNames()) {
- try {
- if (element instanceof IExpression) {
- StringBuilder buf = new StringBuilder();
- IValue value = ((IExpression)element).getValue();
- if (value != null) {
- String type = value.getReferenceTypeName();
- if (type != null && type.length() > 0) {
- buf.append(type);
- buf.append(' ');
- }
- }
- buf.append(getDefaultText(element));
- return buf.toString();
- } else if (element instanceof IVariable) {
- return new StringBuffer(((IVariable)element).getValue().getReferenceTypeName()).append(' ').append(getDefaultText(element)).toString();
- }
- } catch (DebugException de) {
- DebugUIPlugin.log(de);
- }
- }
- return getDefaultText(element);
- }
-
- /**
- * Whether or not to show variable type names.
- * This option is configured per model presentation.
- * This allows this option to be set per view, for example.
- */
- protected boolean showVariableTypeNames() {
+ if (!(element instanceof IndexedVariablePartition)) {
+ // Attempt to delegate
+ String text = getPresentation().getText(element);
+ if (text != null) {
+ return text;
+ }
+ }
+ // If no delegate returned a text label, use the default
+ if (showVariableTypeNames()) {
+ try {
+ if (element instanceof IExpression) {
+ StringBuilder buf = new StringBuilder();
+ IValue value = ((IExpression)element).getValue();
+ if (value != null) {
+ String type = value.getReferenceTypeName();
+ if (type != null && type.length() > 0) {
+ buf.append(type);
+ buf.append(' ');
+ }
+ }
+ buf.append(getDefaultText(element));
+ return buf.toString();
+ } else if (element instanceof IVariable) {
+ return new StringBuffer(((IVariable)element).getValue().getReferenceTypeName()).append(' ').append(getDefaultText(element)).toString();
+ }
+ } catch (DebugException de) {
+ DebugUIPlugin.log(de);
+ }
+ }
+ return getDefaultText(element);
+ }
+
+ /**
+ * Whether or not to show variable type names.
+ * This option is configured per model presentation.
+ * This allows this option to be set per view, for example.
+ */
+ protected boolean showVariableTypeNames() {
Boolean show = (Boolean) fAttributes.get(DISPLAY_VARIABLE_TYPE_NAMES);
show = show == null ? Boolean.FALSE : show;
- return show.booleanValue();
- }
+ return show.booleanValue();
+ }
/**
* @see IDebugModelPresentation#computeDetail(IValue, IValueDetailListener)
@@ -293,7 +293,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
}
ListenerList<ILabelProviderListener> listeners = fListeners;
if (listeners != null) {
- listeners.remove(listener);
+ listeners.remove(listener);
}
}
@@ -302,12 +302,12 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
*/
protected IDebugModelPresentation getPresentation() {
if (fPresentation == null) {
- synchronized (this) {
- if (fPresentation != null) {
- // In the case that the synchronization is enforced, the "blocked" thread
- // should return the presentation configured by the "owning" thread.
- return fPresentation;
- }
+ synchronized (this) {
+ if (fPresentation != null) {
+ // In the case that the synchronization is enforced, the "blocked" thread
+ // should return the presentation configured by the "owning" thread.
+ return fPresentation;
+ }
try {
IDebugModelPresentation tempPresentation= (IDebugModelPresentation) DebugUIPlugin.createExtension(fConfig, "class"); //$NON-NLS-1$
// configure it
@@ -326,7 +326,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
} catch (CoreException e) {
DebugUIPlugin.log(e);
}
- }
+ }
}
return fPresentation;
}
@@ -394,35 +394,35 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
return fAttributes;
}
- @Override
+ @Override
public Color getForeground(Object element) {
- IDebugModelPresentation presentation = getPresentation();
- if (presentation instanceof IColorProvider) {
- IColorProvider colorProvider = (IColorProvider) presentation;
- return colorProvider.getForeground(element);
- }
- return null;
- }
-
- @Override
+ IDebugModelPresentation presentation = getPresentation();
+ if (presentation instanceof IColorProvider) {
+ IColorProvider colorProvider = (IColorProvider) presentation;
+ return colorProvider.getForeground(element);
+ }
+ return null;
+ }
+
+ @Override
public Color getBackground(Object element) {
- IDebugModelPresentation presentation = getPresentation();
- if (presentation instanceof IColorProvider) {
- IColorProvider colorProvider = (IColorProvider) presentation;
- return colorProvider.getBackground(element);
- }
- return null;
- }
-
- @Override
+ IDebugModelPresentation presentation = getPresentation();
+ if (presentation instanceof IColorProvider) {
+ IColorProvider colorProvider = (IColorProvider) presentation;
+ return colorProvider.getBackground(element);
+ }
+ return null;
+ }
+
+ @Override
public Font getFont(Object element) {
- IDebugModelPresentation presentation = getPresentation();
- if (presentation instanceof IFontProvider) {
- IFontProvider fontProvider = (IFontProvider) presentation;
- return fontProvider.getFont(element);
- }
- return null;
- }
+ IDebugModelPresentation presentation = getPresentation();
+ if (presentation instanceof IFontProvider) {
+ IFontProvider fontProvider = (IFontProvider) presentation;
+ return fontProvider.getFont(element);
+ }
+ return null;
+ }
@Override
public Annotation getInstructionPointerAnnotation(IEditorPart editorPart, IStackFrame frame) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java
index 4e7d834eb..c9e2932f4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java
@@ -305,13 +305,13 @@ public class MultipleInputDialog extends Dialog {
text.setData(FIELD_NAME, labelText);
text.addTraverseListener(new TraverseListener () {
- @Override
+ @Override
public void keyTraversed(TraverseEvent e) {
- if(e.detail == SWT.TRAVERSE_RETURN && e.stateMask == SWT.SHIFT) {
- e.doit = true;
- }
- }
- });
+ if(e.detail == SWT.TRAVERSE_RETURN && e.stateMask == SWT.SHIFT) {
+ e.doit = true;
+ }
+ }
+ });
// make sure rows are the same height on both panels.
label.setSize(label.getSize().x, text.getSize().y);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java
index 53c76a253..bb50f1fa2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java
@@ -40,100 +40,100 @@ import org.eclipse.ui.IPathEditorInput;
*/
public class ResourceExtender extends PropertyTester {
- private static final String PROPERTY_MATCHES_PATTERN = "matchesPattern"; //$NON-NLS-1$
+ private static final String PROPERTY_MATCHES_PATTERN = "matchesPattern"; //$NON-NLS-1$
- private static final String PROJECT_NATURE = "projectNature"; //$NON-NLS-1$
+ private static final String PROJECT_NATURE = "projectNature"; //$NON-NLS-1$
- private static final String PROPERTY_MATCHES_CONTENT_TYPE = "matchesContentType"; //$NON-NLS-1$
+ private static final String PROPERTY_MATCHES_CONTENT_TYPE = "matchesContentType"; //$NON-NLS-1$
- @Override
+ @Override
public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {
- IResource resource = ((IAdaptable) receiver).getAdapter(IResource.class);
- if (resource == null) {
- if (PROPERTY_MATCHES_CONTENT_TYPE.equals(method)) {
- IPathEditorInput editorInput = ((IAdaptable) receiver).getAdapter(IPathEditorInput.class);
- if (editorInput != null) {
- IPath path= editorInput.getPath();
- File file= path.toFile();
- if (file.exists()) {
+ IResource resource = ((IAdaptable) receiver).getAdapter(IResource.class);
+ if (resource == null) {
+ if (PROPERTY_MATCHES_CONTENT_TYPE.equals(method)) {
+ IPathEditorInput editorInput = ((IAdaptable) receiver).getAdapter(IPathEditorInput.class);
+ if (editorInput != null) {
+ IPath path= editorInput.getPath();
+ File file= path.toFile();
+ if (file.exists()) {
try (FileReader reader = new FileReader(file)) {
- IContentType contentType= Platform.getContentTypeManager().getContentType((String)expectedValue);
- IContentDescription description= contentType.getDescriptionFor(reader, IContentDescription.ALL);
- if (description != null) {
- return matchesContentType(description.getContentType(), (String)expectedValue);
- }
- } catch (FileNotFoundException e) {
- return false;
- } catch (IOException e) {
- return false;
- }
- }
- }
- }
- } else {
- if (PROPERTY_MATCHES_PATTERN.equals(method)) {
- String fileName = resource.getName();
- String expected = (String) expectedValue;
- expected = expected.replaceAll("\\.", "\\\\."); //$NON-NLS-1$//$NON-NLS-2$
- expected = expected.replaceAll("\\*", "\\.\\*"); //$NON-NLS-1$//$NON-NLS-2$
- Pattern pattern = Pattern.compile(expected);
- boolean retVal = pattern.matcher(fileName).find();
- return retVal;
- } else if (PROJECT_NATURE.equals(method)) {
- try {
- IProject proj = resource.getProject();
- return proj != null && proj.isAccessible() && proj.hasNature((String) expectedValue);
- } catch (CoreException e) {
- return false;
- }
- } else if (PROPERTY_MATCHES_CONTENT_TYPE.equals(method)) {
- return matchesContentType(resource, (String) expectedValue);
- }
- }
- return false;
- }
+ IContentType contentType= Platform.getContentTypeManager().getContentType((String)expectedValue);
+ IContentDescription description= contentType.getDescriptionFor(reader, IContentDescription.ALL);
+ if (description != null) {
+ return matchesContentType(description.getContentType(), (String)expectedValue);
+ }
+ } catch (FileNotFoundException e) {
+ return false;
+ } catch (IOException e) {
+ return false;
+ }
+ }
+ }
+ }
+ } else {
+ if (PROPERTY_MATCHES_PATTERN.equals(method)) {
+ String fileName = resource.getName();
+ String expected = (String) expectedValue;
+ expected = expected.replaceAll("\\.", "\\\\."); //$NON-NLS-1$//$NON-NLS-2$
+ expected = expected.replaceAll("\\*", "\\.\\*"); //$NON-NLS-1$//$NON-NLS-2$
+ Pattern pattern = Pattern.compile(expected);
+ boolean retVal = pattern.matcher(fileName).find();
+ return retVal;
+ } else if (PROJECT_NATURE.equals(method)) {
+ try {
+ IProject proj = resource.getProject();
+ return proj != null && proj.isAccessible() && proj.hasNature((String) expectedValue);
+ } catch (CoreException e) {
+ return false;
+ }
+ } else if (PROPERTY_MATCHES_CONTENT_TYPE.equals(method)) {
+ return matchesContentType(resource, (String) expectedValue);
+ }
+ }
+ return false;
+ }
- /**
- * Returns whether the given type or one of its base types matches the
- * given content type identifier.
- *
- * @param type content type or <code>null</code>
- * @param typeId content type identifier
- * @return
- */
- private boolean matchesContentType(IContentType type, String typeId) {
- while (type != null) {
- if (typeId.equals(type.getId())) {
- return true;
- }
- type = type.getBaseType();
- }
- return false;
- }
+ /**
+ * Returns whether the given type or one of its base types matches the
+ * given content type identifier.
+ *
+ * @param type content type or <code>null</code>
+ * @param typeId content type identifier
+ * @return
+ */
+ private boolean matchesContentType(IContentType type, String typeId) {
+ while (type != null) {
+ if (typeId.equals(type.getId())) {
+ return true;
+ }
+ type = type.getBaseType();
+ }
+ return false;
+ }
- /**
- * Returns whether or not the given file's content type matches the
- * specified content type.
- *
- * Content types are looked up in the content type registry.
- *
- * @return whether or not the given resource has the given content type
- */
- private boolean matchesContentType(IResource resource, String contentType) {
- if (resource == null || !(resource instanceof IFile) || !resource.exists()) {
- return false;
- }
- IFile file = (IFile) resource;
- IContentDescription description;
- try {
- description = file.getContentDescription();
- } catch (CoreException e) {
- return false;
- }
- if (description != null) {
- return matchesContentType(description.getContentType(), contentType);
- }
- return false;
- }
+ /**
+ * Returns whether or not the given file's content type matches the
+ * specified content type.
+ *
+ * Content types are looked up in the content type registry.
+ *
+ * @return whether or not the given resource has the given content type
+ */
+ private boolean matchesContentType(IResource resource, String contentType) {
+ if (resource == null || !(resource instanceof IFile) || !resource.exists()) {
+ return false;
+ }
+ IFile file = (IFile) resource;
+ IContentDescription description;
+ try {
+ description = file.getContentDescription();
+ } catch (CoreException e) {
+ return false;
+ }
+ if (description != null) {
+ return matchesContentType(description.getContentType(), contentType);
+ }
+ return false;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SWTFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SWTFactory.java
index e43c22b70..6139c95bd 100755
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SWTFactory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SWTFactory.java
@@ -322,13 +322,13 @@ public class SWTFactory {
*
*/
public static Text createSingleText(Composite parent, int hspan) {
- Text t = new Text(parent, SWT.SINGLE | SWT.BORDER);
- t.setFont(parent.getFont());
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = hspan;
- t.setLayoutData(gd);
- return t;
- }
+ Text t = new Text(parent, SWT.SINGLE | SWT.BORDER);
+ t.setFont(parent.getFont());
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = hspan;
+ t.setLayoutData(gd);
+ return t;
+ }
/**
* Creates a new text widget
@@ -340,13 +340,13 @@ public class SWTFactory {
* @since 3.3
*/
public static Text createText(Composite parent, int style, int hspan, int fill) {
- Text t = new Text(parent, style);
- t.setFont(parent.getFont());
- GridData gd = new GridData(fill);
- gd.horizontalSpan = hspan;
- t.setLayoutData(gd);
- return t;
- }
+ Text t = new Text(parent, style);
+ t.setFont(parent.getFont());
+ GridData gd = new GridData(fill);
+ gd.horizontalSpan = hspan;
+ t.setLayoutData(gd);
+ return t;
+ }
/**
* Creates a new text widget
@@ -357,13 +357,13 @@ public class SWTFactory {
* @since 3.3
*/
public static Text createText(Composite parent, int style, int hspan) {
- Text t = new Text(parent, style);
- t.setFont(parent.getFont());
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = hspan;
- t.setLayoutData(gd);
- return t;
- }
+ Text t = new Text(parent, style);
+ t.setFont(parent.getFont());
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = hspan;
+ t.setLayoutData(gd);
+ return t;
+ }
/**
* Creates a new text widget
@@ -377,15 +377,15 @@ public class SWTFactory {
* @since 3.3
*/
public static Text createText(Composite parent, int style, int hspan, int width, int height, int fill) {
- Text t = new Text(parent, style);
- t.setFont(parent.getFont());
- GridData gd = new GridData(fill);
- gd.horizontalSpan = hspan;
- gd.widthHint = width;
- gd.heightHint = height;
- t.setLayoutData(gd);
- return t;
- }
+ Text t = new Text(parent, style);
+ t.setFont(parent.getFont());
+ GridData gd = new GridData(fill);
+ gd.horizontalSpan = hspan;
+ gd.widthHint = width;
+ gd.heightHint = height;
+ t.setLayoutData(gd);
+ return t;
+ }
/**
* Creates a new styled text widget
@@ -419,14 +419,14 @@ public class SWTFactory {
* @since 3.6
*/
public static Text createText(Composite parent, int style, int hspan, String text) {
- Text t = new Text(parent, style);
- t.setFont(parent.getFont());
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = hspan;
- t.setLayoutData(gd);
- t.setText(text);
- return t;
- }
+ Text t = new Text(parent, style);
+ t.setFont(parent.getFont());
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = hspan;
+ t.setLayoutData(gd);
+ t.setText(text);
+ return t;
+ }
/**
* Creates a Group widget
@@ -440,15 +440,15 @@ public class SWTFactory {
*
*/
public static Group createGroup(Composite parent, String text, int columns, int hspan, int fill) {
- Group g = new Group(parent, SWT.NONE);
- g.setLayout(new GridLayout(columns, false));
- g.setText(text);
- g.setFont(parent.getFont());
- GridData gd = new GridData(fill);
+ Group g = new Group(parent, SWT.NONE);
+ g.setLayout(new GridLayout(columns, false));
+ g.setText(text);
+ g.setFont(parent.getFont());
+ GridData gd = new GridData(fill);
gd.horizontalSpan = hspan;
- g.setLayoutData(gd);
- return g;
- }
+ g.setLayoutData(gd);
+ return g;
+ }
/**
* Creates a Composite widget
@@ -461,14 +461,14 @@ public class SWTFactory {
* @since 3.3
*/
public static Composite createComposite(Composite parent, Font font, int columns, int hspan, int fill) {
- Composite g = new Composite(parent, SWT.NONE);
- g.setLayout(new GridLayout(columns, false));
- g.setFont(font);
- GridData gd = new GridData(fill);
+ Composite g = new Composite(parent, SWT.NONE);
+ g.setLayout(new GridLayout(columns, false));
+ g.setFont(font);
+ GridData gd = new GridData(fill);
gd.horizontalSpan = hspan;
- g.setLayoutData(gd);
- return g;
- }
+ g.setLayoutData(gd);
+ return g;
+ }
/**
* Creates an ExpandibleComposite widget
@@ -503,12 +503,12 @@ public class SWTFactory {
*/
public static Composite createComposite(Composite parent, int columns, int hspan, int fill) {
Composite g = new Composite(parent, SWT.NONE);
- g.setLayout(new GridLayout(columns, false));
- g.setFont(parent.getFont());
- GridData gd = new GridData(fill);
+ g.setLayout(new GridLayout(columns, false));
+ g.setFont(parent.getFont());
+ GridData gd = new GridData(fill);
gd.horizontalSpan = hspan;
- g.setLayoutData(gd);
- return g;
+ g.setLayoutData(gd);
+ return g;
}
/**
@@ -561,12 +561,12 @@ public class SWTFactory {
GridLayout layout = new GridLayout(columns, false);
layout.marginWidth = marginwidth;
layout.marginHeight = marginheight;
- g.setLayout(layout);
- g.setFont(font);
- GridData gd = new GridData(fill);
+ g.setLayout(layout);
+ g.setFont(font);
+ GridData gd = new GridData(fill);
gd.horizontalSpan = hspan;
- g.setLayoutData(gd);
- return g;
+ g.setLayoutData(gd);
+ return g;
}
/**
@@ -585,9 +585,9 @@ public class SWTFactory {
ViewForm form = new ViewForm(parent, style);
form.setFont(parent.getFont());
GridLayout layout = new GridLayout(cols, false);
- layout.marginWidth = marginwidth;
+ layout.marginWidth = marginwidth;
layout.marginHeight = marginheight;
- form.setLayout(layout);
+ form.setLayout(layout);
GridData gd = new GridData(fill);
gd.horizontalSpan = span;
form.setLayoutData(gd);
@@ -612,12 +612,12 @@ public class SWTFactory {
GridLayout layout = new GridLayout(columns, false);
layout.marginWidth = marginwidth;
layout.marginHeight = marginheight;
- g.setLayout(layout);
- g.setFont(font);
- GridData gd = new GridData(fill);
+ g.setLayout(layout);
+ g.setFont(font);
+ GridData gd = new GridData(fill);
gd.horizontalSpan = hspan;
- g.setLayoutData(gd);
- return g;
+ g.setLayoutData(gd);
+ return g;
}
/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariableValueEditorManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariableValueEditorManager.java
index be0c60993..4266ff096 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariableValueEditorManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariableValueEditorManager.java
@@ -33,65 +33,65 @@ import org.eclipse.debug.ui.actions.IVariableValueEditor;
*/
public class VariableValueEditorManager {
- /**
- * Mapping of debug model identifiers to variable value editors.
- * The keys in this map are always Strings (model ids).
- * The values in the map are IConfigurationElements at startup,
- * which are replaced by IVariableValueEditors as the editors
- * are instantiated (editors are loaded lazily, then cached).
- */
+ /**
+ * Mapping of debug model identifiers to variable value editors.
+ * The keys in this map are always Strings (model ids).
+ * The values in the map are IConfigurationElements at startup,
+ * which are replaced by IVariableValueEditors as the editors
+ * are instantiated (editors are loaded lazily, then cached).
+ */
private Map<String, Object> fEditorMap = new HashMap<>();
- /**
- * The singleton instance of this manager.
- */
- private static VariableValueEditorManager fgManager;
+ /**
+ * The singleton instance of this manager.
+ */
+ private static VariableValueEditorManager fgManager;
- /**
- * Creates a new variable value editor manager. Clients
- * should access the singleton instance of this manager
- * by calling getDefault()
- */
- private VariableValueEditorManager() {
- loadVariableEditors();
- }
+ /**
+ * Creates a new variable value editor manager. Clients
+ * should access the singleton instance of this manager
+ * by calling getDefault()
+ */
+ private VariableValueEditorManager() {
+ loadVariableEditors();
+ }
- /**
- * Returns the singleton instance of this manager.
- * @return the singleton instance of this manager
- */
- public static VariableValueEditorManager getDefault() {
- if (fgManager == null) {
- fgManager= new VariableValueEditorManager();
- }
- return fgManager;
- }
+ /**
+ * Returns the singleton instance of this manager.
+ * @return the singleton instance of this manager
+ */
+ public static VariableValueEditorManager getDefault() {
+ if (fgManager == null) {
+ fgManager= new VariableValueEditorManager();
+ }
+ return fgManager;
+ }
- /**
- * Returns the variable value editor associated with the given debug
- * model identifier or <code>null</code> if no editor has been supplied
- * for the given debug model.
- * @param modelIdentifier the debug model identifier
- * @return the variable value editor associated with the given debug model
- * identifier or <code>null</code>
- */
- public IVariableValueEditor getVariableValueEditor(String modelIdentifier) {
- Object object = fEditorMap.get(modelIdentifier);
- IVariableValueEditor editor= null;
- if (object instanceof IVariableValueEditor) {
- editor= (IVariableValueEditor) object;
- } else if (object instanceof IConfigurationElement) {
- try {
- editor = (IVariableValueEditor) ((IConfigurationElement) object).createExecutableExtension("class"); //$NON-NLS-1$
- fEditorMap.put(modelIdentifier, editor);
- } catch (CoreException e) {
- // If an exception occurs, loading the extension, just log it and
- // return null.
- DebugUIPlugin.log(e);
- }
- }
- return editor;
- }
+ /**
+ * Returns the variable value editor associated with the given debug
+ * model identifier or <code>null</code> if no editor has been supplied
+ * for the given debug model.
+ * @param modelIdentifier the debug model identifier
+ * @return the variable value editor associated with the given debug model
+ * identifier or <code>null</code>
+ */
+ public IVariableValueEditor getVariableValueEditor(String modelIdentifier) {
+ Object object = fEditorMap.get(modelIdentifier);
+ IVariableValueEditor editor= null;
+ if (object instanceof IVariableValueEditor) {
+ editor= (IVariableValueEditor) object;
+ } else if (object instanceof IConfigurationElement) {
+ try {
+ editor = (IVariableValueEditor) ((IConfigurationElement) object).createExecutableExtension("class"); //$NON-NLS-1$
+ fEditorMap.put(modelIdentifier, editor);
+ } catch (CoreException e) {
+ // If an exception occurs, loading the extension, just log it and
+ // return null.
+ DebugUIPlugin.log(e);
+ }
+ }
+ return editor;
+ }
/**
* Loads contributors to the org.eclipse.debug.ui.variableValueEditors extension point,
@@ -101,11 +101,11 @@ public class VariableValueEditorManager {
IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_VARIABLE_VALUE_EDITORS);
IConfigurationElement[] elements = ep.getConfigurationElements();
for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- String modelId = element.getAttribute("modelId"); //$NON-NLS-1$
- if (modelId != null) {
- fEditorMap.put(modelId, element);
- }
- }
+ IConfigurationElement element = elements[i];
+ String modelId = element.getAttribute("modelId"); //$NON-NLS-1$
+ if (modelId != null) {
+ fEditorMap.put(modelId, element);
+ }
+ }
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
index 0a1293bfe..e6192a6da 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
@@ -76,18 +76,18 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate
@Override
public void dispose(){
- fSelection= null;
+ fSelection= null;
}
@Override
public void run(IAction action){
- if (action.isEnabled()) {
+ if (action.isEnabled()) {
IStructuredSelection selection = getSelection();
// disable the action so it cannot be run again until an event or selection change
// updates the enablement
action.setEnabled(false);
runInForeground(selection, false);
- }
+ }
}
/**
@@ -96,7 +96,7 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate
*/
private void runInForeground(final IStructuredSelection selection, boolean isShift) {
fIsShift = isShift;
- final MultiStatus status=
+ final MultiStatus status=
new MultiStatus(DebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, getStatusMessage(), null);
BusyIndicator.showWhile(Display.getCurrent(), () -> {
Iterator<?> selectionIter = selection.iterator();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
index 03e6fb189..59d220b26 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
@@ -17,39 +17,39 @@ package org.eclipse.debug.internal.ui.actions;
import org.eclipse.osgi.util.NLS;
public class ActionMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.debug.internal.ui.actions.ActionMessages";//$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.debug.internal.ui.actions.ActionMessages";//$NON-NLS-1$
- public static String AbstractLaunchHistoryAction_0;
- public static String AbstractLaunchHistoryAction_1;
- public static String AbstractLaunchHistoryAction_2;
- public static String AbstractLaunchHistoryAction_3;
- public static String AbstractLaunchHistoryAction_4;
+ public static String AbstractLaunchHistoryAction_0;
+ public static String AbstractLaunchHistoryAction_1;
+ public static String AbstractLaunchHistoryAction_2;
+ public static String AbstractLaunchHistoryAction_3;
+ public static String AbstractLaunchHistoryAction_4;
public static String AbstractLaunchHistoryAction_5;
public static String AbstractLaunchHistoryAction_6;
- public static String AddToFavoritesAction_1;
- public static String AddToFavoritesAction_2;
- public static String AddToFavoritesAction_3;
+ public static String AddToFavoritesAction_1;
+ public static String AddToFavoritesAction_2;
+ public static String AddToFavoritesAction_3;
- public static String ChangeVariableValue_errorDialogMessage;
- public static String ChangeVariableValue_errorDialogTitle;
- public static String ChangeVariableValue_title;
- public static String ChangeVariableValue_toolTipText;
- public static String ChangeVariableValue_1;
- public static String ChangeVariableValue_2;
- public static String ChangeVariableValue_3;
- public static String ChangeVariableValue_4;
+ public static String ChangeVariableValue_errorDialogMessage;
+ public static String ChangeVariableValue_errorDialogTitle;
+ public static String ChangeVariableValue_title;
+ public static String ChangeVariableValue_toolTipText;
+ public static String ChangeVariableValue_1;
+ public static String ChangeVariableValue_2;
+ public static String ChangeVariableValue_3;
+ public static String ChangeVariableValue_4;
- public static String CollapseAllAction_0;
+ public static String CollapseAllAction_0;
- public static String ConfigureColumnsAction_0;
+ public static String ConfigureColumnsAction_0;
public static String ConfigureColumnsAction_1;
public static String ConfigureColumnsAction_2;
- public static String CopyToClipboardActionDelegate_Problem_Copying_to_Clipboard_1;
- public static String CopyToClipboardActionDelegate_There_was_a_problem_when_accessing_the_system_clipboard__Retry__2;
+ public static String CopyToClipboardActionDelegate_Problem_Copying_to_Clipboard_1;
+ public static String CopyToClipboardActionDelegate_There_was_a_problem_when_accessing_the_system_clipboard__Retry__2;
public static String DebugLastAction_0;
@@ -62,21 +62,21 @@ public class ActionMessages extends NLS {
public static String DetailPaneAssignValueAction_2;
public static String DetailPaneAssignValueAction_3;
public static String DetailPaneAssignValueAction_4;
- public static String DetailPaneWordWrapAction_0;
- public static String DetailPaneMaxLengthAction_0;
+ public static String DetailPaneWordWrapAction_0;
+ public static String DetailPaneMaxLengthAction_0;
- public static String EditLaunchConfigurationAction_1;
+ public static String EditLaunchConfigurationAction_1;
- public static String EnableBreakpointAction_Enable_breakpoint_s__failed_2;
- public static String EnableBreakpointAction_Enabling_breakpoints_3;
- public static String EnableBreakpointAction_Exceptions_occurred_enabling_the_breakpoint_s___4;
+ public static String EnableBreakpointAction_Enable_breakpoint_s__failed_2;
+ public static String EnableBreakpointAction_Enabling_breakpoints_3;
+ public static String EnableBreakpointAction_Exceptions_occurred_enabling_the_breakpoint_s___4;
public static String LaunchConfigurationAction_0;
- public static String OpenBreakpointMarkerAction__Go_to_File_1;
- public static String OpenBreakpointMarkerAction_Exceptions_occurred_attempting_to_open_the_editor_for_the_breakpoint_resource_2;
- public static String OpenBreakpointMarkerAction_Go_to_Breakpoint_1;
- public static String OpenBreakpointMarkerAction_Go_to_File_for_Breakpoint_2;
+ public static String OpenBreakpointMarkerAction__Go_to_File_1;
+ public static String OpenBreakpointMarkerAction_Exceptions_occurred_attempting_to_open_the_editor_for_the_breakpoint_resource_2;
+ public static String OpenBreakpointMarkerAction_Go_to_Breakpoint_1;
+ public static String OpenBreakpointMarkerAction_Go_to_File_for_Breakpoint_2;
public static String OpenLaunchDialogAction_1;
@@ -88,22 +88,22 @@ public class ActionMessages extends NLS {
public static String ProfileLastAction_2;
public static String ProfileLastAction_3;
- public static String RelaunchActionDelegate_An_exception_occurred_while_launching_2;
- public static String RelaunchActionDelegate_Launch_Failed_1;
- public static String RelaunchLastAction_Cannot_relaunch_1;
- public static String RelaunchLastAction_Cannot_relaunch___0___because_it_does_not_support__2__mode_2;
- public static String RelaunchLastAction_Error_relaunching_3;
- public static String RelaunchLastAction_Error_encountered_attempting_to_relaunch_4;
+ public static String RelaunchActionDelegate_An_exception_occurred_while_launching_2;
+ public static String RelaunchActionDelegate_Launch_Failed_1;
+ public static String RelaunchLastAction_Cannot_relaunch_1;
+ public static String RelaunchLastAction_Cannot_relaunch___0___because_it_does_not_support__2__mode_2;
+ public static String RelaunchLastAction_Error_relaunching_3;
+ public static String RelaunchLastAction_Error_encountered_attempting_to_relaunch_4;
- public static String RemoveAllBreakpointsAction_0;
- public static String RemoveAllBreakpointsAction_1;
- public static String RemoveAllBreakpointsAction_2;
+ public static String RemoveAllBreakpointsAction_0;
+ public static String RemoveAllBreakpointsAction_1;
+ public static String RemoveAllBreakpointsAction_2;
public static String RemoveAllBreakpointsAction_3;
public static String RemoveAllBreakpointsAction_4;
- public static String RemoveBreakpointAction_0;
- public static String RemoveBreakpointAction_1;
- public static String RemoveBreakpointAction_2;
- public static String RemoveBreakpointAction_3;
+ public static String RemoveBreakpointAction_0;
+ public static String RemoveBreakpointAction_1;
+ public static String RemoveBreakpointAction_2;
+ public static String RemoveBreakpointAction_3;
public static String RemoveBreakpointAction_4;
public static String RemoveBreakpointAction_5;
public static String RemoveBreakpointAction_6;
@@ -124,93 +124,93 @@ public class ActionMessages extends NLS {
public static String RunLastAction_2;
public static String RunLastAction_3;
- public static String ShowSupportedBreakpointsAction_Show_For_Selected;
- public static String ShowSupportedBreakpointsAction_tooltip;
+ public static String ShowSupportedBreakpointsAction_Show_For_Selected;
+ public static String ShowSupportedBreakpointsAction_tooltip;
- public static String ShowTypesAction_Show__Type_Names_1;
- public static String ShowTypesAction_Show_Type_Names;
+ public static String ShowTypesAction_Show__Type_Names_1;
+ public static String ShowTypesAction_Show_Type_Names;
- public static String SkipAllBreakpointsAction_0;
- public static String SkipAllBreakpointsAction_2;
+ public static String SkipAllBreakpointsAction_0;
+ public static String SkipAllBreakpointsAction_2;
- public static String TerminateAndRelaunchAction_0;
- public static String TerminateAndRelaunchAction_3;
- public static String TerminateAndRelaunchAction_4;
- public static String TerminateAndRemoveAction_0;
- public static String TerminateAndRemoveAction_3;
+ public static String TerminateAndRelaunchAction_0;
+ public static String TerminateAndRelaunchAction_3;
+ public static String TerminateAndRelaunchAction_4;
+ public static String TerminateAndRemoveAction_0;
+ public static String TerminateAndRemoveAction_3;
- public static String ToggleDetailPaneAction_0;
+ public static String ToggleDetailPaneAction_0;
public static String ToggleDetailPaneAction_1;
- public static String ToggleDetailPaneAction_2;
+ public static String ToggleDetailPaneAction_2;
public static String ToggleDetailPaneAction_3;
- public static String ToggleDetailPaneAction_4;
- public static String ToggleDetailPaneAction_5;
- public static String ToggleDetailPaneAction_8;
- public static String ToggleBreakpointAction_0;
- public static String ToggleBreakpointAction_1;
- public static String ToggleBreakpointAction_2;
+ public static String ToggleDetailPaneAction_4;
+ public static String ToggleDetailPaneAction_5;
+ public static String ToggleDetailPaneAction_8;
+ public static String ToggleBreakpointAction_0;
+ public static String ToggleBreakpointAction_1;
+ public static String ToggleBreakpointAction_2;
public static String ToggleBreakpointAction_3;
public static String ToggleStepFiltersAction_0;
public static String ToggleStepFiltersAction_1;
- public static String WatchExpressionDialog_0;
- public static String WatchExpressionDialog_1;
- public static String WatchExpressionDialog_2;
- public static String WatchExpressionDialog_3;
- public static String WatchExpressionDialog_4;
+ public static String WatchExpressionDialog_0;
+ public static String WatchExpressionDialog_1;
+ public static String WatchExpressionDialog_2;
+ public static String WatchExpressionDialog_3;
+ public static String WatchExpressionDialog_4;
public static String WatchExpressionDialog_5;
public static String WatchExpressionDialogMenu_0;
public static String WatchExpressionDialogMenu_1;
public static String WatchExpressionDialogMenu_2;
- public static String WatchAction_0;
- public static String WatchAction_1;
+ public static String WatchAction_0;
+ public static String WatchAction_1;
- public static String RunToLineAction_0;
- public static String RunToLineAction_1;
+ public static String RunToLineAction_0;
+ public static String RunToLineAction_1;
public static String RunToLineAction_2;
public static String RunToLineAction_3;
- public static String RunToLineHandler_0;
- public static String RunToLineActionDelegate_4;
-
- public static String RetargetAction_2;
- public static String RetargetAction_3;
- public static String ModifyWatchpointAction_0;
- public static String ModifyWatchpointAction_1;
- public static String RemoveAllExpressionsAction_0;
- public static String RemoveAllExpressionsAction_1;
- public static String LaunchShortcutsAction_1;
- public static String FindDialog_1;
- public static String FindDialog_3;
- public static String FindAction_0;
-
- static {
- // load message values from bundle file
- NLS.initializeMessages(BUNDLE_NAME, ActionMessages.class);
- }
-
- public static String AbstractDebugActionDelegate_0;
-
- public static String RetargetAddMemoryBlockAction_0;
- public static String RetargetAddMemoryBlockAction_1;
- public static String AddMemoryRenderingActionDelegate_0;
- public static String AddMemoryRenderingActionDelegate_1;
- public static String AddMemoryRenderingActionDelegate_2;
-
- public static String RulerEnableDisableBreakpointAction_0;
- public static String RulerEnableDisableBreakpointAction_1;
- public static String RulerEnableDisableBreakpointAction_2;
- public static String RulerEnableDisableBreakpointAction_3;
+ public static String RunToLineHandler_0;
+ public static String RunToLineActionDelegate_4;
+
+ public static String RetargetAction_2;
+ public static String RetargetAction_3;
+ public static String ModifyWatchpointAction_0;
+ public static String ModifyWatchpointAction_1;
+ public static String RemoveAllExpressionsAction_0;
+ public static String RemoveAllExpressionsAction_1;
+ public static String LaunchShortcutsAction_1;
+ public static String FindDialog_1;
+ public static String FindDialog_3;
+ public static String FindAction_0;
+
+ static {
+ // load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, ActionMessages.class);
+ }
+
+ public static String AbstractDebugActionDelegate_0;
+
+ public static String RetargetAddMemoryBlockAction_0;
+ public static String RetargetAddMemoryBlockAction_1;
+ public static String AddMemoryRenderingActionDelegate_0;
+ public static String AddMemoryRenderingActionDelegate_1;
+ public static String AddMemoryRenderingActionDelegate_2;
+
+ public static String RulerEnableDisableBreakpointAction_0;
+ public static String RulerEnableDisableBreakpointAction_1;
+ public static String RulerEnableDisableBreakpointAction_2;
+ public static String RulerEnableDisableBreakpointAction_3;
public static String RulerEnableDisableBreakpointAction_4;
- public static String DisconnectAction_0;
- public static String DisconnectAction_3;
- public static String DropToFrameAction_0;
- public static String DropToFrameAction_3;
- public static String LaunchAction_0;
+ public static String DisconnectAction_0;
+ public static String DisconnectAction_3;
+ public static String DropToFrameAction_0;
+ public static String DropToFrameAction_3;
+ public static String LaunchAction_0;
public static String LaunchAction_1;
@@ -218,23 +218,23 @@ public class ActionMessages extends NLS {
public static String RestartCommandAction__text;
- public static String RestartCommandAction_tooltip;
-
- public static String ResumeAction_0;
- public static String ResumeAction_3;
- public static String StepIntoAction_0;
- public static String StepIntoAction_3;
- public static String StepOverAction_0;
- public static String StepOverAction_3;
- public static String StepReturnAction_2;
- public static String StepReturnAction_3;
- public static String SuspendAction_0;
- public static String SuspendAction_3;
- public static String TerminateAction_0;
- public static String TerminateAction_3;
+ public static String RestartCommandAction_tooltip;
+
+ public static String ResumeAction_0;
+ public static String ResumeAction_3;
+ public static String StepIntoAction_0;
+ public static String StepIntoAction_3;
+ public static String StepOverAction_0;
+ public static String StepOverAction_3;
+ public static String StepReturnAction_2;
+ public static String StepReturnAction_3;
+ public static String SuspendAction_0;
+ public static String SuspendAction_3;
+ public static String TerminateAction_0;
+ public static String TerminateAction_3;
public static String TerminateAndLaunchFailure;
- public static String TerminateAllAction_2;
- public static String TerminateAllAction_3;
+ public static String TerminateAllAction_2;
+ public static String TerminateAllAction_3;
public static String DeleteWorkingsetsMessageDialog_0;
public static String DeleteWorkingsetsMessageDialog_1;
@@ -245,5 +245,5 @@ public class ActionMessages extends NLS {
public static String VirtualFindAction_1;
public static String ToggleBreakpointsTargetManager_defaultToggleTarget_name;
- public static String ToggleBreakpointsTargetManager_defaultToggleTarget_description;
+ public static String ToggleBreakpointsTargetManager_defaultToggleTarget_description;
} \ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java
index 7ae847bb9..74483bf22 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java
@@ -84,7 +84,7 @@ public class AddToFavoritesAction extends SelectionListenerAction {
if (configuration != null) {
ILaunchGroup group= DebugUITools.getLaunchGroup(configuration, getMode());
if (group == null) {
- return false;
+ return false;
}
setGroup(group);
setLaunchConfiguration(configuration);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java
index a32cd70c4..7043872a7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java
@@ -44,6 +44,6 @@ public class CollapseAllAction extends Action implements IUpdate {
@Override
public void update() {
- setEnabled( fViewer.getInput() != null && fViewer.getChildCount(TreePath.EMPTY) > 0 );
+ setEnabled( fViewer.getInput() != null && fViewer.getChildCount(TreePath.EMPTY) > 0 );
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java
index 26f3a0d35..88ee2a48d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java
@@ -73,7 +73,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate,
}
protected IWorkbenchPart getActivePart() {
- return fActivePart;
+ return fActivePart;
}
@Override
@@ -141,7 +141,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate,
fTargetAdapter = getAdapter((IAdaptable) object);
}
}
- action.setEnabled(fTargetAdapter != null && isTargetEnabled());
+ action.setEnabled(fTargetAdapter != null && isTargetEnabled());
}
}
@@ -219,9 +219,9 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate,
*/
protected boolean isTargetEnabled() {
if (fTargetAdapter != null) {
- if (fActivePart != null) {
- return canPerformAction(fTargetAdapter, getTargetSelection(), fActivePart);
- }
+ if (fActivePart != null) {
+ return canPerformAction(fTargetAdapter, getTargetSelection(), fActivePart);
+ }
}
return false;
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetRunToLineAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetRunToLineAction.java
index 083b01085..478489982 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetRunToLineAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetRunToLineAction.java
@@ -45,8 +45,8 @@ public class RetargetRunToLineAction extends RetargetAction {
if (selection instanceof IStructuredSelection) {
IStructuredSelection ss = (IStructuredSelection) selection;
if (ss.size() == 1) {
- fTargetElement = (ISuspendResume)
- DebugPlugin.getAdapter(ss.getFirstElement(), ISuspendResume.class);
+ fTargetElement = (ISuspendResume)
+ DebugPlugin.getAdapter(ss.getFirstElement(), ISuspendResume.class);
}
}
IAction action = getAction();
@@ -80,8 +80,8 @@ public class RetargetRunToLineAction extends RetargetAction {
@Override
public void init(IAction action) {
- super.init(action);
- action.setActionDefinitionId("org.eclipse.debug.ui.commands.RunToLine"); //$NON-NLS-1$
+ super.init(action);
+ action.setActionDefinitionId("org.eclipse.debug.ui.commands.RunToLine"); //$NON-NLS-1$
}
@Override
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleBreakpointsTargetManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleBreakpointsTargetManager.java
index eba6a00e3..6c9509d95 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleBreakpointsTargetManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleBreakpointsTargetManager.java
@@ -77,660 +77,660 @@ import org.eclipse.ui.texteditor.SimpleMarkerAnnotation;
*/
public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetManager {
- /**
- * Toggle breakpoints target ID which refers to a target contributed
- * through the legacy adapter mechanism.
- */
- public static String DEFAULT_TOGGLE_TARGET_ID = "default"; //$NON-NLS-1$
+ /**
+ * Toggle breakpoints target ID which refers to a target contributed
+ * through the legacy adapter mechanism.
+ */
+ public static String DEFAULT_TOGGLE_TARGET_ID = "default"; //$NON-NLS-1$
private static Set<String> DEFAULT_TOGGLE_TARGET_ID_SET = new TreeSet<>();
- static {
- DEFAULT_TOGGLE_TARGET_ID_SET.add(DEFAULT_TOGGLE_TARGET_ID);
- }
-
- /**
- * Acts as a proxy between the toggle breakpoints target manager and the factories
- * contributed to the extension point. Only loads information from the plug-in XML
- * and only instantiates the specified factory if required (lazy loading).
- */
- private static class ToggleTargetFactory implements IToggleBreakpointsTargetFactory {
-
- private IConfigurationElement fConfigElement;
- private IToggleBreakpointsTargetFactory fFactory;
- private Expression fEnablementExpression;
-
- public ToggleTargetFactory(IConfigurationElement configElement){
- fConfigElement = configElement;
- }
-
- /**
- * @return Returns the instantiated factory specified by the class property.
- */
- private IToggleBreakpointsTargetFactory getFactory() {
- if (fFactory != null) {
+ static {
+ DEFAULT_TOGGLE_TARGET_ID_SET.add(DEFAULT_TOGGLE_TARGET_ID);
+ }
+
+ /**
+ * Acts as a proxy between the toggle breakpoints target manager and the factories
+ * contributed to the extension point. Only loads information from the plug-in XML
+ * and only instantiates the specified factory if required (lazy loading).
+ */
+ private static class ToggleTargetFactory implements IToggleBreakpointsTargetFactory {
+
+ private IConfigurationElement fConfigElement;
+ private IToggleBreakpointsTargetFactory fFactory;
+ private Expression fEnablementExpression;
+
+ public ToggleTargetFactory(IConfigurationElement configElement){
+ fConfigElement = configElement;
+ }
+
+ /**
+ * @return Returns the instantiated factory specified by the class property.
+ */
+ private IToggleBreakpointsTargetFactory getFactory() {
+ if (fFactory != null) {
return fFactory;
}
- try{
- Object obj = fConfigElement.createExecutableExtension(IConfigurationElementConstants.CLASS);
- if(obj instanceof IToggleBreakpointsTargetFactory) {
- fFactory = (IToggleBreakpointsTargetFactory)obj;
- } else {
- throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "org.eclipse.debug.ui.toggleBreakpointsTargetFactories extension failed to load breakpoint toggle target because the specified class does not implement org.eclipse.debug.ui.actions.IToggleBreakpointsTargetFactory. Class specified was: " + obj, null)); //$NON-NLS-1$
- }
- } catch (CoreException e){
- DebugUIPlugin.log(e.getStatus());
- fFactory = null;
- }
- return fFactory;
- }
-
- /**
- * Checks if the enablement expression for the factory evaluates to true for the
- * given part and selection.
- * @param part The active part.
- * @param selection The current selection
- * @return whether the delegated target factory is enabled for given
- * part and selection.
- */
- public boolean isEnabled(IWorkbenchPart part, ISelection selection) {
- boolean enabled = false;
- Expression expression = getEnablementExpression();
- if (expression != null) {
- enabled = evalEnablementExpression(part, selection, expression);
- } else {
- enabled = true;
- }
- return enabled;
- }
-
- /**
- * Returns the active debug context given the active part. It is used
- * in creating the evaluation context for the factories' enablement expression.
- * @param part active part
- * @return current active debug context
- */
- private IStructuredSelection getDebugContext(IWorkbenchPart part) {
- ISelection selection = DebugUITools.getDebugContextManager().
- getContextService(part.getSite().getWorkbenchWindow()).getActiveContext();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection)selection;
- }
- return StructuredSelection.EMPTY;
- }
-
- /**
- * Evaluate the given expression within the given context and return
- * the result. Returns <code>true</code> iff result is either TRUE.
- *
- * @param part the {@link IWorkbenchPart} context
- * @param selection the current selection in the part
- * @param exp the current expression
- * @return the result of evaluating the expression
- */
- private boolean evalEnablementExpression(IWorkbenchPart part, ISelection selection, Expression exp) {
- if (exp != null){
- IEvaluationContext context = DebugUIPlugin.createEvaluationContext(part);
+ try{
+ Object obj = fConfigElement.createExecutableExtension(IConfigurationElementConstants.CLASS);
+ if(obj instanceof IToggleBreakpointsTargetFactory) {
+ fFactory = (IToggleBreakpointsTargetFactory)obj;
+ } else {
+ throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "org.eclipse.debug.ui.toggleBreakpointsTargetFactories extension failed to load breakpoint toggle target because the specified class does not implement org.eclipse.debug.ui.actions.IToggleBreakpointsTargetFactory. Class specified was: " + obj, null)); //$NON-NLS-1$
+ }
+ } catch (CoreException e){
+ DebugUIPlugin.log(e.getStatus());
+ fFactory = null;
+ }
+ return fFactory;
+ }
+
+ /**
+ * Checks if the enablement expression for the factory evaluates to true for the
+ * given part and selection.
+ * @param part The active part.
+ * @param selection The current selection
+ * @return whether the delegated target factory is enabled for given
+ * part and selection.
+ */
+ public boolean isEnabled(IWorkbenchPart part, ISelection selection) {
+ boolean enabled = false;
+ Expression expression = getEnablementExpression();
+ if (expression != null) {
+ enabled = evalEnablementExpression(part, selection, expression);
+ } else {
+ enabled = true;
+ }
+ return enabled;
+ }
+
+ /**
+ * Returns the active debug context given the active part. It is used
+ * in creating the evaluation context for the factories' enablement expression.
+ * @param part active part
+ * @return current active debug context
+ */
+ private IStructuredSelection getDebugContext(IWorkbenchPart part) {
+ ISelection selection = DebugUITools.getDebugContextManager().
+ getContextService(part.getSite().getWorkbenchWindow()).getActiveContext();
+ if (selection instanceof IStructuredSelection) {
+ return (IStructuredSelection)selection;
+ }
+ return StructuredSelection.EMPTY;
+ }
+
+ /**
+ * Evaluate the given expression within the given context and return
+ * the result. Returns <code>true</code> iff result is either TRUE.
+ *
+ * @param part the {@link IWorkbenchPart} context
+ * @param selection the current selection in the part
+ * @param exp the current expression
+ * @return the result of evaluating the expression
+ */
+ private boolean evalEnablementExpression(IWorkbenchPart part, ISelection selection, Expression exp) {
+ if (exp != null){
+ IEvaluationContext context = DebugUIPlugin.createEvaluationContext(part);
List<Object> debugContextList = getDebugContext(part).toList();
- context.addVariable(IConfigurationElementConstants.DEBUG_CONTEXT, debugContextList);
+ context.addVariable(IConfigurationElementConstants.DEBUG_CONTEXT, debugContextList);
- if (selection instanceof IStructuredSelection) {
+ if (selection instanceof IStructuredSelection) {
List<Object> selectionList = ((IStructuredSelection) selection).toList();
- context.addVariable(IConfigurationElementConstants.SELECTION, selectionList);
- }
-
- if (part instanceof IEditorPart) {
- context.addVariable(IConfigurationElementConstants.EDITOR_INPUT, ((IEditorPart)part).getEditorInput());
- }
-
- try{
- EvaluationResult result = exp.evaluate(context);
- if (result == EvaluationResult.TRUE){
- return true;
- }
- } catch (CoreException e){
- // Evaluation failed
- }
- }
- return false;
- }
-
- /**
+ context.addVariable(IConfigurationElementConstants.SELECTION, selectionList);
+ }
+
+ if (part instanceof IEditorPart) {
+ context.addVariable(IConfigurationElementConstants.EDITOR_INPUT, ((IEditorPart)part).getEditorInput());
+ }
+
+ try{
+ EvaluationResult result = exp.evaluate(context);
+ if (result == EvaluationResult.TRUE){
+ return true;
+ }
+ } catch (CoreException e){
+ // Evaluation failed
+ }
+ }
+ return false;
+ }
+
+ /**
* @return Returns an expression that represents the enablement logic
* for the breakpoint toggle target.
*/
- private Expression getEnablementExpression(){
- if (fEnablementExpression == null) {
- try{
- IConfigurationElement[] elements = fConfigElement.getChildren(ExpressionTagNames.ENABLEMENT);
- IConfigurationElement enablement = elements.length > 0 ? elements[0] : null;
- if (enablement != null) {
- fEnablementExpression = ExpressionConverter.getDefault().perform(enablement);
- }
- } catch (CoreException e){
- DebugUIPlugin.log(e.getStatus());
- fEnablementExpression = null;
- }
- }
- return fEnablementExpression;
- }
-
- /**
- * Instantiates the factory and asks it to produce the IToggleBreakpointsTarget
- * for the given ID
- * @param targetID ID to create toggle target for
- * @return The created toggle target, or null.
- */
- @Override
+ private Expression getEnablementExpression(){
+ if (fEnablementExpression == null) {
+ try{
+ IConfigurationElement[] elements = fConfigElement.getChildren(ExpressionTagNames.ENABLEMENT);
+ IConfigurationElement enablement = elements.length > 0 ? elements[0] : null;
+ if (enablement != null) {
+ fEnablementExpression = ExpressionConverter.getDefault().perform(enablement);
+ }
+ } catch (CoreException e){
+ DebugUIPlugin.log(e.getStatus());
+ fEnablementExpression = null;
+ }
+ }
+ return fEnablementExpression;
+ }
+
+ /**
+ * Instantiates the factory and asks it to produce the IToggleBreakpointsTarget
+ * for the given ID
+ * @param targetID ID to create toggle target for
+ * @return The created toggle target, or null.
+ */
+ @Override
public IToggleBreakpointsTarget createToggleTarget(String targetID) {
- IToggleBreakpointsTargetFactory factory = getFactory();
- if (factory != null) {
- return factory.createToggleTarget(targetID);
- }
- return null;
- }
-
- /**
- * Instantiates the factory and asks it for the set of toggle target
- * IDs that the factory can produce for the given part and selection.
- * @param part The active part.
- * @param selection The current selection
- * @return Set of <code>String</code> IDs for possible toggle breakpoint
- * targets, possibly empty
- */
- @Override
+ IToggleBreakpointsTargetFactory factory = getFactory();
+ if (factory != null) {
+ return factory.createToggleTarget(targetID);
+ }
+ return null;
+ }
+
+ /**
+ * Instantiates the factory and asks it for the set of toggle target
+ * IDs that the factory can produce for the given part and selection.
+ * @param part The active part.
+ * @param selection The current selection
+ * @return Set of <code>String</code> IDs for possible toggle breakpoint
+ * targets, possibly empty
+ */
+ @Override
public Set<String> getToggleTargets(IWorkbenchPart part, ISelection selection) {
- IToggleBreakpointsTargetFactory factory = getFactory();
- if (factory != null) {
- return factory.getToggleTargets(part, selection);
- }
- return Collections.EMPTY_SET;
- }
-
- /**
- * Instantiates the factory and asks it to produce the name of the toggle target
- * for the given ID.
- * @param targetID toggle breakpoints target identifier
- * @return toggle target name
- */
- @Override
+ IToggleBreakpointsTargetFactory factory = getFactory();
+ if (factory != null) {
+ return factory.getToggleTargets(part, selection);
+ }
+ return Collections.EMPTY_SET;
+ }
+
+ /**
+ * Instantiates the factory and asks it to produce the name of the toggle target
+ * for the given ID.
+ * @param targetID toggle breakpoints target identifier
+ * @return toggle target name
+ */
+ @Override
public String getToggleTargetName(String targetID) {
- IToggleBreakpointsTargetFactory factory = getFactory();
- if (factory != null) {
- return factory.getToggleTargetName(targetID);
- }
- return null;
- }
-
- /**
- * Instantiates the factory and asks it to produce the description of the toggle
- * target for the given ID.
- * @param targetID toggle breakpoints target identifier
- * @return toggle target name or <code>null</code> if none
- */
- @Override
+ IToggleBreakpointsTargetFactory factory = getFactory();
+ if (factory != null) {
+ return factory.getToggleTargetName(targetID);
+ }
+ return null;
+ }
+
+ /**
+ * Instantiates the factory and asks it to produce the description of the toggle
+ * target for the given ID.
+ * @param targetID toggle breakpoints target identifier
+ * @return toggle target name or <code>null</code> if none
+ */
+ @Override
public String getToggleTargetDescription(String targetID) {
- IToggleBreakpointsTargetFactory factory = getFactory();
- if (factory != null) {
- return factory.getToggleTargetDescription(targetID);
- }
- return null;
- }
-
- /**
- * Instantiates the factory and asks it for the toggle tareget ID that
- * the factory considers the default for the given part and selection.
- * @param part The active part.
- * @param selection The current selection
- * @return a breakpoint toggle target identifier or <code>null</code>
- */
- @Override
+ IToggleBreakpointsTargetFactory factory = getFactory();
+ if (factory != null) {
+ return factory.getToggleTargetDescription(targetID);
+ }
+ return null;
+ }
+
+ /**
+ * Instantiates the factory and asks it for the toggle tareget ID that
+ * the factory considers the default for the given part and selection.
+ * @param part The active part.
+ * @param selection The current selection
+ * @return a breakpoint toggle target identifier or <code>null</code>
+ */
+ @Override
public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) {
- IToggleBreakpointsTargetFactory factory = getFactory();
- if (factory != null) {
- return factory.getDefaultToggleTarget(part, selection);
- }
- return null;
- }
- }
-
-
- /**
- * Factory for toggle breakpoints targets contributed through the
- * adapter mechanism.
- */
- private static class ToggleBreakpointsTargetAdapterFactory implements IToggleBreakpointsTargetFactory {
-
- private Object getSelectionElement(ISelection selection) {
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection ss = (IStructuredSelection)selection;
- return ss.getFirstElement();
- }
- return null;
- }
-
- /**
- * Checks whether the given element is adaptable to the toggle breakpoints target.
- * This method does not force loading of the adapter.
- * @param adaptable Element to adapt.
- * @return returns true if element can be adapted.
- */
- private boolean canGetToggleBreakpointsTarget(Object adaptable) {
- if (adaptable != null) {
- IToggleBreakpointsTarget adapter = null;
- if (adaptable instanceof IAdaptable) {
- adapter = ((IAdaptable)adaptable).getAdapter(IToggleBreakpointsTarget.class);
- }
- if (adapter == null) {
- IAdapterManager adapterManager = Platform.getAdapterManager();
- if (adapterManager.hasAdapter(adaptable, IToggleBreakpointsTarget.class.getName())) {
- return true;
- }
- } else {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Finds the toggle breakpoints target for the active part and selection.
- * It first looks for the target using the factories registered using an
- * extension point. If not found it uses the <code>IAdaptable</code>
- * mechanism.
- * @param part The workbench part in which toggle target is to be used
- * @param element The selection element to retrieve the toggle adapter from
- * @return The toggle breakpoints target, or <code>null</code> if not found.
- */
- private IToggleBreakpointsTarget getToggleBreakpointsTarget(IWorkbenchPart part, Object element) {
- IToggleBreakpointsTarget target = null;
- if (element != null) {
- target = (IToggleBreakpointsTarget) DebugPlugin.getAdapter(element, IToggleBreakpointsTarget.class);
- }
- if (target == null) {
- target = (IToggleBreakpointsTarget) DebugPlugin.getAdapter(part, IToggleBreakpointsTarget.class);
- }
- return target;
- }
-
- /**
- * Checks if there is an adaptable object for the given part and
- * selection, and if there is, it checks whether an
- * <code>IToggleBreakpointsTarget</code> can be obtained as an adapter.
- * @param part The workbench part in which toggle target is to be used
- * @param selection The active selection to use with toggle target
- * @return Whether the adapter (default) toggle target is available.
- */
- public boolean isEnabled(IWorkbenchPart part, ISelection selection) {
- return canGetToggleBreakpointsTarget(getSelectionElement(selection)) || canGetToggleBreakpointsTarget(part);
- }
-
- /**
- * Not implemented use {@link #createDefaultToggleTarget(IWorkbenchPart, ISelection)}
- * instead.
- * @param targetID not used
- * @return always returns null
- */
- @Override
+ IToggleBreakpointsTargetFactory factory = getFactory();
+ if (factory != null) {
+ return factory.getDefaultToggleTarget(part, selection);
+ }
+ return null;
+ }
+ }
+
+
+ /**
+ * Factory for toggle breakpoints targets contributed through the
+ * adapter mechanism.
+ */
+ private static class ToggleBreakpointsTargetAdapterFactory implements IToggleBreakpointsTargetFactory {
+
+ private Object getSelectionElement(ISelection selection) {
+ if (selection instanceof IStructuredSelection) {
+ IStructuredSelection ss = (IStructuredSelection)selection;
+ return ss.getFirstElement();
+ }
+ return null;
+ }
+
+ /**
+ * Checks whether the given element is adaptable to the toggle breakpoints target.
+ * This method does not force loading of the adapter.
+ * @param adaptable Element to adapt.
+ * @return returns true if element can be adapted.
+ */
+ private boolean canGetToggleBreakpointsTarget(Object adaptable) {
+ if (adaptable != null) {
+ IToggleBreakpointsTarget adapter = null;
+ if (adaptable instanceof IAdaptable) {
+ adapter = ((IAdaptable)adaptable).getAdapter(IToggleBreakpointsTarget.class);
+ }
+ if (adapter == null) {
+ IAdapterManager adapterManager = Platform.getAdapterManager();
+ if (adapterManager.hasAdapter(adaptable, IToggleBreakpointsTarget.class.getName())) {
+ return true;
+ }
+ } else {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Finds the toggle breakpoints target for the active part and selection.
+ * It first looks for the target using the factories registered using an
+ * extension point. If not found it uses the <code>IAdaptable</code>
+ * mechanism.
+ * @param part The workbench part in which toggle target is to be used
+ * @param element The selection element to retrieve the toggle adapter from
+ * @return The toggle breakpoints target, or <code>null</code> if not found.
+ */
+ private IToggleBreakpointsTarget getToggleBreakpointsTarget(IWorkbenchPart part, Object element) {
+ IToggleBreakpointsTarget target = null;
+ if (element != null) {
+ target = (IToggleBreakpointsTarget) DebugPlugin.getAdapter(element, IToggleBreakpointsTarget.class);
+ }
+ if (target == null) {
+ target = (IToggleBreakpointsTarget) DebugPlugin.getAdapter(part, IToggleBreakpointsTarget.class);
+ }
+ return target;
+ }
+
+ /**
+ * Checks if there is an adaptable object for the given part and
+ * selection, and if there is, it checks whether an
+ * <code>IToggleBreakpointsTarget</code> can be obtained as an adapter.
+ * @param part The workbench part in which toggle target is to be used
+ * @param selection The active selection to use with toggle target
+ * @return Whether the adapter (default) toggle target is available.
+ */
+ public boolean isEnabled(IWorkbenchPart part, ISelection selection) {
+ return canGetToggleBreakpointsTarget(getSelectionElement(selection)) || canGetToggleBreakpointsTarget(part);
+ }
+
+ /**
+ * Not implemented use {@link #createDefaultToggleTarget(IWorkbenchPart, ISelection)}
+ * instead.
+ * @param targetID not used
+ * @return always returns null
+ */
+ @Override
public IToggleBreakpointsTarget createToggleTarget(String targetID) {
- return null;
- }
-
- /**
- * @param part The workbench part in which toggle target is to be used
- * @param selection The active selection to use with toggle target
- * @return Returns a toggle target for the given part and selection, obtained
- * through the adapter mechanism.
- */
- public IToggleBreakpointsTarget createDefaultToggleTarget(IWorkbenchPart part, ISelection selection) {
- return getToggleBreakpointsTarget(part, getSelectionElement(selection));
- }
-
- @Override
+ return null;
+ }
+
+ /**
+ * @param part The workbench part in which toggle target is to be used
+ * @param selection The active selection to use with toggle target
+ * @return Returns a toggle target for the given part and selection, obtained
+ * through the adapter mechanism.
+ */
+ public IToggleBreakpointsTarget createDefaultToggleTarget(IWorkbenchPart part, ISelection selection) {
+ return getToggleBreakpointsTarget(part, getSelectionElement(selection));
+ }
+
+ @Override
public Set<String> getToggleTargets(IWorkbenchPart part, ISelection selection) {
- if (isEnabled(part, selection)) {
- return DEFAULT_TOGGLE_TARGET_ID_SET;
- }
- return Collections.EMPTY_SET;
- }
+ if (isEnabled(part, selection)) {
+ return DEFAULT_TOGGLE_TARGET_ID_SET;
+ }
+ return Collections.EMPTY_SET;
+ }
- @Override
+ @Override
public String getToggleTargetName(String targetID) {
- return ActionMessages.ToggleBreakpointsTargetManager_defaultToggleTarget_name;
- }
+ return ActionMessages.ToggleBreakpointsTargetManager_defaultToggleTarget_name;
+ }
- @Override
+ @Override
public String getToggleTargetDescription(String targetID) {
- return ActionMessages.ToggleBreakpointsTargetManager_defaultToggleTarget_description;
- }
+ return ActionMessages.ToggleBreakpointsTargetManager_defaultToggleTarget_description;
+ }
- @Override
+ @Override
public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) {
- return DEFAULT_TOGGLE_TARGET_ID;
- }
- }
+ return DEFAULT_TOGGLE_TARGET_ID;
+ }
+ }
- /**
- * Preference key for storing the preferred targets map.
- * @see #storePreferredTargets()
- * @see #loadPreferredTargets()
- */
- public static final String PREF_TARGETS = "preferredTargets"; //$NON-NLS-1$
+ /**
+ * Preference key for storing the preferred targets map.
+ * @see #storePreferredTargets()
+ * @see #loadPreferredTargets()
+ */
+ public static final String PREF_TARGETS = "preferredTargets"; //$NON-NLS-1$
- /**
- * There should only ever be once instance of this manager for the workbench.
- */
- private static ToggleBreakpointsTargetManager fgSingleton;
+ /**
+ * There should only ever be once instance of this manager for the workbench.
+ */
+ private static ToggleBreakpointsTargetManager fgSingleton;
- public static ToggleBreakpointsTargetManager getDefault(){
- if (fgSingleton == null) {
+ public static ToggleBreakpointsTargetManager getDefault(){
+ if (fgSingleton == null) {
fgSingleton = new ToggleBreakpointsTargetManager();
}
- return fgSingleton;
- }
+ return fgSingleton;
+ }
- /**
- * Maps the IDs of toggle breakpoint targets to their instances. The target
- * IDs must be unique.
- */
+ /**
+ * Maps the IDs of toggle breakpoint targets to their instances. The target
+ * IDs must be unique.
+ */
private Map<String, IToggleBreakpointsTargetFactory> fKnownFactories;
- /**
- * Maps a Set of target id's to the one target id that is preferred.
- */
+ /**
+ * Maps a Set of target id's to the one target id that is preferred.
+ */
private Map<Set<String>, String> fPreferredTargets;
- /**
- * Maps the IDs of toggle targets to the factory that can create them.
- * There can currently only be one factory for a given toggle target.
- */
+ /**
+ * Maps the IDs of toggle targets to the factory that can create them.
+ * There can currently only be one factory for a given toggle target.
+ */
private Map<String, IToggleBreakpointsTargetFactory> fFactoriesByTargetID = new HashMap<>();
- /**
- * List of listeners to changes in the preferred toggle targets list.
- */
+ /**
+ * List of listeners to changes in the preferred toggle targets list.
+ */
private ListenerList<IToggleBreakpointsTargetManagerListener> fChangedListners = new ListenerList<>();
- /**
- * Initializes the collection of known factories from extension point contributions.
- */
- private void initializeFactories() {
+ /**
+ * Initializes the collection of known factories from extension point contributions.
+ */
+ private void initializeFactories() {
fKnownFactories = new LinkedHashMap<>();
- fKnownFactories.put(DEFAULT_TOGGLE_TARGET_ID, new ToggleBreakpointsTargetAdapterFactory());
- IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_TOGGLE_BREAKPOINTS_TARGET_FACTORIES);
- IConfigurationElement[] elements = ep.getConfigurationElements();
- for (int i= 0; i < elements.length; i++) {
- String id = elements[i].getAttribute(IConfigurationElementConstants.ID);
- if (id != null && id.length() != 0) {
- if (fKnownFactories.containsKey(id)) {
- DebugUIPlugin.log(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "org.eclipse.debug.ui.toggleBreakpointsTargetFactory extension failed to load breakpoint toggle target because the specified id is already registered. Specified ID is: " + id, null)); //$NON-NLS-1$
- } else {
- fKnownFactories.put(id, new ToggleTargetFactory(elements[i]));
- }
- } else {
- DebugUIPlugin.log(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "org.eclipse.debug.ui.toggleBreakpointsTargetFactory extension failed to load breakpoint toggle target because the specified id is empty.", null)); //$NON-NLS-1$
- }
- }
-
- // If there are any factories contributed through the extension point,
- // set a system property for use in enabling actions.
- System.setProperty(IDebugUIConstants.SYS_PROP_BREAKPOINT_TOGGLE_FACTORIES_USED,
- fKnownFactories.size() > 1 ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Returns the set of IToggleBreakpointsTargetFactory objects (they will be
- * ToggleTargetFactory) that were contributed to the extension point and
- * are enabled for the given part and selection (enabled if the factory
- * does not have an enablement expression or if the enablement expression
- * evaluates to true).
- *
- * @param part active part
- * @param selection active selection in part
- * @return The factories enabled for the part and selection or an empty
- * collection.
- */
+ fKnownFactories.put(DEFAULT_TOGGLE_TARGET_ID, new ToggleBreakpointsTargetAdapterFactory());
+ IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_TOGGLE_BREAKPOINTS_TARGET_FACTORIES);
+ IConfigurationElement[] elements = ep.getConfigurationElements();
+ for (int i= 0; i < elements.length; i++) {
+ String id = elements[i].getAttribute(IConfigurationElementConstants.ID);
+ if (id != null && id.length() != 0) {
+ if (fKnownFactories.containsKey(id)) {
+ DebugUIPlugin.log(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "org.eclipse.debug.ui.toggleBreakpointsTargetFactory extension failed to load breakpoint toggle target because the specified id is already registered. Specified ID is: " + id, null)); //$NON-NLS-1$
+ } else {
+ fKnownFactories.put(id, new ToggleTargetFactory(elements[i]));
+ }
+ } else {
+ DebugUIPlugin.log(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, "org.eclipse.debug.ui.toggleBreakpointsTargetFactory extension failed to load breakpoint toggle target because the specified id is empty.", null)); //$NON-NLS-1$
+ }
+ }
+
+ // If there are any factories contributed through the extension point,
+ // set a system property for use in enabling actions.
+ System.setProperty(IDebugUIConstants.SYS_PROP_BREAKPOINT_TOGGLE_FACTORIES_USED,
+ fKnownFactories.size() > 1 ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * Returns the set of IToggleBreakpointsTargetFactory objects (they will be
+ * ToggleTargetFactory) that were contributed to the extension point and
+ * are enabled for the given part and selection (enabled if the factory
+ * does not have an enablement expression or if the enablement expression
+ * evaluates to true).
+ *
+ * @param part active part
+ * @param selection active selection in part
+ * @return The factories enabled for the part and selection or an empty
+ * collection.
+ */
private Set<IToggleBreakpointsTargetFactory> getEnabledFactories(IWorkbenchPart part, ISelection selection) {
- if (fKnownFactories == null) {
+ if (fKnownFactories == null) {
initializeFactories();
}
Set<IToggleBreakpointsTargetFactory> set = new HashSet<>();
for (Entry<String, IToggleBreakpointsTargetFactory> entry : fKnownFactories.entrySet()) {
IToggleBreakpointsTargetFactory factory = entry.getValue();
- if (factory instanceof ToggleTargetFactory &&
- ((ToggleTargetFactory)factory).isEnabled(part, selection)) {
- set.add(factory);
- } else if (factory instanceof ToggleBreakpointsTargetAdapterFactory &&
- ((ToggleBreakpointsTargetAdapterFactory)factory).isEnabled(part, selection)) {
- set.add(factory);
- }
- }
- return set;
- }
-
- /**
- * Produces the set of IDs for all possible toggle targets that can be used for
- * the given part and selection.
- *
- * @param factoriesToQuery The collection of factories to check
- * @param part active part
- * @param selection active selection in part
- * @return Set of toggle target IDs or an empty set
- */
+ if (factory instanceof ToggleTargetFactory &&
+ ((ToggleTargetFactory)factory).isEnabled(part, selection)) {
+ set.add(factory);
+ } else if (factory instanceof ToggleBreakpointsTargetAdapterFactory &&
+ ((ToggleBreakpointsTargetAdapterFactory)factory).isEnabled(part, selection)) {
+ set.add(factory);
+ }
+ }
+ return set;
+ }
+
+ /**
+ * Produces the set of IDs for all possible toggle targets that can be used for
+ * the given part and selection.
+ *
+ * @param factoriesToQuery The collection of factories to check
+ * @param part active part
+ * @param selection active selection in part
+ * @return Set of toggle target IDs or an empty set
+ */
private Set<String> getEnabledTargetIDs(Set<IToggleBreakpointsTargetFactory> factoriesToQuery, IWorkbenchPart part, ISelection selection) {
Set<String> idsForSelection = new TreeSet<>();
for (IToggleBreakpointsTargetFactory factory : factoriesToQuery) {
for(String targetID : factory.getToggleTargets(part, selection)) {
- fFactoriesByTargetID.put(targetID, factory);
- idsForSelection.add(targetID);
- }
- }
- return idsForSelection;
- }
-
- @Override
+ fFactoriesByTargetID.put(targetID, factory);
+ idsForSelection.add(targetID);
+ }
+ }
+ return idsForSelection;
+ }
+
+ @Override
public Set<String> getEnabledToggleBreakpointsTargetIDs(IWorkbenchPart part, ISelection selection) {
- return getEnabledTargetIDs(getEnabledFactories(part, selection), part, selection);
- }
+ return getEnabledTargetIDs(getEnabledFactories(part, selection), part, selection);
+ }
- @Override
+ @Override
public String getPreferredToggleBreakpointsTargetID(IWorkbenchPart part, ISelection selection) {
Set<IToggleBreakpointsTargetFactory> factories = getEnabledFactories(part, selection);
Set<String> possibleIDs = getEnabledTargetIDs(factories, part, selection);
- return chooseToggleTargetIDInSet(possibleIDs, part, selection);
- }
+ return chooseToggleTargetIDInSet(possibleIDs, part, selection);
+ }
- @Override
+ @Override
public IToggleBreakpointsTarget getToggleBreakpointsTarget(IWorkbenchPart part, ISelection selection) {
- String id = getPreferredToggleBreakpointsTargetID(part, selection);
- IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(id);
- if (factory != null) {
- if (DEFAULT_TOGGLE_TARGET_ID.equals(id)) {
- return ((ToggleBreakpointsTargetAdapterFactory)factory).createDefaultToggleTarget(part, selection);
- } else {
- return factory.createToggleTarget(id);
- }
- }
- return null;
- }
-
- @Override
+ String id = getPreferredToggleBreakpointsTargetID(part, selection);
+ IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(id);
+ if (factory != null) {
+ if (DEFAULT_TOGGLE_TARGET_ID.equals(id)) {
+ return ((ToggleBreakpointsTargetAdapterFactory)factory).createDefaultToggleTarget(part, selection);
+ } else {
+ return factory.createToggleTarget(id);
+ }
+ }
+ return null;
+ }
+
+ @Override
public String getToggleBreakpointsTargetName(String id) {
- IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(id);
- if (factory != null) {
- return factory.getToggleTargetName(id);
- }
- return null;
- }
-
- @Override
+ IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(id);
+ if (factory != null) {
+ return factory.getToggleTargetName(id);
+ }
+ return null;
+ }
+
+ @Override
public String getToggleBreakpointsTargetDescription(String id) {
- IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(id);
- if (factory != null) {
- return factory.getToggleTargetDescription(id);
- }
- return null;
- }
-
- @Override
+ IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(id);
+ if (factory != null) {
+ return factory.getToggleTargetDescription(id);
+ }
+ return null;
+ }
+
+ @Override
public void addChangedListener(IToggleBreakpointsTargetManagerListener listener) {
- fChangedListners.add(listener);
- }
+ fChangedListners.add(listener);
+ }
- @Override
+ @Override
public void removeChangedListener(IToggleBreakpointsTargetManagerListener listener) {
- fChangedListners.remove(listener);
- }
-
- /**
- * Stores the map of preferred target IDs to the preference store in the format:
- *
- * Key1A,Key1B:Value1|Key2A,Key2B,Key2C:Value2|
- *
- * Where the sub keys (Key1A, Key1B, etc.) are the elements of the set used at the
- * key in the mapping and the values are the associated String value in the mapping.
- */
- private void storePreferredTargets() {
- StringBuilder buffer= new StringBuilder();
+ fChangedListners.remove(listener);
+ }
+
+ /**
+ * Stores the map of preferred target IDs to the preference store in the format:
+ *
+ * Key1A,Key1B:Value1|Key2A,Key2B,Key2C:Value2|
+ *
+ * Where the sub keys (Key1A, Key1B, etc.) are the elements of the set used at the
+ * key in the mapping and the values are the associated String value in the mapping.
+ */
+ private void storePreferredTargets() {
+ StringBuilder buffer= new StringBuilder();
for (Entry<Set<String>, String> entry : fPreferredTargets.entrySet()) {
for (String currentID : entry.getKey()) {
- buffer.append(currentID);
- buffer.append(',');
- }
- buffer.deleteCharAt(buffer.length()-1);
- buffer.append(':');
- buffer.append(entry.getValue());
- buffer.append('|');
- }
- IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier());
- if(prefs != null) {
- prefs.put(PREF_TARGETS, buffer.toString());
- }
- }
-
- /**
- * Loads the map of preferred target IDs from the preference store.
- *
- * @see #storePreferredTargets()
- */
- private void loadPreferredTargets() {
+ buffer.append(currentID);
+ buffer.append(',');
+ }
+ buffer.deleteCharAt(buffer.length()-1);
+ buffer.append(':');
+ buffer.append(entry.getValue());
+ buffer.append('|');
+ }
+ IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier());
+ if(prefs != null) {
+ prefs.put(PREF_TARGETS, buffer.toString());
+ }
+ }
+
+ /**
+ * Loads the map of preferred target IDs from the preference store.
+ *
+ * @see #storePreferredTargets()
+ */
+ private void loadPreferredTargets() {
fPreferredTargets = new HashMap<>();
- String preferenceValue = Platform.getPreferencesService().getString(
- DebugUIPlugin.getUniqueIdentifier(),
- PREF_TARGETS,
- null,
- null);
- if(preferenceValue == null) {
- return;
- }
- StringTokenizer entryTokenizer = new StringTokenizer(preferenceValue,"|"); //$NON-NLS-1$
- while (entryTokenizer.hasMoreTokens()){
- String token = entryTokenizer.nextToken();
- int valueStart = token.indexOf(':');
- StringTokenizer keyTokenizer = new StringTokenizer(token.substring(0,valueStart),","); //$NON-NLS-1$
+ String preferenceValue = Platform.getPreferencesService().getString(
+ DebugUIPlugin.getUniqueIdentifier(),
+ PREF_TARGETS,
+ null,
+ null);
+ if(preferenceValue == null) {
+ return;
+ }
+ StringTokenizer entryTokenizer = new StringTokenizer(preferenceValue,"|"); //$NON-NLS-1$
+ while (entryTokenizer.hasMoreTokens()){
+ String token = entryTokenizer.nextToken();
+ int valueStart = token.indexOf(':');
+ StringTokenizer keyTokenizer = new StringTokenizer(token.substring(0,valueStart),","); //$NON-NLS-1$
Set<String> keys = new TreeSet<>();
- while (keyTokenizer.hasMoreTokens()){
- keys.add(keyTokenizer.nextToken());
- }
- fPreferredTargets.put(keys, token.substring(valueStart+1));
- }
- }
-
- /**
- * Adds or updates the mapping to set which target ID is preferred for a certain
- * set of possible IDs.
- *
- * @param possibleIDs The set of possible IDs
- * @param preferredID The preferred ID in the set.
- */
+ while (keyTokenizer.hasMoreTokens()){
+ keys.add(keyTokenizer.nextToken());
+ }
+ fPreferredTargets.put(keys, token.substring(valueStart+1));
+ }
+ }
+
+ /**
+ * Adds or updates the mapping to set which target ID is preferred for a certain
+ * set of possible IDs.
+ *
+ * @param possibleIDs The set of possible IDs
+ * @param preferredID The preferred ID in the set.
+ */
public void setPreferredTarget(Set<String> possibleIDs, String preferredID) {
- if (possibleIDs == null) {
+ if (possibleIDs == null) {
return;
}
- if (fKnownFactories == null) {
+ if (fKnownFactories == null) {
initializeFactories();
}
- if (fPreferredTargets == null){
- loadPreferredTargets();
- }
- String currentKey = fPreferredTargets.get(possibleIDs);
- if (currentKey == null || !currentKey.equals(preferredID)){
- fPreferredTargets.put(possibleIDs, preferredID);
- storePreferredTargets();
- firePreferredTargetsChanged();
- }
- }
-
- /**
- * Returns the preferred toggle target ID from the given set if the mapping has been set.
- *
- * @param possibleTargetIDs The set of possible toggle target IDs
- * @return The preferred ID or null
- */
+ if (fPreferredTargets == null){
+ loadPreferredTargets();
+ }
+ String currentKey = fPreferredTargets.get(possibleIDs);
+ if (currentKey == null || !currentKey.equals(preferredID)){
+ fPreferredTargets.put(possibleIDs, preferredID);
+ storePreferredTargets();
+ firePreferredTargetsChanged();
+ }
+ }
+
+ /**
+ * Returns the preferred toggle target ID from the given set if the mapping has been set.
+ *
+ * @param possibleTargetIDs The set of possible toggle target IDs
+ * @return The preferred ID or null
+ */
private String getUserPreferredTarget(Set<String> possibleTargetIDs) {
- if (fPreferredTargets == null){
- loadPreferredTargets();
- }
- return fPreferredTargets.get(possibleTargetIDs);
- }
-
- /**
- * Given a set of possible toggle target IDs, this method will determine which target is
- * preferred and should be used to toggle breakpoints. This method chooses a toggle target
- * by storing previous choices and can be set using a context menu.
- *
- * @param possibleTargetIDs The set of possible toggle target IDs
- * @param part The workbench part in which toggle target is to be used
- * @param selection The active selection to use with toggle target
- * @return The preferred toggle target ID or null
- */
+ if (fPreferredTargets == null){
+ loadPreferredTargets();
+ }
+ return fPreferredTargets.get(possibleTargetIDs);
+ }
+
+ /**
+ * Given a set of possible toggle target IDs, this method will determine which target is
+ * preferred and should be used to toggle breakpoints. This method chooses a toggle target
+ * by storing previous choices and can be set using a context menu.
+ *
+ * @param possibleTargetIDs The set of possible toggle target IDs
+ * @param part The workbench part in which toggle target is to be used
+ * @param selection The active selection to use with toggle target
+ * @return The preferred toggle target ID or null
+ */
private String chooseToggleTargetIDInSet(Set<String> possibleTargetIDs, IWorkbenchPart part, ISelection selection) {
- if (possibleTargetIDs == null || possibleTargetIDs.isEmpty()){
- return null;
- }
+ if (possibleTargetIDs == null || possibleTargetIDs.isEmpty()){
+ return null;
+ }
- String preferredID = getUserPreferredTarget(possibleTargetIDs);
+ String preferredID = getUserPreferredTarget(possibleTargetIDs);
- if (preferredID == null){
- // If there is no preferred pane already set, check the factories to see there is a default target
+ if (preferredID == null){
+ // If there is no preferred pane already set, check the factories to see there is a default target
Iterator<String> possibleIDsIterator = possibleTargetIDs.iterator();
- while (preferredID == null && possibleIDsIterator.hasNext()) {
- IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(possibleIDsIterator.next());
- if (factory != null) {
- preferredID = factory.getDefaultToggleTarget(part, selection);
- }
- }
- // If the factories don't have a default, just pick the first one.
- // Also make sure that the default is among the available toggle target
- // IDs (bug 352502).
- if (preferredID == null || !possibleTargetIDs.contains(preferredID)) {
- preferredID= possibleTargetIDs.iterator().next();
- }
- setPreferredTarget(possibleTargetIDs, preferredID);
- }
-
- return preferredID;
- }
-
- /**
- * Notifies the change listeners that the preferred targets changed.
- */
- private void firePreferredTargetsChanged() {
+ while (preferredID == null && possibleIDsIterator.hasNext()) {
+ IToggleBreakpointsTargetFactory factory = fFactoriesByTargetID.get(possibleIDsIterator.next());
+ if (factory != null) {
+ preferredID = factory.getDefaultToggleTarget(part, selection);
+ }
+ }
+ // If the factories don't have a default, just pick the first one.
+ // Also make sure that the default is among the available toggle target
+ // IDs (bug 352502).
+ if (preferredID == null || !possibleTargetIDs.contains(preferredID)) {
+ preferredID= possibleTargetIDs.iterator().next();
+ }
+ setPreferredTarget(possibleTargetIDs, preferredID);
+ }
+
+ return preferredID;
+ }
+
+ /**
+ * Notifies the change listeners that the preferred targets changed.
+ */
+ private void firePreferredTargetsChanged() {
for (IToggleBreakpointsTargetManagerListener iToggleBreakpointsTargetManagerListener : fChangedListners) {
iToggleBreakpointsTargetManagerListener.preferredTargetsChanged();
- }
- }
-
- public IBreakpoint getBeakpointFromEditor(ITextEditor editor, IVerticalRulerInfo info) {
- IDocumentProvider provider = editor.getDocumentProvider();
- if(provider == null) {
- return null;
- }
- IEditorInput input = editor.getEditorInput();
- IAnnotationModel annotationModel = provider.getAnnotationModel(input);
+ }
+ }
+
+ public IBreakpoint getBeakpointFromEditor(ITextEditor editor, IVerticalRulerInfo info) {
+ IDocumentProvider provider = editor.getDocumentProvider();
+ if(provider == null) {
+ return null;
+ }
+ IEditorInput input = editor.getEditorInput();
+ IAnnotationModel annotationModel = provider.getAnnotationModel(input);
if (annotationModel != null) {
IDocument document = provider.getDocument(input);
Iterator<Annotation> iterator = annotationModel.getAnnotationIterator();
@@ -756,6 +756,6 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM
}
}
}
- return null;
- }
+ return null;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AbstractBreakpointsViewAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AbstractBreakpointsViewAction.java
index 08c3118ba..8ae8e52b1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AbstractBreakpointsViewAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AbstractBreakpointsViewAction.java
@@ -26,30 +26,30 @@ import org.eclipse.ui.IViewPart;
*/
public abstract class AbstractBreakpointsViewAction implements IViewActionDelegate, IActionDelegate2 {
- /**
- * The breakpoints view that this action has been contributed to.
- */
- protected BreakpointsView fView;
+ /**
+ * The breakpoints view that this action has been contributed to.
+ */
+ protected BreakpointsView fView;
- @Override
+ @Override
public void init(IViewPart view) {
- fView= (BreakpointsView) view;
- }
+ fView= (BreakpointsView) view;
+ }
@Override
public void selectionChanged(IAction action, ISelection selection) {
}
- @Override
+ @Override
public void dispose() {
- }
+ }
- @Override
+ @Override
public void init(IAction action) {
- }
+ }
- @Override
+ @Override
public void runWithEvent(IAction action, Event event) {
- run(action);
- }
+ run(action);
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java
index 7c2924527..0266e600c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java
@@ -29,18 +29,18 @@ public class AdvancedGroupBreakpointsByAction extends Action {
private BreakpointsView fView;
public AdvancedGroupBreakpointsByAction(BreakpointsView view) {
- super(IInternalDebugCoreConstants.EMPTY_STRING, IAction.AS_RADIO_BUTTON);
+ super(IInternalDebugCoreConstants.EMPTY_STRING, IAction.AS_RADIO_BUTTON);
fView= view;
}
@Override
public void run() {
- if (isChecked()) {
- GroupBreakpointsByDialog dialog = new GroupBreakpointsByDialog(fView);
- if (dialog.open() == Window.OK) {
- fView.setBreakpointOrganizers(dialog.getOrganizers());
- }
- }
+ if (isChecked()) {
+ GroupBreakpointsByDialog dialog = new GroupBreakpointsByDialog(fView);
+ if (dialog.open() == Window.OK) {
+ fView.setBreakpointOrganizers(dialog.getOrganizers());
+ }
+ }
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointSelectionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointSelectionAction.java
index eac4412df..2c6cdf1e6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointSelectionAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointSelectionAction.java
@@ -21,26 +21,26 @@ import org.eclipse.ui.actions.SelectionListenerAction;
*/
public abstract class BreakpointSelectionAction extends SelectionListenerAction {
- private BreakpointsView fView;
+ private BreakpointsView fView;
- /**
- * Constructs an action for the breakpoints view.
- *
- * @param text action name
- * @param view breakpoints view
- */
- public BreakpointSelectionAction(String text, BreakpointsView view) {
- super(text);
- fView = view;
- }
+ /**
+ * Constructs an action for the breakpoints view.
+ *
+ * @param text action name
+ * @param view breakpoints view
+ */
+ public BreakpointSelectionAction(String text, BreakpointsView view) {
+ super(text);
+ fView = view;
+ }
- /**
- * Returns the breakpoints view.
- *
- * @return breakpoints view
- */
- protected BreakpointsView getBreakpointsView() {
- return fView;
- }
+ /**
+ * Returns the breakpoints view.
+ *
+ * @return breakpoints view
+ */
+ protected BreakpointsView getBreakpointsView() {
+ return fView;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointWorkingSetAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointWorkingSetAction.java
index 4ae178eac..57233bed6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointWorkingSetAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/BreakpointWorkingSetAction.java
@@ -26,37 +26,37 @@ import org.eclipse.ui.IViewPart;
*/
public abstract class BreakpointWorkingSetAction extends AbstractBreakpointsViewAction implements IPropertyChangeListener {
- protected IAction fAction;
+ protected IAction fAction;
- @Override
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
- update();
- }
+ update();
+ }
- @Override
+ @Override
public void init(IViewPart view) {
- super.init(view);
- DebugUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);
- }
+ super.init(view);
+ DebugUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);
+ }
- @Override
+ @Override
public void dispose() {
- DebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);
- super.dispose();
- }
- @Override
+ DebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);
+ super.dispose();
+ }
+ @Override
public void init(IAction action) {
- fAction = action;
- super.init(action);
- update();
- }
+ fAction = action;
+ super.init(action);
+ update();
+ }
- @Override
+ @Override
public void propertyChange(PropertyChangeEvent event) {
- if (event.getProperty().equals(IInternalDebugUIConstants.MEMENTO_BREAKPOINT_WORKING_SET_NAME)) {
- update();
- }
+ if (event.getProperty().equals(IInternalDebugUIConstants.MEMENTO_BREAKPOINT_WORKING_SET_NAME)) {
+ update();
+ }
- }
- protected abstract void update();
+ }
+ protected abstract void update();
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ClearDefaultBreakpointGroupAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ClearDefaultBreakpointGroupAction.java
index d78ae062a..8bce2c6bc 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ClearDefaultBreakpointGroupAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ClearDefaultBreakpointGroupAction.java
@@ -21,13 +21,13 @@ import org.eclipse.jface.action.IAction;
*/
public class ClearDefaultBreakpointGroupAction extends BreakpointWorkingSetAction {
- @Override
+ @Override
public void run(IAction action) {
- BreakpointSetOrganizer.setDefaultWorkingSet(null);
- }
+ BreakpointSetOrganizer.setDefaultWorkingSet(null);
+ }
- @Override
+ @Override
protected void update() {
- fAction.setEnabled(BreakpointSetOrganizer.getDefaultWorkingSet() != null);
- }
+ fAction.setEnabled(BreakpointSetOrganizer.getDefaultWorkingSet() != null);
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsActionDelegate.java
index 02a8f1ca4..53a3c1863 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsActionDelegate.java
@@ -48,14 +48,14 @@ public class CopyBreakpointsActionDelegate extends VirtualCopyToClipboardActionD
fStamp = System.currentTimeMillis();
LocalSelectionTransfer.getTransfer().setSelectionSetTime(fStamp);
IAction pasteAction = ((AbstractDebugView)getView()).getAction(IDebugView.PASTE_ACTION);
- // update the enablement of the paste action
- // workaround since the clipboard does not suppot callbacks
- if (pasteAction instanceof PasteBreakpointsAction) {
- PasteBreakpointsAction pba = (PasteBreakpointsAction) pasteAction;
- if (pba.getStructuredSelection() != null) {
- pba.selectionChanged(pba.getStructuredSelection());
- }
- }
+ // update the enablement of the paste action
+ // workaround since the clipboard does not suppot callbacks
+ if (pasteAction instanceof PasteBreakpointsAction) {
+ PasteBreakpointsAction pba = (PasteBreakpointsAction) pasteAction;
+ if (pba.getStructuredSelection() != null) {
+ pba.selectionChanged(pba.getStructuredSelection());
+ }
+ }
}
@Override
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/EditBreakpointGroupAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/EditBreakpointGroupAction.java
index 4dd706d75..f85c6bd47 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/EditBreakpointGroupAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/EditBreakpointGroupAction.java
@@ -38,9 +38,9 @@ public class EditBreakpointGroupAction extends AbstractBreakpointsViewAction {
@Override
public void run(IAction action) {
- IWorkingSetEditWizard editWizard = PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetEditWizard(fSet);
- WizardDialog dialog = new WizardDialog(DebugUIPlugin.getShell(), editWizard);
- dialog.open();
+ IWorkingSetEditWizard editWizard = PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetEditWizard(fSet);
+ WizardDialog dialog = new WizardDialog(DebugUIPlugin.getShell(), editWizard);
+ dialog.open();
}
@Override
@@ -49,17 +49,17 @@ public class EditBreakpointGroupAction extends AbstractBreakpointsViewAction {
if (sel instanceof IStructuredSelection) {
IStructuredSelection selection= (IStructuredSelection) sel;
- if (selection.size() == 1) {
- Object element = selection.getFirstElement();
+ if (selection.size() == 1) {
+ Object element = selection.getFirstElement();
if (element instanceof IBreakpointContainer) {
- IBreakpointContainer container = (IBreakpointContainer)element;
- IAdaptable category = container.getCategory();
- if (category instanceof WorkingSetCategory) {
- IWorkingSet set = ((WorkingSetCategory)category).getWorkingSet();
- action.setEnabled(true);
- fSet = set;
- return;
- }
+ IBreakpointContainer container = (IBreakpointContainer)element;
+ IAdaptable category = container.getCategory();
+ if (category instanceof WorkingSetCategory) {
+ IWorkingSet set = ((WorkingSetCategory)category).getWorkingSet();
+ action.setEnabled(true);
+ fSet = set;
+ return;
+ }
}
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java
index 4ddc632a2..365efdeb9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java
@@ -26,39 +26,39 @@ import org.eclipse.jface.action.IAction;
*/
public class GroupBreakpointsAction extends Action {
- private IBreakpointOrganizer fOrganzier;
- private BreakpointsView fView;
+ private IBreakpointOrganizer fOrganzier;
+ private BreakpointsView fView;
- /**
- * Creates a new action which will group breakpoints in the given
- * breakpoint view using the given breakpoint container factory
- * @param factory the factory that will be applied to the given view
- * when this action is run
- * @param view the breakpoints view
- */
- public GroupBreakpointsAction(IBreakpointOrganizer organizer, BreakpointsView view) {
- super(IInternalDebugCoreConstants.EMPTY_STRING, IAction.AS_RADIO_BUTTON);
- fOrganzier= organizer;
- fView= view;
- }
+ /**
+ * Creates a new action which will group breakpoints in the given
+ * breakpoint view using the given breakpoint container factory
+ * @param factory the factory that will be applied to the given view
+ * when this action is run
+ * @param view the breakpoints view
+ */
+ public GroupBreakpointsAction(IBreakpointOrganizer organizer, BreakpointsView view) {
+ super(IInternalDebugCoreConstants.EMPTY_STRING, IAction.AS_RADIO_BUTTON);
+ fOrganzier= organizer;
+ fView= view;
+ }
- @Override
+ @Override
public void run() {
- if (isChecked()) {
- if (fOrganzier == null) {
- fView.setBreakpointOrganizers(null);
- } else {
- fView.setBreakpointOrganizers(new IBreakpointOrganizer[]{fOrganzier});
- }
- }
- }
+ if (isChecked()) {
+ if (fOrganzier == null) {
+ fView.setBreakpointOrganizers(null);
+ } else {
+ fView.setBreakpointOrganizers(new IBreakpointOrganizer[]{fOrganzier});
+ }
+ }
+ }
- /**
- * Returns this action's organizer.
- *
- * @return breakpoint organizer
- */
- public IBreakpointOrganizer getOrganizer() {
- return fOrganzier;
- }
+ /**
+ * Returns this action's organizer.
+ *
+ * @return breakpoint organizer
+ */
+ public IBreakpointOrganizer getOrganizer() {
+ return fOrganzier;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java
index 524eb1591..cf304ff3a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java
@@ -44,17 +44,17 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl
public void run(IAction action) {
}
- @Override
+ @Override
public void dispose() {
- }
+ }
- @Override
+ @Override
public Menu getMenu(Control parent) {
- // Never called
- return null;
- }
+ // Never called
+ return null;
+ }
- @Override
+ @Override
public Menu getMenu(Menu parent) {
Menu menu = new Menu(parent);
menu.addMenuListener(new MenuAdapter() {
@@ -69,9 +69,9 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl
}
});
return menu;
- }
+ }
- /**
+ /**
* Fill pull down menu with the "group by" options
*/
private void fillMenu(Menu menu) {
@@ -89,72 +89,72 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl
organizer = organizers[0];
}
- int accel = 1;
- // Add hard-coded action for flat breakpoints list
- IAction action = new GroupBreakpointsAction(null, fView);
- addAccel(accel, action, BreakpointGroupMessages.GroupBreakpointsByAction_0);
- accel++;
- action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_VIEW_BREAKPOINTS));
- action.setChecked(none);
- ActionContributionItem item= new ActionContributionItem(action);
- item.fill(menu, -1);
+ int accel = 1;
+ // Add hard-coded action for flat breakpoints list
+ IAction action = new GroupBreakpointsAction(null, fView);
+ addAccel(accel, action, BreakpointGroupMessages.GroupBreakpointsByAction_0);
+ accel++;
+ action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_VIEW_BREAKPOINTS));
+ action.setChecked(none);
+ ActionContributionItem item= new ActionContributionItem(action);
+ item.fill(menu, -1);
// Add actions for each contributed organizer
List<IAction> actions = getActions(accel);
- accel = accel + actions.size();
+ accel = accel + actions.size();
Iterator<IAction> actionIter = actions.iterator();
- while (actionIter.hasNext()) {
+ while (actionIter.hasNext()) {
GroupBreakpointsAction bpAction = (GroupBreakpointsAction) actionIter.next();
bpAction.setChecked(bpAction.getOrganizer().equals(organizer));
item= new ActionContributionItem(bpAction);
item.fill(menu, -1);
- }
+ }
- // advanced action
- AdvancedGroupBreakpointsByAction advancedAction = new AdvancedGroupBreakpointsByAction(fView);
- addAccel(accel, advancedAction,BreakpointGroupMessages.GroupBreakpointsByAction_1);
- advancedAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_HIERARCHICAL));
- advancedAction.setChecked(advanced);
+ // advanced action
+ AdvancedGroupBreakpointsByAction advancedAction = new AdvancedGroupBreakpointsByAction(fView);
+ addAccel(accel, advancedAction,BreakpointGroupMessages.GroupBreakpointsByAction_1);
+ advancedAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_HIERARCHICAL));
+ advancedAction.setChecked(advanced);
item= new ActionContributionItem(advancedAction);
item.fill(menu, -1);
}
public List<IAction> getActions(int accel) {
List<IAction> actions = new ArrayList<>();
- IBreakpointOrganizer[] organizers = BreakpointOrganizerManager.getDefault().getOrganizers();
- for (int i = 0; i < organizers.length; i++) {
- IBreakpointOrganizer organizer = organizers[i];
- IAction action = new GroupBreakpointsAction(organizer, fView);
- addAccel(accel, action, organizer.getLabel());
- accel++;
- action.setImageDescriptor(organizer.getImageDescriptor());
- actions.add(action);
- }
- return actions;
- }
-
- private void addAccel(int accel, IAction action, String label) {
- StringBuilder actionLabel= new StringBuilder();
- if (accel != 10) {
- if (accel < 10) {
- // add the numerical accelerators 1 through 9
- actionLabel.append('&');
- }
- actionLabel.append(accel);
- } else {
- actionLabel.append("1&0"); //$NON-NLS-1$
- }
- accel++;
- actionLabel.append(' ');
- actionLabel.append(label);
- action.setText(actionLabel.toString());
- }
+ IBreakpointOrganizer[] organizers = BreakpointOrganizerManager.getDefault().getOrganizers();
+ for (int i = 0; i < organizers.length; i++) {
+ IBreakpointOrganizer organizer = organizers[i];
+ IAction action = new GroupBreakpointsAction(organizer, fView);
+ addAccel(accel, action, organizer.getLabel());
+ accel++;
+ action.setImageDescriptor(organizer.getImageDescriptor());
+ actions.add(action);
+ }
+ return actions;
+ }
+
+ private void addAccel(int accel, IAction action, String label) {
+ StringBuilder actionLabel= new StringBuilder();
+ if (accel != 10) {
+ if (accel < 10) {
+ // add the numerical accelerators 1 through 9
+ actionLabel.append('&');
+ }
+ actionLabel.append(accel);
+ } else {
+ actionLabel.append("1&0"); //$NON-NLS-1$
+ }
+ accel++;
+ actionLabel.append(' ');
+ actionLabel.append(label);
+ action.setText(actionLabel.toString());
+ }
@Override
public void selectionChanged(IAction action, ISelection selection) {
- if (action != fAction) {
- action.setMenuCreator(this);
- fAction= action;
- }
+ if (action != fAction) {
+ action.setMenuCreator(this);
+ fAction= action;
+ }
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java
index 4dcefe773..5635b98fe 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java
@@ -113,7 +113,7 @@ public class GroupBreakpointsByDialog extends TrayDialog {
Composite composite= new Composite(parentComposite, SWT.NONE);
GridLayout layout = new GridLayout();
layout.numColumns = 3;
- composite.setLayout(layout);
+ composite.setLayout(layout);
GridData data= new GridData(GridData.FILL_BOTH);
data.heightHint= 400;
composite.setLayoutData(data);
@@ -123,7 +123,7 @@ public class GroupBreakpointsByDialog extends TrayDialog {
label.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_0);
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
gridData.horizontalSpan = 3;
- label.setLayoutData(gridData);
+ label.setLayoutData(gridData);
createAvailableViewer(composite, labelProvider);
createButtons(composite);
@@ -152,11 +152,11 @@ public class GroupBreakpointsByDialog extends TrayDialog {
fAvailableOrganizersProvider.addAvailable(organizers[i]);
}
organizers = fView.getBreakpointOrganizers();
- if (organizers != null) {
- for (int i = 0; i < organizers.length; i++) {
- fSelectedOrganizersProvider.addSelected(organizers[i]);
- }
- }
+ if (organizers != null) {
+ for (int i = 0; i < organizers.length; i++) {
+ fSelectedOrganizersProvider.addSelected(organizers[i]);
+ }
+ }
}
/**
@@ -177,7 +177,7 @@ public class GroupBreakpointsByDialog extends TrayDialog {
Label label= new Label(availableComposite, SWT.WRAP);
label.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_1);
gridData = new GridData(GridData.FILL_HORIZONTAL);
- label.setLayoutData(gridData);
+ label.setLayoutData(gridData);
fAvailableViewer= new TableViewer(availableComposite);
fAvailableViewer.setContentProvider(fAvailableOrganizersProvider);
@@ -220,7 +220,7 @@ public class GroupBreakpointsByDialog extends TrayDialog {
label.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_3);
gridData = new GridData();
gridData.horizontalSpan = 2;
- label.setLayoutData(gridData);
+ label.setLayoutData(gridData);
fSelectedViewer= new TreeViewer(selectedComposite);
fSelectedViewer.setContentProvider(fSelectedOrganizersProvider);
@@ -230,11 +230,11 @@ public class GroupBreakpointsByDialog extends TrayDialog {
tree.setLayoutData(new GridData(GridData.FILL_BOTH));
tree.setFont(parent.getFont());
fSelectedViewer.addDoubleClickListener(new IDoubleClickListener() {
- @Override
+ @Override
public void doubleClick(DoubleClickEvent event) {
- handleRemovePressed();
- }
- });
+ handleRemovePressed();
+ }
+ });
fSelectedViewer.addSelectionChangedListener(new ISelectionChangedListener() {
@Override
public void selectionChanged(SelectionChangedEvent event) {
@@ -405,13 +405,13 @@ public class GroupBreakpointsByDialog extends TrayDialog {
/**
* Content provider that provides the list of breakpoint organaisers
- * that are available but not currently selected.
+ * that are available but not currently selected.
*/
private class AvailableOrganizersProvider implements IStructuredContentProvider {
protected List<IBreakpointOrganizer> availableOrganziers = new ArrayList<>();
public void addAvailable(IBreakpointOrganizer organizer) {
- availableOrganziers.add(organizer);
+ availableOrganziers.add(organizer);
fSelectedOrganizersProvider.selectedOrganizers.remove(organizer);
}
@@ -437,23 +437,23 @@ public class GroupBreakpointsByDialog extends TrayDialog {
protected List<Object> selectedOrganizers = new ArrayList<>();
public void addSelected(IBreakpointOrganizer organizer) {
- selectedOrganizers.add(organizer);
+ selectedOrganizers.add(organizer);
fAvailableOrganizersProvider.availableOrganziers.remove(organizer);
}
public void moveUp(Object object) {
int index = selectedOrganizers.indexOf(object);
if (index > 0) {
- selectedOrganizers.remove(object);
- selectedOrganizers.add(index - 1, object);
+ selectedOrganizers.remove(object);
+ selectedOrganizers.add(index - 1, object);
}
}
public void moveDown(Object object) {
int index = selectedOrganizers.indexOf(object);
if (index < selectedOrganizers.size() - 1) {
- selectedOrganizers.remove(object);
- selectedOrganizers.add(index + 1, object);
+ selectedOrganizers.remove(object);
+ selectedOrganizers.add(index + 1, object);
}
}
@@ -533,9 +533,9 @@ public class GroupBreakpointsByDialog extends TrayDialog {
}
}
- @Override
+ @Override
protected void configureShell(Shell shell) {
- super.configureShell(shell);
- shell.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_7);
- }
+ super.configureShell(shell);
+ shell.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_7);
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java
index 8cf07a7de..9a3c0ad82 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java
@@ -33,60 +33,60 @@ import org.eclipse.ui.PlatformUI;
*/
public class PasteBreakpointsAction extends BreakpointSelectionAction {
- /**
- * Creates a new action.
- *
- * @param view the view of this action
- */
- public PasteBreakpointsAction(BreakpointsView view) {
- super(BreakpointGroupMessages.PasteBreakpointsAction_0, view);
- setToolTipText(BreakpointGroupMessages.PasteBreakpointsAction_1);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.PASTE_BREAKPOINTS_ACTION);
- }
+ /**
+ * Creates a new action.
+ *
+ * @param view the view of this action
+ */
+ public PasteBreakpointsAction(BreakpointsView view) {
+ super(BreakpointGroupMessages.PasteBreakpointsAction_0, view);
+ setToolTipText(BreakpointGroupMessages.PasteBreakpointsAction_1);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.PASTE_BREAKPOINTS_ACTION);
+ }
- /**
- * Returns the actual target of the paste action. Returns null
- * if no valid target is selected.
- *
- * @return the actual target of the paste action
- */
- private Object getTarget() {
+ /**
+ * Returns the actual target of the paste action. Returns null
+ * if no valid target is selected.
+ *
+ * @return the actual target of the paste action
+ */
+ private Object getTarget() {
List<?> selectedNonResources = getSelectedNonResources();
- if (selectedNonResources.size() == 1) {
- Object target = selectedNonResources.get(0);
- if (target instanceof IBreakpointContainer) {
- return target;
- }
- }
- return null;
- }
+ if (selectedNonResources.size() == 1) {
+ Object target = selectedNonResources.get(0);
+ if (target instanceof IBreakpointContainer) {
+ return target;
+ }
+ }
+ return null;
+ }
- /**
- * Implementation of method defined on <code>IAction</code>.
- */
- @Override
+ /**
+ * Implementation of method defined on <code>IAction</code>.
+ */
+ @Override
public void run() {
if (getBreakpointsView().canPaste(getTarget(), LocalSelectionTransfer.getTransfer().getSelection())) {
getBreakpointsView().performPaste(getTarget(), LocalSelectionTransfer.getTransfer().getSelection());
}
- }
+ }
- /**
- * Returns whether this action should be enabled based on the selection
- * in the clipboard. Only updates when the breakpoints view has focus.
- */
- @Override
+ /**
+ * Returns whether this action should be enabled based on the selection
+ * in the clipboard. Only updates when the breakpoints view has focus.
+ */
+ @Override
protected boolean updateSelection(IStructuredSelection selection) {
- // can't paste into "Others" (only move)
- Object target = getTarget();
- if (target instanceof IBreakpointContainer) {
- IBreakpointContainer container = (IBreakpointContainer) target;
- if (container.getCategory() instanceof OtherBreakpointCategory) {
- return false;
- }
+ // can't paste into "Others" (only move)
+ Object target = getTarget();
+ if (target instanceof IBreakpointContainer) {
+ IBreakpointContainer container = (IBreakpointContainer) target;
+ if (container.getCategory() instanceof OtherBreakpointCategory) {
+ return false;
+ }
return true;
- }
+ }
// don't access clipboard - causes Hang -see bug 84870
return false;
- }
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java
index 5b39f7701..8f39efebf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java
@@ -32,88 +32,88 @@ import org.eclipse.jface.viewers.TreePath;
*/
public class RemoveFromWorkingSetAction extends BreakpointSelectionAction {
- private BreakpointSetElement[] fBreakpoints;
+ private BreakpointSetElement[] fBreakpoints;
/**
- * Constructs action to remove breakpoints from a category.
- *
- * @param view
- */
- public RemoveFromWorkingSetAction(BreakpointsView view) {
- super(BreakpointGroupMessages.RemoveFromWorkingSetAction_0, view);
- }
-
- @Override
+ * Constructs action to remove breakpoints from a category.
+ *
+ * @param view
+ */
+ public RemoveFromWorkingSetAction(BreakpointsView view) {
+ super(BreakpointGroupMessages.RemoveFromWorkingSetAction_0, view);
+ }
+
+ @Override
public void run() {
- if (fBreakpoints != null) {
- for (int i = 0; i < fBreakpoints.length; i++) {
- fBreakpoints[i].container.getOrganizer().removeBreakpoint(fBreakpoints[i].breakpoint, fBreakpoints[i].container.getCategory());
- }
- }
- }
-
- protected static class BreakpointSetElement {
- BreakpointSetElement(IBreakpoint b, IBreakpointContainer c) { breakpoint = b; container = c; }
- IBreakpoint breakpoint;
- IBreakpointContainer container;
- }
-
- /**
- * Returns a array of breakpoint/container pairs for the selection
- *
- * All the returned elements contain a breakpoint and a working set container the breakpoint is contained and the breakpoint
- * can be removed from.
- *
- * @param selection
- * @return
- */
- protected BreakpointSetElement[] getRemovableBreakpoints(IStructuredSelection selection) {
+ if (fBreakpoints != null) {
+ for (int i = 0; i < fBreakpoints.length; i++) {
+ fBreakpoints[i].container.getOrganizer().removeBreakpoint(fBreakpoints[i].breakpoint, fBreakpoints[i].container.getCategory());
+ }
+ }
+ }
+
+ protected static class BreakpointSetElement {
+ BreakpointSetElement(IBreakpoint b, IBreakpointContainer c) { breakpoint = b; container = c; }
+ IBreakpoint breakpoint;
+ IBreakpointContainer container;
+ }
+
+ /**
+ * Returns a array of breakpoint/container pairs for the selection
+ *
+ * All the returned elements contain a breakpoint and a working set container the breakpoint is contained and the breakpoint
+ * can be removed from.
+ *
+ * @param selection
+ * @return
+ */
+ protected BreakpointSetElement[] getRemovableBreakpoints(IStructuredSelection selection) {
List<BreakpointSetElement> res = new ArrayList<>();
- if (selection instanceof ITreeSelection) {
- ITreeSelection tSel = (ITreeSelection)selection;
-
- TreePath[] paths = tSel.getPaths();
- for (int i = 0; i < paths.length; i++) {
- TreePath path = paths[i];
-
- // We can remove Breakpoints from their working set if any of their parents is a non "Other" breakpoint working set
- IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(path.getLastSegment(), IBreakpoint.class);
- if (breakpoint != null) {
- TreePath parents = path.getParentPath();
-
- for (int j = 0; j < parents.getSegmentCount(); j++) {
- Object parent = parents.getSegment(j);
-
- if (parent instanceof IBreakpointContainer) {
- IBreakpointContainer container = (IBreakpointContainer)parent;
-
- // Test if this is a working set container.
- if (container.getCategory() instanceof WorkingSetCategory) {
- // Test if this container allows to remove this breakpoint.
- if (container.getOrganizer().canRemove(breakpoint, container.getCategory())) {
- res.add(new BreakpointSetElement(breakpoint, container));
- }
- }
- }
- }
- }
- }
- }
- return res.toArray(new BreakpointSetElement[res.size()]);
- }
-
- @Override
+ if (selection instanceof ITreeSelection) {
+ ITreeSelection tSel = (ITreeSelection)selection;
+
+ TreePath[] paths = tSel.getPaths();
+ for (int i = 0; i < paths.length; i++) {
+ TreePath path = paths[i];
+
+ // We can remove Breakpoints from their working set if any of their parents is a non "Other" breakpoint working set
+ IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(path.getLastSegment(), IBreakpoint.class);
+ if (breakpoint != null) {
+ TreePath parents = path.getParentPath();
+
+ for (int j = 0; j < parents.getSegmentCount(); j++) {
+ Object parent = parents.getSegment(j);
+
+ if (parent instanceof IBreakpointContainer) {
+ IBreakpointContainer container = (IBreakpointContainer)parent;
+
+ // Test if this is a working set container.
+ if (container.getCategory() instanceof WorkingSetCategory) {
+ // Test if this container allows to remove this breakpoint.
+ if (container.getOrganizer().canRemove(breakpoint, container.getCategory())) {
+ res.add(new BreakpointSetElement(breakpoint, container));
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return res.toArray(new BreakpointSetElement[res.size()]);
+ }
+
+ @Override
public boolean isEnabled() {
- if(fBreakpoints != null) {
- return fBreakpoints.length > 0;
- }
- return false;
- }
+ if(fBreakpoints != null) {
+ return fBreakpoints.length > 0;
+ }
+ return false;
+ }
- @Override
+ @Override
protected boolean updateSelection(IStructuredSelection selection) {
- fBreakpoints = getRemovableBreakpoints(selection);
- return fBreakpoints.length > 0;
- }
+ fBreakpoints = getRemovableBreakpoints(selection);
+ return fBreakpoints.length > 0;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SetDefaultBreakpointGroupAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SetDefaultBreakpointGroupAction.java
index 6b7936e6b..344700d66 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SetDefaultBreakpointGroupAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SetDefaultBreakpointGroupAction.java
@@ -25,20 +25,20 @@ import org.eclipse.ui.IWorkingSet;
*/
public class SetDefaultBreakpointGroupAction extends AbstractBreakpointsViewAction {
- @Override
+ @Override
public void run(IAction action) {
- SelectBreakpointWorkingsetDialog sbwsd = new SelectBreakpointWorkingsetDialog(DebugUIPlugin.getShell());
- sbwsd.setTitle(BreakpointGroupMessages.SetDefaultBreakpointGroupAction_0);
- IWorkingSet workingSet = BreakpointSetOrganizer.getDefaultWorkingSet();
- if (workingSet != null){
- sbwsd.setInitialSelections(new Object[]{workingSet});
- }
- if(sbwsd.open() == Window.OK) {
- BreakpointSetOrganizer.setDefaultWorkingSet((IWorkingSet) sbwsd.getResult()[0]);
- }
- }
+ SelectBreakpointWorkingsetDialog sbwsd = new SelectBreakpointWorkingsetDialog(DebugUIPlugin.getShell());
+ sbwsd.setTitle(BreakpointGroupMessages.SetDefaultBreakpointGroupAction_0);
+ IWorkingSet workingSet = BreakpointSetOrganizer.getDefaultWorkingSet();
+ if (workingSet != null){
+ sbwsd.setInitialSelections(new Object[]{workingSet});
+ }
+ if(sbwsd.open() == Window.OK) {
+ BreakpointSetOrganizer.setDefaultWorkingSet((IWorkingSet) sbwsd.getResult()[0]);
+ }
+ }
- @Override
+ @Override
public void selectionChanged(IAction action, ISelection selection) {}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ToggleDefaultGroupAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ToggleDefaultGroupAction.java
index 3f9df0015..4d406d6b3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ToggleDefaultGroupAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/ToggleDefaultGroupAction.java
@@ -27,42 +27,42 @@ import org.eclipse.ui.IWorkingSet;
*/
public class ToggleDefaultGroupAction extends AbstractBreakpointsViewAction {
- private IWorkingSet fSelectedSet;
+ private IWorkingSet fSelectedSet;
- @Override
+ @Override
public void run(IAction action) {
- IWorkingSet defaultWorkingSet = BreakpointSetOrganizer.getDefaultWorkingSet();
- IWorkingSet set = null;
- if (!fSelectedSet.equals(defaultWorkingSet)) {
- set = fSelectedSet;
- }
- BreakpointSetOrganizer.setDefaultWorkingSet(set);
- }
+ IWorkingSet defaultWorkingSet = BreakpointSetOrganizer.getDefaultWorkingSet();
+ IWorkingSet set = null;
+ if (!fSelectedSet.equals(defaultWorkingSet)) {
+ set = fSelectedSet;
+ }
+ BreakpointSetOrganizer.setDefaultWorkingSet(set);
+ }
- @Override
+ @Override
public void selectionChanged(IAction action, ISelection sel) {
- fSelectedSet = null;
- if (sel instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) sel;
- if (selection.size() == 1) {
- Object firstElement = selection.getFirstElement();
- if (firstElement instanceof IBreakpointContainer) {
- IBreakpointContainer container = (IBreakpointContainer) firstElement;
- if (container.getCategory() instanceof WorkingSetCategory) {
- WorkingSetCategory category = (WorkingSetCategory)container.getCategory();
- if (IDebugUIConstants.BREAKPOINT_WORKINGSET_ID.equals(category.getWorkingSet().getId())) {
- IWorkingSet set = category.getWorkingSet();
- action.setEnabled(true);
- boolean isDefault = set == BreakpointSetOrganizer.getDefaultWorkingSet();
- action.setChecked(isDefault);
- fSelectedSet = set;
- return;
- }
- }
- }
- }
- }
- action.setEnabled(false);
- action.setChecked(false);
- }
+ fSelectedSet = null;
+ if (sel instanceof IStructuredSelection) {
+ IStructuredSelection selection = (IStructuredSelection) sel;
+ if (selection.size() == 1) {
+ Object firstElement = selection.getFirstElement();
+ if (firstElement instanceof IBreakpointContainer) {
+ IBreakpointContainer container = (IBreakpointContainer) firstElement;
+ if (container.getCategory() instanceof WorkingSetCategory) {
+ WorkingSetCategory category = (WorkingSetCategory)container.getCategory();
+ if (IDebugUIConstants.BREAKPOINT_WORKINGSET_ID.equals(category.getWorkingSet().getId())) {
+ IWorkingSet set = category.getWorkingSet();
+ action.setEnabled(true);
+ boolean isDefault = set == BreakpointSetOrganizer.getDefaultWorkingSet();
+ action.setChecked(isDefault);
+ fSelectedSet = set;
+ return;
+ }
+ }
+ }
+ }
+ }
+ action.setEnabled(false);
+ action.setChecked(false);
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/WorkingSetsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/WorkingSetsAction.java
index cbeab4594..be3df6af9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/WorkingSetsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/WorkingSetsAction.java
@@ -24,12 +24,12 @@ import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog;
*/
public class WorkingSetsAction extends AbstractBreakpointsViewAction {
- @Override
+ @Override
public void run(IAction action) {
- IWorkingSetSelectionDialog selectionDialog = PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetSelectionDialog(
- DebugUIPlugin.getShell(),
- false,
- new String[] {IDebugUIConstants.BREAKPOINT_WORKINGSET_ID});
- selectionDialog.open();
- }
+ IWorkingSetSelectionDialog selectionDialog = PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetSelectionDialog(
+ DebugUIPlugin.getShell(),
+ false,
+ new String[] {IDebugUIConstants.BREAKPOINT_WORKINGSET_ID});
+ selectionDialog.open();
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointSortBy/SortBreakpointsByAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointSortBy/SortBreakpointsByAction.java
index e98aa12a0..c1c8d1965 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointSortBy/SortBreakpointsByAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointSortBy/SortBreakpointsByAction.java
@@ -40,17 +40,17 @@ public class SortBreakpointsByAction extends AbstractBreakpointsViewAction imple
public void run(IAction action) {
}
- @Override
+ @Override
public void dispose() {
- }
+ }
- @Override
+ @Override
public Menu getMenu(Control parent) {
- // Never called
- return null;
- }
+ // Never called
+ return null;
+ }
- @Override
+ @Override
public Menu getMenu(Menu parent) {
Menu menu = new Menu(parent);
menu.addMenuListener(new MenuAdapter() {
@@ -65,9 +65,9 @@ public class SortBreakpointsByAction extends AbstractBreakpointsViewAction imple
}
});
return menu;
- }
+ }
- /**
+ /**
* Fill pull down menu with the "group by" options
*/
private void fillMenu(Menu menu) {
@@ -86,9 +86,9 @@ public class SortBreakpointsByAction extends AbstractBreakpointsViewAction imple
@Override
public void selectionChanged(IAction action, ISelection selection) {
- if (action != fAction) {
- action.setMenuCreator(this);
- fAction= action;
- }
+ if (action != fAction) {
+ action.setMenuCreator(this);
+ fAction= action;
+ }
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/AccessWatchpointToggleAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/AccessWatchpointToggleAction.java
index b83810354..186e8ae09 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/AccessWatchpointToggleAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/AccessWatchpointToggleAction.java
@@ -21,23 +21,23 @@ import org.eclipse.debug.core.model.IWatchpoint;
*/
public class AccessWatchpointToggleAction extends ModifyWatchpointAction {
- @Override
+ @Override
protected boolean isEnabled(IWatchpoint watchpoint) {
- return watchpoint.supportsAccess();
- }
+ return watchpoint.supportsAccess();
+ }
- @Override
+ @Override
protected void toggleWatchpoint(IWatchpoint watchpoint, boolean b) throws CoreException {
- watchpoint.setAccess(b);
- }
+ watchpoint.setAccess(b);
+ }
- @Override
+ @Override
protected boolean isChecked(IWatchpoint watchpoint) {
- try {
- return watchpoint.isAccess();
- } catch (CoreException e) {
- }
- return false;
- }
+ try {
+ return watchpoint.isAccess();
+ } catch (CoreException e) {
+ }
+ return false;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java
index 094a8634c..5727490ad 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java
@@ -44,11 +44,11 @@ public class BreakpointsCollapseAllAction implements IViewActionDelegate, IActio
@Override
public void init(IViewPart view) {
fView = (AbstractDebugView) view;
- IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)fView.getViewer();
- if (viewer != null) {
- viewer.addViewerUpdateListener(this);
- viewer.addModelChangedListener(this);
- }
+ IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)fView.getViewer();
+ if (viewer != null) {
+ viewer.addViewerUpdateListener(this);
+ viewer.addModelChangedListener(this);
+ }
}
@Override
@@ -62,11 +62,11 @@ public class BreakpointsCollapseAllAction implements IViewActionDelegate, IActio
@Override
public void dispose() {
- ITreeModelViewer viewer = (ITreeModelViewer)fView.getViewer();
- if (viewer != null) {
- viewer.removeViewerUpdateListener(this);
- viewer.removeModelChangedListener(this);
- }
+ ITreeModelViewer viewer = (ITreeModelViewer)fView.getViewer();
+ if (viewer != null) {
+ viewer.removeViewerUpdateListener(this);
+ viewer.removeModelChangedListener(this);
+ }
}
@Override
@@ -80,36 +80,36 @@ public class BreakpointsCollapseAllAction implements IViewActionDelegate, IActio
run(action);
}
- @Override
+ @Override
public void viewerUpdatesBegin() {
- }
+ }
- @Override
+ @Override
public void viewerUpdatesComplete() {
- }
+ }
- @Override
+ @Override
public void updateStarted(IViewerUpdate update) {
- }
+ }
- @Override
+ @Override
public void updateComplete(IViewerUpdate update) {
- if (!update.isCanceled()) {
- if (TreePath.EMPTY.equals(update.getElementPath())) {
- update();
- }
- }
- }
-
- private void update() {
- IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)fView.getViewer();
- if (viewer != null && fAction != null) {
- fAction.setEnabled(viewer.getInput() != null && viewer.getChildCount(TreePath.EMPTY) > 0);
- }
- }
-
- @Override
+ if (!update.isCanceled()) {
+ if (TreePath.EMPTY.equals(update.getElementPath())) {
+ update();
+ }
+ }
+ }
+
+ private void update() {
+ IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)fView.getViewer();
+ if (viewer != null && fAction != null) {
+ fAction.setEnabled(viewer.getInput() != null && viewer.getChildCount(TreePath.EMPTY) > 0);
+ }
+ }
+
+ @Override
public void modelChanged(IModelDelta delta, IModelProxy proxy) {
- update();
- }
+ update();
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsExpandAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsExpandAllAction.java
index 849bd741a..3792bb28d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsExpandAllAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsExpandAllAction.java
@@ -35,32 +35,32 @@ import org.eclipse.ui.IViewPart;
*/
public class BreakpointsExpandAllAction implements IViewActionDelegate, IActionDelegate2, IViewerUpdateListener, IModelChangedListener {
- private IAction fAction;
+ private IAction fAction;
private BreakpointsView fView;
- @Override
+ @Override
public void init(IAction action) {
- fAction = action;
- }
+ fAction = action;
+ }
@Override
public void init(IViewPart view) {
fView = (BreakpointsView) view;
IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)fView.getViewer();
if (viewer != null) {
- viewer.addViewerUpdateListener(this);
- viewer.addModelChangedListener(this);
+ viewer.addViewerUpdateListener(this);
+ viewer.addModelChangedListener(this);
}
}
- @Override
+ @Override
public void runWithEvent(IAction action, Event event) {
- run(action);
- }
+ run(action);
+ }
@Override
public void run(IAction action) {
- fView.expandAllElementsInViewer();
+ fView.expandAllElementsInViewer();
}
@Override
@@ -68,45 +68,45 @@ public class BreakpointsExpandAllAction implements IViewActionDelegate, IActionD
}
- @Override
+ @Override
public void dispose() {
- ITreeModelViewer viewer = (ITreeModelViewer)fView.getViewer();
- if (viewer != null) {
- viewer.removeViewerUpdateListener(this);
- viewer.removeModelChangedListener(this);
- }
- }
-
- @Override
+ ITreeModelViewer viewer = (ITreeModelViewer)fView.getViewer();
+ if (viewer != null) {
+ viewer.removeViewerUpdateListener(this);
+ viewer.removeModelChangedListener(this);
+ }
+ }
+
+ @Override
public void viewerUpdatesBegin() {
- }
+ }
- @Override
+ @Override
public void viewerUpdatesComplete() {
- }
+ }
- @Override
+ @Override
public void updateStarted(IViewerUpdate update) {
- }
+ }
- @Override
+ @Override
public void updateComplete(IViewerUpdate update) {
- if (!update.isCanceled()) {
- if (TreePath.EMPTY.equals(update.getElementPath())) {
- update();
- }
- }
- }
-
- private void update() {
- IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)fView.getViewer();
- if (viewer != null && fAction != null) {
- fAction.setEnabled(viewer.getInput() != null && viewer.getChildCount(TreePath.EMPTY) > 0);
- }
- }
-
- @Override
+ if (!update.isCanceled()) {
+ if (TreePath.EMPTY.equals(update.getElementPath())) {
+ update();
+ }
+ }
+ }
+
+ private void update() {
+ IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)fView.getViewer();
+ if (viewer != null && fAction != null) {
+ fAction.setEnabled(viewer.getInput() != null && viewer.getChildCount(TreePath.EMPTY) > 0);
+ }
+ }
+
+ @Override
public void modelChanged(IModelDelta delta, IModelProxy proxy) {
- update();
- }
+ update();
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/EnableBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/EnableBreakpointsAction.java
index dfb5c959d..1d7fbfe49 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/EnableBreakpointsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/EnableBreakpointsAction.java
@@ -150,20 +150,20 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen
boolean allDisabled= true;
while (itr.hasNext()) {
Object selected= itr.next();
- IBreakpoint bp = (IBreakpoint)DebugPlugin.getAdapter(selected, IBreakpoint.class);
-
- if (bp != null) {
- try {
- if (bp.isEnabled()) {
- allDisabled= false;
- } else {
- allEnabled= false;
- }
- } catch (CoreException ce) {
- handleException(ce);
- }
- }
- else if (selected instanceof IBreakpointContainer) {
+ IBreakpoint bp = (IBreakpoint)DebugPlugin.getAdapter(selected, IBreakpoint.class);
+
+ if (bp != null) {
+ try {
+ if (bp.isEnabled()) {
+ allDisabled= false;
+ } else {
+ allEnabled= false;
+ }
+ } catch (CoreException ce) {
+ handleException(ce);
+ }
+ }
+ else if (selected instanceof IBreakpointContainer) {
IBreakpoint[] breakpoints = ((IBreakpointContainer) selected).getBreakpoints();
for (int i = 0; i < breakpoints.length; i++) {
try {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModificationWatchpointToggleAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModificationWatchpointToggleAction.java
index f5289d267..e179cbc3e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModificationWatchpointToggleAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModificationWatchpointToggleAction.java
@@ -21,23 +21,23 @@ import org.eclipse.debug.core.model.IWatchpoint;
*/
public class ModificationWatchpointToggleAction extends ModifyWatchpointAction {
- @Override
+ @Override
protected boolean isEnabled(IWatchpoint watchpoint) {
- return watchpoint.supportsModification();
- }
+ return watchpoint.supportsModification();
+ }
- @Override
+ @Override
protected void toggleWatchpoint(IWatchpoint watchpoint, boolean b) throws CoreException {
- watchpoint.setModification(b);
- }
+ watchpoint.setModification(b);
+ }
- @Override
+ @Override
protected boolean isChecked(IWatchpoint watchpoint) {
- try {
- return watchpoint.isModification();
- } catch (CoreException e) {
- }
- return false;
- }
+ try {
+ return watchpoint.isModification();
+ } catch (CoreException e) {
+ }
+ return false;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModifyWatchpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModifyWatchpointAction.java
index 505a62454..096fde496 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModifyWatchpointAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ModifyWatchpointAction.java
@@ -32,88 +32,88 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public abstract class ModifyWatchpointAction implements IObjectActionDelegate, IActionDelegate2 {
- private IStructuredSelection fWatchpoints = null;
+ private IStructuredSelection fWatchpoints = null;
- @Override
+ @Override
public void run(IAction action) {
- try {
- if (fWatchpoints != null) {
+ try {
+ if (fWatchpoints != null) {
Iterator<?> iterator = fWatchpoints.iterator();
- while (iterator.hasNext()) {
- IWatchpoint watchpoint = (IWatchpoint)iterator.next();
- toggleWatchpoint(watchpoint, action.isChecked());
- }
- }
- } catch (CoreException e) {
- DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.ModifyWatchpointAction_0, ActionMessages.ModifyWatchpointAction_1, e.getStatus()); //
- }
+ while (iterator.hasNext()) {
+ IWatchpoint watchpoint = (IWatchpoint)iterator.next();
+ toggleWatchpoint(watchpoint, action.isChecked());
+ }
+ }
+ } catch (CoreException e) {
+ DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.ModifyWatchpointAction_0, ActionMessages.ModifyWatchpointAction_1, e.getStatus()); //
+ }
- }
+ }
- /**
- * Toggles the watch point attribute to the given value.
- *
- * @param watchpoint the watchpoint to toggle
- * @param b on or off
- * @throws CoreException if an exception occurs
- */
- protected abstract void toggleWatchpoint(IWatchpoint watchpoint, boolean b) throws CoreException;
+ /**
+ * Toggles the watch point attribute to the given value.
+ *
+ * @param watchpoint the watchpoint to toggle
+ * @param b on or off
+ * @throws CoreException if an exception occurs
+ */
+ protected abstract void toggleWatchpoint(IWatchpoint watchpoint, boolean b) throws CoreException;
- @Override
+ @Override
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- }
+ }
- @Override
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
- if (selection instanceof IStructuredSelection) {
- fWatchpoints = (IStructuredSelection) selection;
- if (!selection.isEmpty()) {
+ if (selection instanceof IStructuredSelection) {
+ fWatchpoints = (IStructuredSelection) selection;
+ if (!selection.isEmpty()) {
Iterator<?> iterator = fWatchpoints.iterator();
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IWatchpoint) {
- IWatchpoint watchpoint = (IWatchpoint) next;
- action.setChecked(isChecked(watchpoint));
- if (!isEnabled(watchpoint)) {
- action.setEnabled(false);
- return;
- }
- }
- }
- action.setEnabled(true);
- return;
- }
- }
- action.setEnabled(false);
- }
+ while (iterator.hasNext()) {
+ Object next = iterator.next();
+ if (next instanceof IWatchpoint) {
+ IWatchpoint watchpoint = (IWatchpoint) next;
+ action.setChecked(isChecked(watchpoint));
+ if (!isEnabled(watchpoint)) {
+ action.setEnabled(false);
+ return;
+ }
+ }
+ }
+ action.setEnabled(true);
+ return;
+ }
+ }
+ action.setEnabled(false);
+ }
- /**
- * Returns whether the action should be checke for the current selection
- *
- * @param watchpoint selected watchpoint
- * @return whether the action should be checked for the current selection
- */
- protected abstract boolean isChecked(IWatchpoint watchpoint);
+ /**
+ * Returns whether the action should be checke for the current selection
+ *
+ * @param watchpoint selected watchpoint
+ * @return whether the action should be checked for the current selection
+ */
+ protected abstract boolean isChecked(IWatchpoint watchpoint);
- /**
- * Returns whether this action is enabled for the given watchpoint.
- *
- * @param watchpoint the watchpoint to examine
- * @return whether this action is enabled for the given watchpoint
- */
- protected abstract boolean isEnabled(IWatchpoint watchpoint);
+ /**
+ * Returns whether this action is enabled for the given watchpoint.
+ *
+ * @param watchpoint the watchpoint to examine
+ * @return whether this action is enabled for the given watchpoint
+ */
+ protected abstract boolean isEnabled(IWatchpoint watchpoint);
- @Override
+ @Override
public void init(IAction action) {
- }
+ }
- @Override
+ @Override
public void dispose() {
- fWatchpoints = null;
- }
+ fWatchpoints = null;
+ }
- @Override
+ @Override
public void runWithEvent(IAction action, Event event) {
- run(action);
- }
+ run(action);
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/OpenBreakpointMarkerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/OpenBreakpointMarkerAction.java
index da7c25c57..aebb39bfd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/OpenBreakpointMarkerAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/OpenBreakpointMarkerAction.java
@@ -69,13 +69,13 @@ public class OpenBreakpointMarkerAction extends SelectionProviderAction {
IEditorPart part= null;
if (input != null) {
String editorId = fgPresentation.getEditorId(input, breakpoint);
- if (editorId != null) {
- try {
- part= page.openEditor(input, editorId, true, IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID);
- } catch (PartInitException e) {
- DebugUIPlugin.errorDialog(dwindow.getShell(), ActionMessages.OpenBreakpointMarkerAction_Go_to_Breakpoint_1, ActionMessages.OpenBreakpointMarkerAction_Exceptions_occurred_attempting_to_open_the_editor_for_the_breakpoint_resource_2, e); //
- }
- }
+ if (editorId != null) {
+ try {
+ part= page.openEditor(input, editorId, true, IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID);
+ } catch (PartInitException e) {
+ DebugUIPlugin.errorDialog(dwindow.getShell(), ActionMessages.OpenBreakpointMarkerAction_Go_to_Breakpoint_1, ActionMessages.OpenBreakpointMarkerAction_Exceptions_occurred_attempting_to_open_the_editor_for_the_breakpoint_resource_2, e); //
+ }
+ }
}
if (part != null) {
IDE.gotoMarker(part, breakpoint.getMarker());
@@ -85,7 +85,7 @@ public class OpenBreakpointMarkerAction extends SelectionProviderAction {
@Override
public void selectionChanged(IStructuredSelection sel) {
if (sel.size() == 1) {
- breakpoint = (IBreakpoint)DebugPlugin.getAdapter(sel.getFirstElement(), IBreakpoint.class);
+ breakpoint = (IBreakpoint)DebugPlugin.getAdapter(sel.getFirstElement(), IBreakpoint.class);
if (breakpoint != null) {
input= fgPresentation.getEditorInput(breakpoint);
if (input != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java
index 7195fd293..83d7618eb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java
@@ -117,10 +117,10 @@ public class RemoveBreakpointAction extends AbstractSelectionActionDelegate {
}
}
if(deleteAll) {
- IBreakpoint[] breakpoints = bpc.getBreakpoints();
- for (int i = 0; i < breakpoints.length; i++) {
- breakpointsToDelete.add(breakpoints[i]);
- }
+ IBreakpoint[] breakpoints = bpc.getBreakpoints();
+ for (int i = 0; i < breakpoints.length; i++) {
+ breakpointsToDelete.add(breakpoints[i]);
+ }
}
}
}
@@ -130,22 +130,22 @@ public class RemoveBreakpointAction extends AbstractSelectionActionDelegate {
((BreakpointsView)getView()).preserveSelection(getSelection());
}
new Job(ActionMessages.RemoveBreakpointAction_2) {
- @Override
+ @Override
protected IStatus run(IProgressMonitor pmonitor) {
- try {
+ try {
Shell shell= getView() != null ? getView().getSite().getShell() : null;
DebugUITools.deleteBreakpoints(breakpoints, shell, pmonitor);
- for (int i = 0; i < sets.length; i++) {
- PlatformUI.getWorkbench().getWorkingSetManager().removeWorkingSet(sets[i]);
+ for (int i = 0; i < sets.length; i++) {
+ PlatformUI.getWorkbench().getWorkingSetManager().removeWorkingSet(sets[i]);
}
- return Status.OK_STATUS;
- } catch (CoreException e) {
- DebugUIPlugin.log(e);
- }
- return Status.CANCEL_STATUS;
- }
- }.schedule();
+ return Status.OK_STATUS;
+ } catch (CoreException e) {
+ DebugUIPlugin.log(e);
+ }
+ return Status.CANCEL_STATUS;
+ }
+ }.schedule();
}
};
try {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java
index bbae8ce4a..ca09ef775 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RetargetBreakpointAction.java
@@ -34,61 +34,61 @@ import org.eclipse.ui.IWorkbenchWindow;
*/
public abstract class RetargetBreakpointAction extends RetargetAction implements IToggleBreakpointsTargetManagerListener {
- private IAction fAction;
+ private IAction fAction;
@Override
protected Class<?> getAdapterClass() {
return IToggleBreakpointsTarget.class;
}
- @Override
+ @Override
protected Object getAdapter(IAdaptable adaptable) {
- IToggleBreakpointsTargetManager manager = DebugUITools.getToggleBreakpointsTargetManager();
+ IToggleBreakpointsTargetManager manager = DebugUITools.getToggleBreakpointsTargetManager();
IWorkbenchPart activePart = getActivePart();
- if (activePart != null) {
+ if (activePart != null) {
return manager.getToggleBreakpointsTarget(activePart, getTargetSelection());
- }
- return null;
- }
+ }
+ return null;
+ }
- @Override
+ @Override
public void init(IWorkbenchWindow window) {
- super.init(window);
- DebugUITools.getToggleBreakpointsTargetManager().addChangedListener(this);
- }
+ super.init(window);
+ DebugUITools.getToggleBreakpointsTargetManager().addChangedListener(this);
+ }
- @Override
+ @Override
public void init(IAction action) {
- super.init(action);
- DebugUITools.getToggleBreakpointsTargetManager().addChangedListener(this);
- }
+ super.init(action);
+ DebugUITools.getToggleBreakpointsTargetManager().addChangedListener(this);
+ }
- @Override
+ @Override
public void dispose() {
- DebugUITools.getToggleBreakpointsTargetManager().removeChangedListener(this);
- super.dispose();
- }
+ DebugUITools.getToggleBreakpointsTargetManager().removeChangedListener(this);
+ super.dispose();
+ }
- @Override
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
- fAction = action;
- super.selectionChanged(action, selection);
- }
+ fAction = action;
+ super.selectionChanged(action, selection);
+ }
- @Override
+ @Override
public void preferredTargetsChanged() {
- if (fAction != null) {
- IWorkbenchPart activePart = getActivePart();
- if (activePart != null) {
- ISelectionProvider provider = activePart.getSite().getSelectionProvider();
- if (provider != null) {
- ISelection selection = provider.getSelection();
- // Force the toggle target to be refreshed.
- super.clearPart(activePart);
- super.partActivated(activePart);
- super.selectionChanged(fAction, selection);
- }
- }
- }
- }
+ if (fAction != null) {
+ IWorkbenchPart activePart = getActivePart();
+ if (activePart != null) {
+ ISelectionProvider provider = activePart.getSite().getSelectionProvider();
+ if (provider != null) {
+ ISelection selection = provider.getSelection();
+ // Force the toggle target to be refreshed.
+ super.clearPart(activePart);
+ super.partActivated(activePart);
+ super.selectionChanged(fAction, selection);
+ }
+ }
+ }
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ToggleBreakpointObjectActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ToggleBreakpointObjectActionDelegate.java
index fc38a2b7c..f3b5d2822 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ToggleBreakpointObjectActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ToggleBreakpointObjectActionDelegate.java
@@ -47,7 +47,7 @@ public abstract class ToggleBreakpointObjectActionDelegate implements IObjectAct
@Override
public void run(IAction action) {
IToggleBreakpointsTarget target =
- DebugUITools.getToggleBreakpointsTargetManager().getToggleBreakpointsTarget(fPart, fSelection);
+ DebugUITools.getToggleBreakpointsTargetManager().getToggleBreakpointsTarget(fPart, fSelection);
if (target != null) {
try {
performAction(target, fPart, fSelection);
@@ -76,9 +76,9 @@ public abstract class ToggleBreakpointObjectActionDelegate implements IObjectAct
// selectionChagned() can sometimes be called before setActivePart().
// Guard here against that possibility.
if (fPart != null) {
- IToggleBreakpointsTarget target =
- DebugUITools.getToggleBreakpointsTargetManager().getToggleBreakpointsTarget(fPart, fSelection);
- enabled = target != null;
+ IToggleBreakpointsTarget target =
+ DebugUITools.getToggleBreakpointsTargetManager().getToggleBreakpointsTarget(fPart, fSelection);
+ enabled = target != null;
}
}
action.setEnabled(enabled);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java
index 76897c4f1..551ba9223 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java
@@ -30,60 +30,60 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
*/
public class EditWatchExpressinInPlaceAction extends Action implements ISelectionChangedListener {
- private ExpressionView fView;
- private TreeModelViewer fViewer;
- private EditWatchExpressionAction fEditActionDelegate = new EditWatchExpressionAction();
+ private ExpressionView fView;
+ private TreeModelViewer fViewer;
+ private EditWatchExpressionAction fEditActionDelegate = new EditWatchExpressionAction();
- public EditWatchExpressinInPlaceAction(ExpressionView view) {
- fView = view;
- fViewer = (TreeModelViewer)view.getViewer();
- fEditActionDelegate.init(view);
- ISelectionProvider selectionProvider = fView.getSite().getSelectionProvider();
- selectionProvider.addSelectionChangedListener(this);
- fEditActionDelegate.selectionChanged(this, selectionProvider.getSelection());
- }
+ public EditWatchExpressinInPlaceAction(ExpressionView view) {
+ fView = view;
+ fViewer = (TreeModelViewer)view.getViewer();
+ fEditActionDelegate.init(view);
+ ISelectionProvider selectionProvider = fView.getSite().getSelectionProvider();
+ selectionProvider.addSelectionChangedListener(this);
+ fEditActionDelegate.selectionChanged(this, selectionProvider.getSelection());
+ }
- @Override
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = fEditActionDelegate.getCurrentSelection();
- setEnabled(selection != null && selection.size() == 1);
- }
+ IStructuredSelection selection = fEditActionDelegate.getCurrentSelection();
+ setEnabled(selection != null && selection.size() == 1);
+ }
- public void dispose() {
- fView.getSite().getSelectionProvider().removeSelectionChangedListener(this);
- }
+ public void dispose() {
+ fView.getSite().getSelectionProvider().removeSelectionChangedListener(this);
+ }
- @Override
+ @Override
public void run() {
- IStructuredSelection selelection = fEditActionDelegate.getCurrentSelection();
+ IStructuredSelection selelection = fEditActionDelegate.getCurrentSelection();
- if (selelection.size() != 1) {
- return;
- }
+ if (selelection.size() != 1) {
+ return;
+ }
- // Always edit multi-line expressions in dialog. Otherwise try to find the expression
- // column and activate cell editor there.
- int expressionColumn = getExpressionColumnIndex();
- IWatchExpression[] expressions = fEditActionDelegate.getSelectedExpressions();
- if (expressionColumn != -1 && !isWatchExpressionWithNewLine(expressions)) {
- fViewer.editElement(selelection.getFirstElement(), expressionColumn);
- } else if (expressions.length == 1) {
- fEditActionDelegate.run(this);
- }
- }
+ // Always edit multi-line expressions in dialog. Otherwise try to find the expression
+ // column and activate cell editor there.
+ int expressionColumn = getExpressionColumnIndex();
+ IWatchExpression[] expressions = fEditActionDelegate.getSelectedExpressions();
+ if (expressionColumn != -1 && !isWatchExpressionWithNewLine(expressions)) {
+ fViewer.editElement(selelection.getFirstElement(), expressionColumn);
+ } else if (expressions.length == 1) {
+ fEditActionDelegate.run(this);
+ }
+ }
- private boolean isWatchExpressionWithNewLine(IWatchExpression[] expressions) {
- return expressions.length == 1 &&
- expressions[0].getExpressionText().indexOf('\n') != -1;
- }
+ private boolean isWatchExpressionWithNewLine(IWatchExpression[] expressions) {
+ return expressions.length == 1 &&
+ expressions[0].getExpressionText().indexOf('\n') != -1;
+ }
- private int getExpressionColumnIndex() {
- Object[] columnProperties = fViewer.getColumnProperties();
- for (int i = 0; columnProperties != null && i < columnProperties.length; i++) {
- if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnProperties[i])) {
- return i;
- }
- }
- return -1;
- }
+ private int getExpressionColumnIndex() {
+ Object[] columnProperties = fViewer.getColumnProperties();
+ for (int i = 0; columnProperties != null && i < columnProperties.length; i++) {
+ if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnProperties[i])) {
+ return i;
+ }
+ }
+ return -1;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressionAction.java
index 0ee090903..d91eecd41 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressionAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressionAction.java
@@ -38,6 +38,6 @@ public class EditWatchExpressionAction extends WatchExpressionAction {
@Override
public void selectionChanged(IAction action, ISelection sel) {
- action.setEnabled(getSelectedExpressions().length == 1);
+ action.setEnabled(getSelectedExpressions().length == 1);
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EnableWatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EnableWatchExpressionAction.java
index c309965b9..06365e72b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EnableWatchExpressionAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EnableWatchExpressionAction.java
@@ -51,8 +51,8 @@ public class EnableWatchExpressionAction implements IViewActionDelegate, IAction
while (iter.hasNext()) {
expression= getWatchExpression(iter.next());
if (expression != null) {
- expression.setEnabled(fEnable);
- fireWatchExpressionChanged(expression);
+ expression.setEnabled(fEnable);
+ fireWatchExpressionChanged(expression);
}
}
} else if (fSelection instanceof IWatchExpression) {
@@ -92,12 +92,12 @@ public class EnableWatchExpressionAction implements IViewActionDelegate, IAction
}
private IWatchExpression getWatchExpression(Object element) {
- if (element instanceof IWatchExpression) {
- return (IWatchExpression)element;
- } else if (element instanceof IAdaptable) {
- return ((IAdaptable)element).getAdapter(IWatchExpression.class);
- }
- return null;
+ if (element instanceof IWatchExpression) {
+ return (IWatchExpression)element;
+ } else if (element instanceof IAdaptable) {
+ return ((IAdaptable)element).getAdapter(IWatchExpression.class);
+ }
+ return null;
}
@Override
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ReevaluateWatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ReevaluateWatchExpressionAction.java
index 1fc07820b..ee9857152 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ReevaluateWatchExpressionAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/ReevaluateWatchExpressionAction.java
@@ -36,35 +36,35 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public class ReevaluateWatchExpressionAction implements IObjectActionDelegate {
- @Override
+ @Override
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- }
+ }
- /**
- * Finds the currently selected context in the UI.
- * @return the current debug context
- */
- protected IDebugElement getContext() {
- IAdaptable object = DebugUITools.getDebugContext();
- IDebugElement context = null;
- if (object instanceof IDebugElement) {
- context = (IDebugElement) object;
- } else if (object instanceof ILaunch) {
- context = ((ILaunch) object).getDebugTarget();
- }
- return context;
- }
+ /**
+ * Finds the currently selected context in the UI.
+ * @return the current debug context
+ */
+ protected IDebugElement getContext() {
+ IAdaptable object = DebugUITools.getDebugContext();
+ IDebugElement context = null;
+ if (object instanceof IDebugElement) {
+ context = (IDebugElement) object;
+ } else if (object instanceof ILaunch) {
+ context = ((ILaunch) object).getDebugTarget();
+ }
+ return context;
+ }
- protected IStructuredSelection getCurrentSelection() {
- IWorkbenchPage page = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage();
- if (page != null) {
- ISelection selection = page.getSelection();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection) selection;
- }
- }
- return null;
- }
+ protected IStructuredSelection getCurrentSelection() {
+ IWorkbenchPage page = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage();
+ if (page != null) {
+ ISelection selection = page.getSelection();
+ if (selection instanceof IStructuredSelection) {
+ return (IStructuredSelection) selection;
+ }
+ }
+ return null;
+ }
/**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java
index 9f1f41122..6a5eae9f6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java
@@ -43,10 +43,10 @@ public class RemoveExpressionAction extends AbstractSelectionActionDelegate {
if (segment instanceof IExpression) {
expressions.add((IExpression) segment);
} else if (segment instanceof IAdaptable) {
- IExpression expression = ((IAdaptable)segment).getAdapter(IExpression.class);
- if (expression != null) {
- expressions.add(expression);
- }
+ IExpression expression = ((IAdaptable)segment).getAdapter(IExpression.class);
+ if (expression != null) {
+ expressions.add(expression);
+ }
}
}
return expressions.toArray(new IExpression[expressions.size()]);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/SelectAllExpressionsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/SelectAllExpressionsAction.java
index 9a39a09d3..2e9315cc3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/SelectAllExpressionsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/SelectAllExpressionsAction.java
@@ -50,9 +50,9 @@ public class SelectAllExpressionsAction extends SelectAllAction implements IExpr
public void expressionsChanged(IExpression[] expressions) {
}
- @Override
+ @Override
public void dispose() {
- super.dispose();
- DebugPlugin.getDefault().getExpressionManager().removeExpressionListener(this);
- }
+ super.dispose();
+ DebugPlugin.getDefault().getExpressionManager().removeExpressionListener(this);
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionAction.java
index 32abad36a..6a4f76013 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionAction.java
@@ -44,46 +44,46 @@ public abstract class WatchExpressionAction implements IViewActionDelegate {
@Override
public void init(IViewPart view) {
- fPart = view;
+ fPart = view;
}
- /**
- * Finds the currently selected context in the UI.
- * @return the current debug context
- */
- protected IDebugElement getContext() {
- IAdaptable object = DebugUITools.getDebugContext();
- IDebugElement context = null;
- if (object instanceof IDebugElement) {
- context = (IDebugElement) object;
- } else if (object instanceof ILaunch) {
- context = ((ILaunch) object).getDebugTarget();
- }
- return context;
- }
+ /**
+ * Finds the currently selected context in the UI.
+ * @return the current debug context
+ */
+ protected IDebugElement getContext() {
+ IAdaptable object = DebugUITools.getDebugContext();
+ IDebugElement context = null;
+ if (object instanceof IDebugElement) {
+ context = (IDebugElement) object;
+ } else if (object instanceof ILaunch) {
+ context = ((ILaunch) object).getDebugTarget();
+ }
+ return context;
+ }
protected IWatchExpression[] getSelectedExpressions() {
- List<Object> list = new LinkedList<>();
- IStructuredSelection currentSelection = getCurrentSelection();
- if (currentSelection == null) {
- return EMPTY_EXPRESSION_ARRAY;
- }
+ List<Object> list = new LinkedList<>();
+ IStructuredSelection currentSelection = getCurrentSelection();
+ if (currentSelection == null) {
+ return EMPTY_EXPRESSION_ARRAY;
+ }
- for (Iterator<?> iter= currentSelection.iterator(); iter.hasNext();) {
- Object element = iter.next();
- if (element instanceof IWatchExpression) {
- list.add(element);
- } else if (element instanceof IAdaptable) {
- IWatchExpression expr = ((IAdaptable)element).getAdapter(IWatchExpression.class);
- if (expr != null) {
- list.add(expr);
- } else {
- return EMPTY_EXPRESSION_ARRAY;
- }
- } else {
- return EMPTY_EXPRESSION_ARRAY;
- }
- }
+ for (Iterator<?> iter= currentSelection.iterator(); iter.hasNext();) {
+ Object element = iter.next();
+ if (element instanceof IWatchExpression) {
+ list.add(element);
+ } else if (element instanceof IAdaptable) {
+ IWatchExpression expr = ((IAdaptable)element).getAdapter(IWatchExpression.class);
+ if (expr != null) {
+ list.add(expr);
+ } else {
+ return EMPTY_EXPRESSION_ARRAY;
+ }
+ } else {
+ return EMPTY_EXPRESSION_ARRAY;
+ }
+ }
return list.toArray(new IWatchExpression[list.size()]);
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java
index 67aca51b0..13e1428e8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java
@@ -35,22 +35,22 @@ public class WatchExpressionFactoryTester extends PropertyTester {
@Override
public boolean test(Object element, String property, Object[] args, Object expectedValue) {
if (CAN_CREATE_WATCH_EXPRESSION_PROPERTY.equals(property)){
- if (element instanceof IVariable) {
- IVariable variable = (IVariable)element;
- if (DebugPlugin.getDefault().getExpressionManager().hasWatchExpressionDelegate(variable.getModelIdentifier())) {
- IWatchExpressionFactoryAdapter factory = WatchHandler.getFactory(variable);
- if (factory instanceof IWatchExpressionFactoryAdapterExtension) {
- IWatchExpressionFactoryAdapterExtension ext = (IWatchExpressionFactoryAdapterExtension) factory;
- return ext.canCreateWatchExpression(variable);
- }
- return true;
- }
- } else {
- IWatchExpressionFactoryAdapter2 factory2 = WatchHandler.getFactory2(element);
- if (factory2 != null) {
- return factory2.canCreateWatchExpression(element);
- }
- }
+ if (element instanceof IVariable) {
+ IVariable variable = (IVariable)element;
+ if (DebugPlugin.getDefault().getExpressionManager().hasWatchExpressionDelegate(variable.getModelIdentifier())) {
+ IWatchExpressionFactoryAdapter factory = WatchHandler.getFactory(variable);
+ if (factory instanceof IWatchExpressionFactoryAdapterExtension) {
+ IWatchExpressionFactoryAdapterExtension ext = (IWatchExpressionFactoryAdapterExtension) factory;
+ return ext.canCreateWatchExpression(variable);
+ }
+ return true;
+ }
+ } else {
+ IWatchExpressionFactoryAdapter2 factory2 = WatchHandler.getFactory2(element);
+ if (factory2 != null) {
+ return factory2.canCreateWatchExpression(element);
+ }
+ }
}
return false;
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchHandler.java
index 6305324c4..1c4955f02 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchHandler.java
@@ -45,94 +45,94 @@ import org.eclipse.ui.handlers.HandlerUtil;
*/
public class WatchHandler extends AbstractHandler {
- @Override
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
- ISelection selection = HandlerUtil.getCurrentSelection(event);
- if (selection instanceof IStructuredSelection) {
- Iterator<?> iter = ((IStructuredSelection)selection).iterator();
- while (iter.hasNext()) {
- Object element = iter.next();
- createExpression(element);
- }
- }
- return null;
- }
+ ISelection selection = HandlerUtil.getCurrentSelection(event);
+ if (selection instanceof IStructuredSelection) {
+ Iterator<?> iter = ((IStructuredSelection)selection).iterator();
+ while (iter.hasNext()) {
+ Object element = iter.next();
+ createExpression(element);
+ }
+ }
+ return null;
+ }
- private void showExpressionsView() {
- IWorkbenchPage page = DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IViewPart part = page.findView(IDebugUIConstants.ID_EXPRESSION_VIEW);
- if (part == null) {
- try {
- page.showView(IDebugUIConstants.ID_EXPRESSION_VIEW);
- } catch (PartInitException e) {
- }
- } else {
- page.bringToTop(part);
- }
+ private void showExpressionsView() {
+ IWorkbenchPage page = DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IViewPart part = page.findView(IDebugUIConstants.ID_EXPRESSION_VIEW);
+ if (part == null) {
+ try {
+ page.showView(IDebugUIConstants.ID_EXPRESSION_VIEW);
+ } catch (PartInitException e) {
+ }
+ } else {
+ page.bringToTop(part);
+ }
- }
+ }
- private void createExpression(Object element) {
- String expressionString;
- try {
- if (element instanceof IVariable) {
- IVariable variable = (IVariable)element;
- IWatchExpressionFactoryAdapter factory = getFactory(variable);
- expressionString = variable.getName();
- if (factory != null) {
- expressionString = factory.createWatchExpression(variable);
- }
- } else {
- IWatchExpressionFactoryAdapter2 factory2 = getFactory2(element);
- if (factory2 != null) {
- expressionString = factory2.createWatchExpression(element);
- } else {
- // Action should not have been enabled
- return;
- }
- }
- } catch (CoreException e) {
- DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.WatchAction_0, ActionMessages.WatchAction_1, e); //
- return;
- }
+ private void createExpression(Object element) {
+ String expressionString;
+ try {
+ if (element instanceof IVariable) {
+ IVariable variable = (IVariable)element;
+ IWatchExpressionFactoryAdapter factory = getFactory(variable);
+ expressionString = variable.getName();
+ if (factory != null) {
+ expressionString = factory.createWatchExpression(variable);
+ }
+ } else {
+ IWatchExpressionFactoryAdapter2 factory2 = getFactory2(element);
+ if (factory2 != null) {
+ expressionString = factory2.createWatchExpression(element);
+ } else {
+ // Action should not have been enabled
+ return;
+ }
+ }
+ } catch (CoreException e) {
+ DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.WatchAction_0, ActionMessages.WatchAction_1, e); //
+ return;
+ }
- IWatchExpression expression;
- expression = DebugPlugin.getDefault().getExpressionManager().newWatchExpression(expressionString);
- DebugPlugin.getDefault().getExpressionManager().addExpression(expression);
- IAdaptable object = DebugUITools.getDebugContext();
- IDebugElement context = null;
- if (object instanceof IDebugElement) {
- context = (IDebugElement) object;
- } else if (object instanceof ILaunch) {
- context = ((ILaunch) object).getDebugTarget();
- }
- expression.setExpressionContext(context);
- showExpressionsView();
- }
+ IWatchExpression expression;
+ expression = DebugPlugin.getDefault().getExpressionManager().newWatchExpression(expressionString);
+ DebugPlugin.getDefault().getExpressionManager().addExpression(expression);
+ IAdaptable object = DebugUITools.getDebugContext();
+ IDebugElement context = null;
+ if (object instanceof IDebugElement) {
+ context = (IDebugElement) object;
+ } else if (object instanceof ILaunch) {
+ context = ((ILaunch) object).getDebugTarget();
+ }
+ expression.setExpressionContext(context);
+ showExpressionsView();
+ }
- /**
- * Returns the factory adapter for the given variable or <code>null</code> if none.
- *
- * @param variable the variable to get the factory for
- * @return factory or <code>null</code>
- */
- static IWatchExpressionFactoryAdapter getFactory(IVariable variable) {
- return variable.getAdapter(IWatchExpressionFactoryAdapter.class);
- }
+ /**
+ * Returns the factory adapter for the given variable or <code>null</code> if none.
+ *
+ * @param variable the variable to get the factory for
+ * @return factory or <code>null</code>
+ */
+ static IWatchExpressionFactoryAdapter getFactory(IVariable variable) {
+ return variable.getAdapter(IWatchExpressionFactoryAdapter.class);
+ }
- /**
- * Returns the factory adapter for the given variable or <code>null</code> if none.
- *
- * @param element the element to try and adapt
- * @return factory or <code>null</code>
- */
- static IWatchExpressionFactoryAdapter2 getFactory2(Object element) {
- if (element instanceof IAdaptable) {
- return ((IAdaptable)element).getAdapter(IWatchExpressionFactoryAdapter2.class);
- }
- return null;
- }
+ /**
+ * Returns the factory adapter for the given variable or <code>null</code> if none.
+ *
+ * @param element the element to try and adapt
+ * @return factory or <code>null</code>
+ */
+ static IWatchExpressionFactoryAdapter2 getFactory2(Object element) {
+ if (element instanceof IAdaptable) {
+ return ((IAdaptable)element).getAdapter(IWatchExpressionFactoryAdapter2.class);
+ }
+ return null;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java
index e0ed1ed70..f2793f51d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java
@@ -47,14 +47,14 @@ import com.ibm.icu.text.MessageFormat;
public class ChangeVariableValueAction extends SelectionProviderAction {
protected IVariable fVariable;
- private VariablesView fView;
- private boolean fEditing= false;
- private boolean isApplicable = false;
-
- /**
- * Creates a new ChangeVariableValueAction for the given variables view
- * @param view the variables view in which this action will appear
- */
+ private VariablesView fView;
+ private boolean fEditing= false;
+ private boolean isApplicable = false;
+
+ /**
+ * Creates a new ChangeVariableValueAction for the given variables view
+ * @param view the variables view in which this action will appear
+ */
public ChangeVariableValueAction(VariablesView view) {
super(view.getViewer(), ActionMessages.ChangeVariableValue_title);
setDescription(ActionMessages.ChangeVariableValue_toolTipText);
@@ -74,7 +74,7 @@ public class ChangeVariableValueAction extends SelectionProviderAction {
* @return if this action applies to the current selection
*/
public boolean isApplicable() {
- return isApplicable;
+ return isApplicable;
}
/**
@@ -82,16 +82,16 @@ public class ChangeVariableValueAction extends SelectionProviderAction {
* @param variable run the action on the given variable
*/
protected void doActionPerformed(final IVariable variable) {
- Shell shell = fView.getViewSite().getShell();
+ Shell shell = fView.getViewSite().getShell();
// If a previous edit is still in progress, don't start another
- if (fEditing) {
- return;
- }
- fEditing= true;
+ if (fEditing) {
+ return;
+ }
+ fEditing= true;
fVariable = variable;
- if (!delegateEdit(shell)) {
- doDefaultEdit(shell);
- }
+ if (!delegateEdit(shell)) {
+ doDefaultEdit(shell);
+ }
fEditing= false;
}
@@ -101,24 +101,24 @@ public class ChangeVariableValueAction extends SelectionProviderAction {
* <code>true</code> if a delegate handled the edit, <code>false</code>
* if the variable still needs to be edited.
*
- * @param shell a shell for prompting the user
- * @return whether or not a delegate attempted to edit the variable
- */
- private boolean delegateEdit(Shell shell) {
- String modelIdentifier = fVariable.getModelIdentifier();
- IVariableValueEditor editor= VariableValueEditorManager.getDefault().getVariableValueEditor(modelIdentifier);
- if (editor != null) {
- return editor.editVariable(fVariable, shell);
- }
- return false;
- }
-
- /**
- * Edits the variable using the default variable editor
- * @param shell a shell for prompting the user
- */
- protected void doDefaultEdit(Shell shell) {
- String name= IInternalDebugCoreConstants.EMPTY_STRING;
+ * @param shell a shell for prompting the user
+ * @return whether or not a delegate attempted to edit the variable
+ */
+ private boolean delegateEdit(Shell shell) {
+ String modelIdentifier = fVariable.getModelIdentifier();
+ IVariableValueEditor editor= VariableValueEditorManager.getDefault().getVariableValueEditor(modelIdentifier);
+ if (editor != null) {
+ return editor.editVariable(fVariable, shell);
+ }
+ return false;
+ }
+
+ /**
+ * Edits the variable using the default variable editor
+ * @param shell a shell for prompting the user
+ */
+ protected void doDefaultEdit(Shell shell) {
+ String name= IInternalDebugCoreConstants.EMPTY_STRING;
String value= IInternalDebugCoreConstants.EMPTY_STRING;
try {
name= fVariable.getName();
@@ -163,12 +163,12 @@ public class ChangeVariableValueAction extends SelectionProviderAction {
* @param sel the selection to update
*/
protected void update(IStructuredSelection sel) {
- isApplicable = false;
+ isApplicable = false;
Iterator<Object> iter = sel.iterator();
if (iter.hasNext()) {
Object object= iter.next();
if (object instanceof IValueModification) {
- isApplicable = true;
+ isApplicable = true;
IValueModification varMod= (IValueModification)object;
if (!varMod.supportsValueModification()) {
setEnabled(false);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java
index e1573b63e..081a4a43a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java
@@ -263,15 +263,15 @@ public class ChangeVariableValueInputDialog extends TrayDialog {
return IDebugUIConstants.PLUGIN_ID + ".CHANGE_VARIABLE_VALUE_DIALOG_SECTION"; //$NON-NLS-1$
}
- @Override
+ @Override
protected IDialogSettings getDialogBoundsSettings() {
- IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings();
- IDialogSettings section = settings.getSection(getDialogSettingsSectionName());
- if (section == null) {
- section = settings.addNewSection(getDialogSettingsSectionName());
- }
- return section;
- }
+ IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings();
+ IDialogSettings section = settings.getSection(getDialogSettingsSectionName());
+ if (section == null) {
+ section = settings.addNewSection(getDialogSettingsSectionName());
+ }
+ return section;
+ }
@Override
protected void handleShellCloseEvent() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneAssignValueAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneAssignValueAction.java
index 03bb94293..95f1774b8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneAssignValueAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneAssignValueAction.java
@@ -46,7 +46,7 @@ import com.ibm.icu.text.MessageFormat;
*/
public class DetailPaneAssignValueAction extends Action{
- private IHandlerActivation fHandlerActivation;
+ private IHandlerActivation fHandlerActivation;
private IViewSite fViewSite;
private ITextViewer fTextViewer;
private IStructuredSelection fCurrentSelection;
@@ -67,46 +67,46 @@ public class DetailPaneAssignValueAction extends Action{
String modelIdentifier = variable.getModelIdentifier();
IVariableValueEditor editor = VariableValueEditorManager.getDefault().getVariableValueEditor(modelIdentifier);
if (editor != null) {
- if (editor.saveVariable(variable, newValueExpression, shell)) {
- // If we successfully delegate to an editor which performs the save,
- // don't do any more work.
- return;
- }
+ if (editor.saveVariable(variable, newValueExpression, shell)) {
+ // If we successfully delegate to an editor which performs the save,
+ // don't do any more work.
+ return;
+ }
}
try {
- // If we failed to delegate to anyone, perform the default assignment.
+ // If we failed to delegate to anyone, perform the default assignment.
if (variable.verifyValue(newValueExpression)) {
variable.setValue(newValueExpression);
} else {
- if (shell != null) {
+ if (shell != null) {
DebugUIPlugin.errorDialog(shell, ActionMessages.DetailPaneAssignValueAction_2, MessageFormat.format(ActionMessages.DetailPaneAssignValueAction_3, new Object[] {
newValueExpression, variable.getName() }), new StatusInfo(IStatus.ERROR, ActionMessages.DetailPaneAssignValueAction_4)); //
- }
+ }
}
} catch (DebugException e) {
- MessageDialog.openError(shell, ActionMessages.DetailPaneAssignValueAction_0, e.getStatus().getMessage());
+ MessageDialog.openError(shell, ActionMessages.DetailPaneAssignValueAction_0, e.getStatus().getMessage());
}
}
public DetailPaneAssignValueAction(ITextViewer textViewer, IViewSite viewSite) {
super(ActionMessages.DetailPaneAssignValueAction_1);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DETAIL_PANE_ASSIGN_VALUE_ACTION);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DETAIL_PANE_ASSIGN_VALUE_ACTION);
fTextViewer = textViewer;
fViewSite = viewSite;
setEnabled(false);
- IHandlerService service = fViewSite.getService(IHandlerService.class);
- ActionHandler handler = new ActionHandler(this);
- fHandlerActivation = service.activateHandler(getActionDefinitionId(), handler);
+ IHandlerService service = fViewSite.getService(IHandlerService.class);
+ ActionHandler handler = new ActionHandler(this);
+ fHandlerActivation = service.activateHandler(getActionDefinitionId(), handler);
}
public void dispose() {
- IHandlerService service = fViewSite.getService(IHandlerService.class);
- service.deactivateHandler(fHandlerActivation);
- }
+ IHandlerService service = fViewSite.getService(IHandlerService.class);
+ service.deactivateHandler(fHandlerActivation);
+ }
public void updateCurrentVariable(IStructuredSelection selection) {
boolean enabled = false;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java
index 7f97b1faf..7778425fe 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java
@@ -94,30 +94,30 @@ public class DetailPaneMaxLengthDialog extends TrayDialog {
@Override
protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- Label label = new Label(composite, SWT.WRAP);
- label.setText(VariablesViewMessages.DetailPaneMaxLengthDialog_1);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
- label.setLayoutData(data);
- label.setFont(parent.getFont());
- fTextWidget = new Text(composite, SWT.SINGLE | SWT.BORDER);
- fTextWidget.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
- fTextWidget.setText(fValue);
- fTextWidget.addModifyListener(new ModifyListener() {
- @Override
+ Composite composite = (Composite) super.createDialogArea(parent);
+ Label label = new Label(composite, SWT.WRAP);
+ label.setText(VariablesViewMessages.DetailPaneMaxLengthDialog_1);
+ GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
+ data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+ label.setLayoutData(data);
+ label.setFont(parent.getFont());
+ fTextWidget = new Text(composite, SWT.SINGLE | SWT.BORDER);
+ fTextWidget.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
+ fTextWidget.setText(fValue);
+ fTextWidget.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
- validateInput();
- fValue = fTextWidget.getText();
- }
- });
- fErrorTextWidget = new Text(composite, SWT.READ_ONLY);
- fErrorTextWidget.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
- | GridData.HORIZONTAL_ALIGN_FILL));
- fErrorTextWidget.setBackground(fErrorTextWidget.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
- setErrorMessage(fErrorMessage);
- applyDialogFont(composite);
- return composite;
+ validateInput();
+ fValue = fTextWidget.getText();
+ }
+ });
+ fErrorTextWidget = new Text(composite, SWT.READ_ONLY);
+ fErrorTextWidget.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
+ | GridData.HORIZONTAL_ALIGN_FILL));
+ fErrorTextWidget.setBackground(fErrorTextWidget.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+ setErrorMessage(fErrorMessage);
+ applyDialogFont(composite);
+ return composite;
}
@Override
@@ -133,43 +133,43 @@ public class DetailPaneMaxLengthDialog extends TrayDialog {
}
/**
- * Returns the string typed into this input dialog.
- *
- * @return the input string
- * @since 3.3
- */
- public String getValue() {
- return fValue;
- }
+ * Returns the string typed into this input dialog.
+ *
+ * @return the input string
+ * @since 3.3
+ */
+ public String getValue() {
+ return fValue;
+ }
- /**
- * Validates the current input
- * @since 3.3
- */
- private void validateInput() {
- String errorMessage = null;
- if (fValidator != null) {
- errorMessage = fValidator.isValid(fTextWidget.getText());
- }
- setErrorMessage(errorMessage);
- }
+ /**
+ * Validates the current input
+ * @since 3.3
+ */
+ private void validateInput() {
+ String errorMessage = null;
+ if (fValidator != null) {
+ errorMessage = fValidator.isValid(fTextWidget.getText());
+ }
+ setErrorMessage(errorMessage);
+ }
- /**
- * Sets the current error message or none if null
- * @param errorMessage the message to display
- * @since 3.3
- */
- public void setErrorMessage(String errorMessage) {
- fErrorMessage = errorMessage;
- if (fErrorTextWidget != null && !fErrorTextWidget.isDisposed()) {
- fErrorTextWidget.setText(errorMessage == null ? IInternalDebugCoreConstants.EMPTY_STRING : errorMessage);
- fErrorTextWidget.getParent().update();
- // Access the ok button by id, in case clients have overridden button creation.
- // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=113643
- Control button = getButton(IDialogConstants.OK_ID);
- if (button != null) {
- button.setEnabled(errorMessage == null);
- }
- }
- }
+ /**
+ * Sets the current error message or none if null
+ * @param errorMessage the message to display
+ * @since 3.3
+ */
+ public void setErrorMessage(String errorMessage) {
+ fErrorMessage = errorMessage;
+ if (fErrorTextWidget != null && !fErrorTextWidget.isDisposed()) {
+ fErrorTextWidget.setText(errorMessage == null ? IInternalDebugCoreConstants.EMPTY_STRING : errorMessage);
+ fErrorTextWidget.getParent().update();
+ // Access the ok button by id, in case clients have overridden button creation.
+ // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=113643
+ Control button = getButton(IDialogConstants.OK_ID);
+ if (button != null) {
+ button.setEnabled(errorMessage == null);
+ }
+ }
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointContainer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointContainer.java
index 997b219ff..784518d97 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointContainer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointContainer.java
@@ -28,28 +28,28 @@ import org.eclipse.debug.core.model.IBreakpoint;
*/
public interface IBreakpointContainer {
- /**
- * Returns the breakpoint organizer that this container uses.
- */
- IBreakpointOrganizer getOrganizer();
+ /**
+ * Returns the breakpoint organizer that this container uses.
+ */
+ IBreakpointOrganizer getOrganizer();
- /**
- * Returns the breakpoint category that this container is based on.
- * @return
- */
- IAdaptable getCategory();
+ /**
+ * Returns the breakpoint category that this container is based on.
+ * @return
+ */
+ IAdaptable getCategory();
- /**
- * Returns whether this breakpoint container contains the given breakpoint.
- *
- * @param breakpoint Breakpoint to check
- * @return Returns <code>true</code> if this container contains the
- * given breakpoint.
- */
- boolean contains(IBreakpoint breakpoint);
+ /**
+ * Returns whether this breakpoint container contains the given breakpoint.
+ *
+ * @param breakpoint Breakpoint to check
+ * @return Returns <code>true</code> if this container contains the
+ * given breakpoint.
+ */
+ boolean contains(IBreakpoint breakpoint);
- /**
- * Returns the array of breakpoints in this container.
- */
- IBreakpoint[] getBreakpoints();
+ /**
+ * Returns the array of breakpoints in this container.
+ */
+ IBreakpoint[] getBreakpoints();
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointOrganizer.java
index 49cca1221..c7c6d2d2e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointOrganizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointOrganizer.java
@@ -33,34 +33,34 @@ import org.eclipse.jface.resource.ImageDescriptor;
*/
public interface IBreakpointOrganizer extends IBreakpointOrganizerDelegate {
- /**
- * Returns a label for this breakpoint organizer.
- *
- * @return a label for this breakpoint organizer
- */
- String getLabel();
+ /**
+ * Returns a label for this breakpoint organizer.
+ *
+ * @return a label for this breakpoint organizer
+ */
+ String getLabel();
- /**
- * Returns an image descriptor for this breakpoint organizer or <code>null</code>.
- *
- * @return an image descriptor for this breakpoint organizer or <code>null</code>
- */
- ImageDescriptor getImageDescriptor();
+ /**
+ * Returns an image descriptor for this breakpoint organizer or <code>null</code>.
+ *
+ * @return an image descriptor for this breakpoint organizer or <code>null</code>
+ */
+ ImageDescriptor getImageDescriptor();
- /**
- * Returns a unique identifier for this breakpoint organizer.
- *
- * @return a unique identifier for this breakpoint organizer
- */
- String getIdentifier();
+ /**
+ * Returns a unique identifier for this breakpoint organizer.
+ *
+ * @return a unique identifier for this breakpoint organizer
+ */
+ String getIdentifier();
- /**
- * Returns the label for breakpoints that do not fall into a category
- * for this organizer.
- *
- * @return label for breakpoints that do not fall into a category
- * for this organizer
- */
- String getOthersLabel();
+ /**
+ * Returns the label for breakpoints that do not fall into a category
+ * for this organizer.
+ *
+ * @return label for breakpoints that do not fall into a category
+ * for this organizer
+ */
+ String getOthersLabel();
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointUIConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointUIConstants.java
index 8e4b027f0..9d572a681 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointUIConstants.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointUIConstants.java
@@ -19,49 +19,49 @@ package org.eclipse.debug.internal.ui.breakpoints.provisional;
* @since 3.6
*/
public interface IBreakpointUIConstants {
- /**
- * Breakpoints presentation context property used to retrieve the array of
- * breakpoint organizers. The expected property type is
- * <code>IBreakpointOrganizer[]</code>. If property value is <code>null</code>,
- * the breakpoint categories should not be shown.
- *
- * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext#getProperty(String)
- */
- String PROP_BREAKPOINTS_ORGANIZERS = "BreakpointOrganizers"; //$NON-NLS-1$
+ /**
+ * Breakpoints presentation context property used to retrieve the array of
+ * breakpoint organizers. The expected property type is
+ * <code>IBreakpointOrganizer[]</code>. If property value is <code>null</code>,
+ * the breakpoint categories should not be shown.
+ *
+ * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext#getProperty(String)
+ */
+ String PROP_BREAKPOINTS_ORGANIZERS = "BreakpointOrganizers"; //$NON-NLS-1$
- /**
- * Breakpoints presentation context property used to retrieve a flag
- * indicating whether the list of breakpoints should be filtered based
- * on the active debug context. The returned property value should
- * be of type <code>java.lang.Boolean</code>. If property value is
- * <code>null</code>, then value should be treated the same as
- * <code>Boolean.FALSE</code>.
- *
- * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext#getProperty(String)
- */
- String PROP_BREAKPOINTS_FILTER_SELECTION = "FilterSelection"; //$NON-NLS-1$
+ /**
+ * Breakpoints presentation context property used to retrieve a flag
+ * indicating whether the list of breakpoints should be filtered based
+ * on the active debug context. The returned property value should
+ * be of type <code>java.lang.Boolean</code>. If property value is
+ * <code>null</code>, then value should be treated the same as
+ * <code>Boolean.FALSE</code>.
+ *
+ * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext#getProperty(String)
+ */
+ String PROP_BREAKPOINTS_FILTER_SELECTION = "FilterSelection"; //$NON-NLS-1$
- /**
- * Breakpoints presentation context property used to retrieve a flag
- * indicating whether breakpoints view selection should be updated
- * upon a breakpoint event in debug model. The returned property value
- * should be of type <code>java.lang.Boolean</code>. If property value is
- * <code>null</code>, then value should be treated the same as
- * <code>Boolean.FALSE</code>.
- *
- * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext#getProperty(String)
- */
- String PROP_BREAKPOINTS_TRACK_SELECTION = "TrackSelection"; //$NON-NLS-1$
+ /**
+ * Breakpoints presentation context property used to retrieve a flag
+ * indicating whether breakpoints view selection should be updated
+ * upon a breakpoint event in debug model. The returned property value
+ * should be of type <code>java.lang.Boolean</code>. If property value is
+ * <code>null</code>, then value should be treated the same as
+ * <code>Boolean.FALSE</code>.
+ *
+ * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext#getProperty(String)
+ */
+ String PROP_BREAKPOINTS_TRACK_SELECTION = "TrackSelection"; //$NON-NLS-1$
- /**
- * Breakpoints presentation context property used to retrieve a
- * comparator for sorting breakpoints. The returned property value should
- * be of type <code>java.util.Comparator</code>. If property value is
- * <code>null</code>, the breakpoints should not be sorted.
- *
- * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext#getProperty(String)
- */
- String PROP_BREAKPOINTS_ELEMENT_COMPARATOR = "ElementComparator"; //$NON-NLS-1$
+ /**
+ * Breakpoints presentation context property used to retrieve a
+ * comparator for sorting breakpoints. The returned property value should
+ * be of type <code>java.util.Comparator</code>. If property value is
+ * <code>null</code>, the breakpoints should not be sorted.
+ *
+ * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext#getProperty(String)
+ */
+ String PROP_BREAKPOINTS_ELEMENT_COMPARATOR = "ElementComparator"; //$NON-NLS-1$
String PROP_BREAKPOINTS_ELEMENT_COMPARATOR_SORT = "ElementComparatorSort"; //$NON-NLS-1$
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/OtherBreakpointCategory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/OtherBreakpointCategory.java
index 9705e1459..07fedbb26 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/OtherBreakpointCategory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/OtherBreakpointCategory.java
@@ -37,58 +37,58 @@ import org.eclipse.ui.model.IWorkbenchAdapter;
public class OtherBreakpointCategory extends PlatformObject implements IWorkbenchAdapter {
private static Map<IBreakpointOrganizer, IAdaptable[]> fOthers = new HashMap<>();
- private IBreakpointOrganizer fOrganizer;
+ private IBreakpointOrganizer fOrganizer;
- public static IAdaptable[] getCategories(IBreakpointOrganizer organizer) {
- IAdaptable[] others = fOthers.get(organizer);
- if (others == null) {
- others = new IAdaptable[]{new OtherBreakpointCategory(organizer)};
- fOthers.put(organizer, others);
- }
- return others;
- }
+ public static IAdaptable[] getCategories(IBreakpointOrganizer organizer) {
+ IAdaptable[] others = fOthers.get(organizer);
+ if (others == null) {
+ others = new IAdaptable[]{new OtherBreakpointCategory(organizer)};
+ fOthers.put(organizer, others);
+ }
+ return others;
+ }
- /**
- * Constructs an 'other' category for the given organizer.
- *
- * @param organizer breakpoint organizer
- */
- private OtherBreakpointCategory(IBreakpointOrganizer organizer) {
- fOrganizer = organizer;
- }
+ /**
+ * Constructs an 'other' category for the given organizer.
+ *
+ * @param organizer breakpoint organizer
+ */
+ private OtherBreakpointCategory(IBreakpointOrganizer organizer) {
+ fOrganizer = organizer;
+ }
- @Override
+ @Override
public Object[] getChildren(Object o) {
- return null;
- }
+ return null;
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
- return DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_VIEW_BREAKPOINTS);
- }
+ return DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_VIEW_BREAKPOINTS);
+ }
- @Override
+ @Override
public String getLabel(Object o) {
- return fOrganizer.getOthersLabel();
- }
+ return fOrganizer.getOthersLabel();
+ }
- @Override
+ @Override
public Object getParent(Object o) {
- return null;
- }
+ return null;
+ }
- @Override
+ @Override
public boolean equals(Object obj) {
- if (obj instanceof OtherBreakpointCategory) {
- OtherBreakpointCategory category = (OtherBreakpointCategory) obj;
- return fOrganizer.equals(category.fOrganizer);
- }
- return false;
- }
+ if (obj instanceof OtherBreakpointCategory) {
+ OtherBreakpointCategory category = (OtherBreakpointCategory) obj;
+ return fOrganizer.equals(category.fOrganizer);
+ }
+ return false;
+ }
- @Override
+ @Override
public int hashCode() {
- return fOrganizer.hashCode();
- }
+ return fOrganizer.hashCode();
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandActionDelegate.java
index 543811965..6bcd36dfd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandActionDelegate.java
@@ -30,40 +30,40 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate;
public abstract class DebugCommandActionDelegate implements IWorkbenchWindowActionDelegate, IActionDelegate2 {
/**
- *The real action for this delegate
+ *The real action for this delegate
*/
private DebugCommandAction fDebugAction;
protected void setAction(DebugCommandAction action) {
- fDebugAction = action;
+ fDebugAction = action;
}
@Override
public void dispose() {
- fDebugAction.dispose();
+ fDebugAction.dispose();
}
- @Override
+ @Override
public void init(IAction action) {
- fDebugAction.setActionProxy(action);
- }
+ fDebugAction.setActionProxy(action);
+ }
- @Override
+ @Override
public void init(IWorkbenchWindow window) {
- fDebugAction.init(window);
+ fDebugAction.init(window);
}
@Override
public void run(IAction action) {
- fDebugAction.run();
+ fDebugAction.run();
}
@Override
public void runWithEvent(IAction action, Event event) {
- run(action);
- }
+ run(action);
+ }
- @Override
+ @Override
public void selectionChanged(IAction action, ISelection s) {
// do nothing
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandService.java
index 4fe6ec3dc..dcfc2e279 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandService.java
@@ -247,9 +247,9 @@ public class DebugCommandService implements IDebugContextListener {
*/
private Map<IDebugCommandHandler, List<Object>> collate(Object[] elements, Class<?> handlerType) {
Map<IDebugCommandHandler, List<Object>> map = new HashMap<>();
- for (int i = 0; i < elements.length; i++) {
- Object element = elements[i];
- IDebugCommandHandler handler = getHandler(element, handlerType);
+ for (int i = 0; i < elements.length; i++) {
+ Object element = elements[i];
+ IDebugCommandHandler handler = getHandler(element, handlerType);
if (handler == null) {
return null;
} else {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java
index 7c7a95f6f..ee57b97ef 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java
@@ -27,44 +27,44 @@ import org.eclipse.jface.resource.ImageDescriptor;
*/
public class DisconnectCommandAction extends DebugCommandAction{
- public DisconnectCommandAction() {
- setActionDefinitionId("org.eclipse.debug.ui.commands.Disconnect"); //$NON-NLS-1$
- }
+ public DisconnectCommandAction() {
+ setActionDefinitionId("org.eclipse.debug.ui.commands.Disconnect"); //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getText() {
- return ActionMessages.DisconnectAction_0;
- }
+ return ActionMessages.DisconnectAction_0;
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.disconnect_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.disconnect_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.debugview.toolbar.disconnect"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.debugview.toolbar.disconnect"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.DisconnectAction_3;
- }
+ return ActionMessages.DisconnectAction_3;
+ }
- @Override
+ @Override
public ImageDescriptor getDisabledImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DISCONNECT);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DISCONNECT);
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT);
- }
+ return DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT);
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT);
- }
+ return DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT);
+ }
@Override
protected Class<IDisconnectHandler> getCommandType() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandHandler.java
index 9a3ff7cb1..be5c2c649 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandHandler.java
@@ -25,9 +25,9 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler;
*/
public class DisconnectCommandHandler extends DebugCommandHandler {
- @Override
+ @Override
protected Class<IDisconnectHandler> getCommandType() {
- return IDisconnectHandler.class;
- }
+ return IDisconnectHandler.class;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java
index 99c626d83..c9aafc8d4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java
@@ -27,39 +27,39 @@ import org.eclipse.jface.resource.ImageDescriptor;
*/
public class DropToFrameCommandAction extends DebugCommandAction {
- public DropToFrameCommandAction() {
- setActionDefinitionId("org.eclipse.debug.ui.commands.DropToFrame"); //$NON-NLS-1$
- }
+ public DropToFrameCommandAction() {
+ setActionDefinitionId("org.eclipse.debug.ui.commands.DropToFrame"); //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getText() {
- return ActionMessages.DropToFrameAction_0;
- }
+ return ActionMessages.DropToFrameAction_0;
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.drop_to_frame_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.drop_to_frame_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.debugview.toolbar.dropToFrame"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.debugview.toolbar.dropToFrame"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.DropToFrameAction_3;
- }
+ return ActionMessages.DropToFrameAction_3;
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DROP_TO_FRAME);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DROP_TO_FRAME);
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DROP_TO_FRAME);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DROP_TO_FRAME);
+ }
@Override
public ImageDescriptor getDisabledImageDescriptor() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandHandler.java
index e55513950..6e25f25a0 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandHandler.java
@@ -25,9 +25,9 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler;
*/
public class DropToFrameCommandHandler extends DebugCommandHandler {
- @Override
+ @Override
protected Class<IDropToFrameHandler> getCommandType() {
- return IDropToFrameHandler.class;
- }
+ return IDropToFrameHandler.class;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ExecuteActionRequest.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ExecuteActionRequest.java
index be54459b9..dea989ae2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ExecuteActionRequest.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ExecuteActionRequest.java
@@ -33,29 +33,29 @@ public class ExecuteActionRequest extends DebugCommandRequest {
super(elements);
}
- @Override
+ @Override
public void done() {
- if (fParticipant != null) {
+ if (fParticipant != null) {
fParticipant.requestDone(this);
fParticipant = null;
}
- final IStatus status = getStatus();
- if (status != null) {
- switch (status.getSeverity()) {
- case IStatus.ERROR:
+ final IStatus status = getStatus();
+ if (status != null) {
+ switch (status.getSeverity()) {
+ case IStatus.ERROR:
DebugUIPlugin.getStandardDisplay().asyncExec(() -> MessageDialog.openError(DebugUIPlugin.getShell(), DebugUIMessages.DebugUITools_Error_1, status.getMessage()));
- break;
- case IStatus.WARNING:
+ break;
+ case IStatus.WARNING:
DebugUIPlugin.getStandardDisplay().asyncExec(() -> MessageDialog.openWarning(DebugUIPlugin.getShell(), DebugUIMessages.DebugUITools_Error_1, status.getMessage()));
- break;
- case IStatus.INFO:
+ break;
+ case IStatus.INFO:
DebugUIPlugin.getStandardDisplay().asyncExec(() -> MessageDialog.openInformation(DebugUIPlugin.getShell(), DebugUIMessages.DebugUITools_Error_1, status.getMessage()));
- break;
+ break;
default:
break;
- }
- }
- }
+ }
+ }
+ }
public void setCommandParticipant(ICommandParticipant participant) {
fParticipant = participant;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/IEnabledTarget.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/IEnabledTarget.java
index adfc68e20..c46dc71cf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/IEnabledTarget.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/IEnabledTarget.java
@@ -17,5 +17,5 @@ package org.eclipse.debug.internal.ui.commands.actions;
*
*/
public interface IEnabledTarget {
- void setEnabled(boolean enabled);
+ void setEnabled(boolean enabled);
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java
index 0bd831c86..7adc14347 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java
@@ -28,49 +28,49 @@ import org.eclipse.jface.resource.ImageDescriptor;
*/
public class RestartCommandAction extends DebugCommandAction {
- public RestartCommandAction() {
- setActionDefinitionId("org.eclipse.debug.ui.commands.Restart"); //$NON-NLS-1$
- }
+ public RestartCommandAction() {
+ setActionDefinitionId("org.eclipse.debug.ui.commands.Restart"); //$NON-NLS-1$
+ }
- @Override
+ @Override
protected Class<IRestartHandler> getCommandType() {
- return IRestartHandler.class;
- }
+ return IRestartHandler.class;
+ }
- @Override
+ @Override
public ImageDescriptor getDisabledImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESTART);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESTART);
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.restart_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.restart_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESTART);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESTART);
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.actions.Restart"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.actions.Restart"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESTART);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESTART);
+ }
- @Override
+ @Override
public String getText() {
- return ActionMessages.RestartCommandAction__text;
- }
+ return ActionMessages.RestartCommandAction__text;
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.RestartCommandAction_tooltip;
- }
+ return ActionMessages.RestartCommandAction_tooltip;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandActionDelegate.java
index dba235d9e..7f413108a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandActionDelegate.java
@@ -29,36 +29,36 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate;
*/
public class RestartCommandActionDelegate implements IWorkbenchWindowActionDelegate, IActionDelegate2 {
- private DebugCommandAction fDebugAction = new RestartCommandAction();
+ private DebugCommandAction fDebugAction = new RestartCommandAction();
- @Override
+ @Override
public void dispose() {
- fDebugAction.dispose();
- }
+ fDebugAction.dispose();
+ }
- @Override
+ @Override
public void init(IWorkbenchWindow window) {
- fDebugAction.init(window);
- }
+ fDebugAction.init(window);
+ }
- @Override
+ @Override
public void run(IAction action) {
- fDebugAction.run();
- }
+ fDebugAction.run();
+ }
- @Override
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
- // do nothing
- }
+ // do nothing
+ }
- @Override
+ @Override
public void init(IAction action) {
- fDebugAction.setActionProxy(action);
+ fDebugAction.setActionProxy(action);
- }
+ }
- @Override
+ @Override
public void runWithEvent(IAction action, Event event) {
- run(action);
- }
+ run(action);
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandHandler.java
index e11c920b8..dab0b811a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandHandler.java
@@ -24,9 +24,9 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler;
*/
public class RestartCommandHandler extends DebugCommandHandler {
- @Override
+ @Override
protected Class<IRestartHandler> getCommandType() {
- return IRestartHandler.class;
- }
+ return IRestartHandler.class;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java
index ffab51b78..b53706650 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java
@@ -31,40 +31,40 @@ public class ResumeCommandAction extends DebugCommandAction{
setActionDefinitionId("org.eclipse.debug.ui.commands.Resume"); //$NON-NLS-1$
}
- @Override
+ @Override
public String getText() {
- return ActionMessages.ResumeAction_0;
- }
+ return ActionMessages.ResumeAction_0;
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.resume_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.resume_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.debugview.toolbar.resume"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.debugview.toolbar.resume"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.ResumeAction_3;
- }
+ return ActionMessages.ResumeAction_3;
+ }
- @Override
+ @Override
public ImageDescriptor getDisabledImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESUME);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESUME);
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESUME);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESUME);
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESUME);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESUME);
+ }
@Override
protected Class<IResumeHandler> getCommandType() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandActionDelegate.java
index 783322f51..762356a13 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandActionDelegate.java
@@ -29,36 +29,36 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate;
*/
public class ResumeCommandActionDelegate implements IWorkbenchWindowActionDelegate, IActionDelegate2 {
- private DebugCommandAction fDebugAction = new ResumeCommandAction();
+ private DebugCommandAction fDebugAction = new ResumeCommandAction();
- @Override
+ @Override
public void dispose() {
- fDebugAction.dispose();
- }
+ fDebugAction.dispose();
+ }
- @Override
+ @Override
public void init(IWorkbenchWindow window) {
- fDebugAction.init(window);
- }
+ fDebugAction.init(window);
+ }
- @Override
+ @Override
public void run(IAction action) {
- fDebugAction.run();
- }
+ fDebugAction.run();
+ }
- @Override
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
- // do nothing
- }
+ // do nothing
+ }
- @Override
+ @Override
public void init(IAction action) {
- fDebugAction.setActionProxy(action);
+ fDebugAction.setActionProxy(action);
- }
+ }
- @Override
+ @Override
public void runWithEvent(IAction action, Event event) {
- run(action);
- }
+ run(action);
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandHandler.java
index 7b701790d..a9e747135 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandHandler.java
@@ -25,9 +25,9 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler;
*/
public class ResumeCommandHandler extends DebugCommandHandler {
- @Override
+ @Override
protected Class<IResumeHandler> getCommandType() {
- return IResumeHandler.class;
- }
+ return IResumeHandler.class;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java
index 13387bc1a..6efe806ca 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java
@@ -31,40 +31,40 @@ public class StepIntoCommandAction extends DebugCommandAction {
setActionDefinitionId("org.eclipse.debug.ui.commands.StepInto"); //$NON-NLS-1$
}
- @Override
+ @Override
public String getText() {
- return ActionMessages.StepIntoAction_0;
- }
+ return ActionMessages.StepIntoAction_0;
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.step_into_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.step_into_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.debugview.toolbar.stepInto"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.debugview.toolbar.stepInto"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.StepIntoAction_3;
- }
+ return ActionMessages.StepIntoAction_3;
+ }
- @Override
+ @Override
public ImageDescriptor getDisabledImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_INTO);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_INTO);
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO);
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO);
+ }
@Override
protected Class<IStepIntoHandler> getCommandType() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandActionDelegate.java
index 0c7f9dac8..142262430 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandActionDelegate.java
@@ -21,10 +21,10 @@ package org.eclipse.debug.internal.ui.commands.actions;
*/
public class StepIntoCommandActionDelegate extends DebugCommandActionDelegate {
- public StepIntoCommandActionDelegate() {
- super();
- setAction(new StepIntoCommandAction());
- }
+ public StepIntoCommandActionDelegate() {
+ super();
+ setAction(new StepIntoCommandAction());
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java
index 6479d08e3..be170bb87 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java
@@ -25,9 +25,9 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler;
*/
public class StepIntoCommandHandler extends DebugCommandHandler {
- @Override
+ @Override
protected Class<IStepIntoHandler> getCommandType() {
- return IStepIntoHandler.class;
- }
+ return IStepIntoHandler.class;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java
index 9ef7235be..530a8254b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java
@@ -32,40 +32,40 @@ public class StepOverCommandAction extends DebugCommandAction {
setActionDefinitionId("org.eclipse.debug.ui.commands.StepOver"); //$NON-NLS-1$
}
- @Override
+ @Override
public String getText() {
- return ActionMessages.StepOverAction_0;
- }
+ return ActionMessages.StepOverAction_0;
+ }
- @Override
+ @Override
public ImageDescriptor getDisabledImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_OVER);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_OVER);
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.step_over_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.step_over_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_OVER);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_OVER);
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.debugview.toolbar.stepOver"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.debugview.toolbar.stepOver"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_OVER);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_OVER);
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.StepOverAction_3;
- }
+ return ActionMessages.StepOverAction_3;
+ }
@Override
protected Class<IStepOverHandler> getCommandType() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandActionDelegate.java
index 3dfa7fe3f..a0d6fa9fa 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandActionDelegate.java
@@ -23,15 +23,15 @@ import org.eclipse.jface.action.IAction;
*/
public class StepOverCommandActionDelegate extends DebugCommandActionDelegate {
- public StepOverCommandActionDelegate() {
- super();
- setAction(new StepOverCommandAction());
- }
+ public StepOverCommandActionDelegate() {
+ super();
+ setAction(new StepOverCommandAction());
+ }
- @Override
+ @Override
public void init(IAction action) {
- super.init(action);
- }
+ super.init(action);
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java
index a0f65c34f..0200431d6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java
@@ -24,9 +24,9 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler;
*/
public class StepOverCommandHandler extends DebugCommandHandler {
- @Override
+ @Override
protected Class<IStepOverHandler> getCommandType() {
- return IStepOverHandler.class;
- }
+ return IStepOverHandler.class;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java
index 15b1721fb..171e9c5dd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java
@@ -32,40 +32,40 @@ public class StepReturnCommandAction extends DebugCommandAction {
setActionDefinitionId("org.eclipse.debug.ui.commands.StepReturn"); //$NON-NLS-1$
}
- @Override
+ @Override
public ImageDescriptor getDisabledImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_RETURN);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_RETURN);
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.step_return_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.step_return_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_RETURN);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_RETURN);
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.debugview.toolbar.stepReturn"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.debugview.toolbar.stepReturn"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_RETURN);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_RETURN);
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.StepReturnAction_2;
- }
+ return ActionMessages.StepReturnAction_2;
+ }
- @Override
+ @Override
public String getText() {
- return ActionMessages.StepReturnAction_3;
- }
+ return ActionMessages.StepReturnAction_3;
+ }
@Override
protected Class<IStepReturnHandler> getCommandType() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandActionDelegate.java
index 847f85f68..8a1cab3b6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandActionDelegate.java
@@ -21,10 +21,10 @@ package org.eclipse.debug.internal.ui.commands.actions;
*/
public class StepReturnCommandActionDelegate extends DebugCommandActionDelegate {
- public StepReturnCommandActionDelegate() {
- super();
- setAction(new StepReturnCommandAction());
- }
+ public StepReturnCommandActionDelegate() {
+ super();
+ setAction(new StepReturnCommandAction());
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandHandler.java
index c838fde75..02aacafd2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandHandler.java
@@ -25,9 +25,9 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler;
*/
public class StepReturnCommandHandler extends DebugCommandHandler {
- @Override
+ @Override
protected Class<IStepReturnHandler> getCommandType() {
- return IStepReturnHandler.class;
- }
+ return IStepReturnHandler.class;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java
index a25e4a59d..e32cd6bae 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java
@@ -27,44 +27,44 @@ import org.eclipse.jface.resource.ImageDescriptor;
*/
public class SuspendCommandAction extends DebugCommandAction {
- public SuspendCommandAction() {
- setActionDefinitionId("org.eclipse.debug.ui.commands.Suspend"); //$NON-NLS-1$
- }
+ public SuspendCommandAction() {
+ setActionDefinitionId("org.eclipse.debug.ui.commands.Suspend"); //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getText() {
- return ActionMessages.SuspendAction_0;
- }
+ return ActionMessages.SuspendAction_0;
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.suspend_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.suspend_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.commands.Suspend"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.commands.Suspend"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.SuspendAction_3;
- }
+ return ActionMessages.SuspendAction_3;
+ }
- @Override
+ @Override
public ImageDescriptor getDisabledImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_SUSPEND);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_SUSPEND);
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SUSPEND);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SUSPEND);
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SUSPEND);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SUSPEND);
+ }
@Override
protected Class<ISuspendHandler> getCommandType() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandActionDelegate.java
index 3c7386d56..de72598f5 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandActionDelegate.java
@@ -21,10 +21,10 @@ package org.eclipse.debug.internal.ui.commands.actions;
*/
public class SuspendCommandActionDelegate extends DebugCommandActionDelegate {
- public SuspendCommandActionDelegate() {
- super();
- setAction(new SuspendCommandAction());
- }
+ public SuspendCommandActionDelegate() {
+ super();
+ setAction(new SuspendCommandAction());
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandHandler.java
index b2ad3106a..8c8e8e20b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandHandler.java
@@ -25,9 +25,9 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler;
*/
public class SuspendCommandHandler extends DebugCommandHandler {
- @Override
+ @Override
protected Class<ISuspendHandler> getCommandType() {
- return ISuspendHandler.class;
- }
+ return ISuspendHandler.class;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java
index 65c811c6b..31a513e95 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java
@@ -39,9 +39,9 @@ import org.eclipse.jface.viewers.StructuredSelection;
*/
public class TerminateAndRelaunchAction extends DebugCommandAction {
- @Override
+ @Override
public void postExecute(IRequest request, final Object[] targets) {
- if (request.getStatus() == null || request.getStatus().isOK()) {
+ if (request.getStatus() == null || request.getStatus().isOK()) {
DebugUIPlugin.getStandardDisplay().asyncExec(() -> {
// Must be run in the UI thread since the launch can require
// prompting to proceed
@@ -52,26 +52,26 @@ public class TerminateAndRelaunchAction extends DebugCommandAction {
}
}
});
- }
- }
+ }
+ }
- @Override
+ @Override
protected ISelection getContext() {
- // Convert action context to contain only launch objects (bug 356651).
- ISelection context = super.getContext();
- if (context instanceof IStructuredSelection && !context.isEmpty()) {
- IStructuredSelection ss = (IStructuredSelection)context;
+ // Convert action context to contain only launch objects (bug 356651).
+ ISelection context = super.getContext();
+ if (context instanceof IStructuredSelection && !context.isEmpty()) {
+ IStructuredSelection ss = (IStructuredSelection)context;
Set<ILaunch> launches = new HashSet<>(ss.size());
for (Iterator<Object> itr = ss.iterator(); itr.hasNext();) {
- ILaunch launch = DebugUIPlugin.getLaunch(itr.next());
- if (launch != null) {
- launches.add(launch);
- }
- }
- return new StructuredSelection(launches.toArray());
- }
- return super.getContext();
- }
+ ILaunch launch = DebugUIPlugin.getLaunch(itr.next());
+ if (launch != null) {
+ launches.add(launch);
+ }
+ }
+ return new StructuredSelection(launches.toArray());
+ }
+ return super.getContext();
+ }
@Override
@@ -94,54 +94,54 @@ public class TerminateAndRelaunchAction extends DebugCommandAction {
super.debugContextChanged(event);
}
- protected boolean canRelaunch(Object element) {
- ILaunch launch = DebugUIPlugin.getLaunch(element);
- if (launch != null) {
- ILaunchConfiguration configuration = launch.getLaunchConfiguration();
- if (configuration != null) {
- return LaunchConfigurationManager.isVisible(configuration);
- }
- }
+ protected boolean canRelaunch(Object element) {
+ ILaunch launch = DebugUIPlugin.getLaunch(element);
+ if (launch != null) {
+ ILaunchConfiguration configuration = launch.getLaunchConfiguration();
+ if (configuration != null) {
+ return LaunchConfigurationManager.isVisible(configuration);
+ }
+ }
return false;
- }
+ }
- @Override
+ @Override
public String getActionDefinitionId() {
- return ActionMessages.TerminateAndRelaunchAction_0;
- }
+ return ActionMessages.TerminateAndRelaunchAction_0;
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.terminate_and_relaunch_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.terminate_and_relaunch_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.debugview.popupMenu.TerminateAndRelaunch"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.debugview.popupMenu.TerminateAndRelaunch"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getText() {
- return ActionMessages.TerminateAndRelaunchAction_3;
- }
+ return ActionMessages.TerminateAndRelaunchAction_3;
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.TerminateAndRelaunchAction_4;
- }
+ return ActionMessages.TerminateAndRelaunchAction_4;
+ }
- @Override
+ @Override
public ImageDescriptor getDisabledImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_RELAUNCH);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_RELAUNCH);
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH);
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH);
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java
index 3eaf360ca..40ad431b6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java
@@ -53,120 +53,120 @@ public class TerminateAndRemoveAction extends DebugCommandAction {
*/
private IWorkbenchPart fMyPart = null;
- @Override
+ @Override
public String getText() {
- return ActionMessages.TerminateAndRemoveAction_0;
- }
+ return ActionMessages.TerminateAndRemoveAction_0;
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.terminate_and_remove_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.terminate_and_remove_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.debugview.popupMenu.terminateAndRemove"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.debugview.popupMenu.terminateAndRemove"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.TerminateAndRemoveAction_3;
- }
+ return ActionMessages.TerminateAndRemoveAction_3;
+ }
- @Override
+ @Override
public ImageDescriptor getDisabledImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_REMOVE);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_REMOVE);
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE);
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE);
+ }
- @Override
+ @Override
protected Class<ITerminateHandler> getCommandType() {
return ITerminateHandler.class;
}
- @Override
+ @Override
public void debugContextChanged(DebugContextEvent event) {
- boolean isAllTerminated = true;
- ISelection context = event.getContext();
- if (context instanceof IStructuredSelection) {
- Object[] elements = ((IStructuredSelection)context).toArray();
- for (int i = 0; i < elements.length; i++) {
- if (!isTerminated(elements[i])) {
- isAllTerminated = false;
- break;
- }
- }
- }
- // IF all elements are terminated, we don't need to query the terminate handler, just
- // enable the action, which whill just remove the terminated launches (bug 324959).
- fCanTerminate = !isAllTerminated;
- if (isAllTerminated) {
- setEnabled(true);
- } else {
- super.debugContextChanged(event);
- }
- }
-
- protected boolean isTerminated(Object element) {
- ILaunch launch = DebugUIPlugin.getLaunch(element);
- if (launch != null) {
- return launch.isTerminated();
- }
- return false;
- }
-
-
- @Override
+ boolean isAllTerminated = true;
+ ISelection context = event.getContext();
+ if (context instanceof IStructuredSelection) {
+ Object[] elements = ((IStructuredSelection)context).toArray();
+ for (int i = 0; i < elements.length; i++) {
+ if (!isTerminated(elements[i])) {
+ isAllTerminated = false;
+ break;
+ }
+ }
+ }
+ // IF all elements are terminated, we don't need to query the terminate handler, just
+ // enable the action, which whill just remove the terminated launches (bug 324959).
+ fCanTerminate = !isAllTerminated;
+ if (isAllTerminated) {
+ setEnabled(true);
+ } else {
+ super.debugContextChanged(event);
+ }
+ }
+
+ protected boolean isTerminated(Object element) {
+ ILaunch launch = DebugUIPlugin.getLaunch(element);
+ if (launch != null) {
+ return launch.isTerminated();
+ }
+ return false;
+ }
+
+
+ @Override
protected void postExecute(IRequest request, Object[] targets) {
- IStatus status = request.getStatus();
- if(status == null || status.isOK()) {
- for (int i = 0; i < targets.length; i++) {
- ILaunch launch = DebugUIPlugin.getLaunch(targets[i]);
- if (launch != null) {
+ IStatus status = request.getStatus();
+ if(status == null || status.isOK()) {
+ for (int i = 0; i < targets.length; i++) {
+ ILaunch launch = DebugUIPlugin.getLaunch(targets[i]);
+ if (launch != null) {
DebugPlugin.getDefault().getLaunchManager().removeLaunch(launch);
}
- }
- }
- }
+ }
+ }
+ }
- @Override
+ @Override
public void runWithEvent(Event event) {
- if (fCanTerminate) {
+ if (fCanTerminate) {
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (window != null) {
- if (!MessageDialog.openQuestion(window.getShell(), DebugUIViewsMessages.LaunchView_Terminate_and_Remove_1, DebugUIViewsMessages.LaunchView_Terminate_and_remove_selected__2)) {
+ if (window != null) {
+ if (!MessageDialog.openQuestion(window.getShell(), DebugUIViewsMessages.LaunchView_Terminate_and_Remove_1, DebugUIViewsMessages.LaunchView_Terminate_and_remove_selected__2)) {
return;
}
- }
- super.runWithEvent(event);
- } else {
- // don't terminate, just remove
- // TODO: make #getContext() API in next release
- ISelection sel = null;
- if (fMyPart != null) {
- sel = getDebugContextService().getActiveContext(fMyPart.getSite().getId());
- } else {
- sel = getDebugContextService().getActiveContext();
- }
- if (sel instanceof IStructuredSelection) {
- IStructuredSelection ss = (IStructuredSelection) sel;
- postExecute(new Request(), ss.toArray());
- }
- }
- }
-
- @Override
+ }
+ super.runWithEvent(event);
+ } else {
+ // don't terminate, just remove
+ // TODO: make #getContext() API in next release
+ ISelection sel = null;
+ if (fMyPart != null) {
+ sel = getDebugContextService().getActiveContext(fMyPart.getSite().getId());
+ } else {
+ sel = getDebugContextService().getActiveContext();
+ }
+ if (sel instanceof IStructuredSelection) {
+ IStructuredSelection ss = (IStructuredSelection) sel;
+ postExecute(new Request(), ss.toArray());
+ }
+ }
+ }
+
+ @Override
public void init(IWorkbenchPart part) {
- super.init(part); // TODO: if #getContext() was API, this would not be needed
- fMyPart = part;
- }
+ super.init(part); // TODO: if #getContext() was API, this would not be needed
+ fMyPart = part;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java
index 84ae64f28..8c60f211a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java
@@ -31,40 +31,40 @@ public class TerminateCommandAction extends DebugCommandAction {
setActionDefinitionId("org.eclipse.debug.ui.commands.Terminate"); //$NON-NLS-1$
}
- @Override
+ @Override
public String getText() {
- return ActionMessages.TerminateAction_0;
- }
+ return ActionMessages.TerminateAction_0;
+ }
- @Override
+ @Override
public String getHelpContextId() {
- return "org.eclipse.debug.ui.terminate_action_context"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.terminate_action_context"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getId() {
- return "org.eclipse.debug.ui.debugview.toolbar.terminate"; //$NON-NLS-1$
- }
+ return "org.eclipse.debug.ui.debugview.toolbar.terminate"; //$NON-NLS-1$
+ }
- @Override
+ @Override
public String getToolTipText() {
- return ActionMessages.TerminateAction_3;
- }
+ return ActionMessages.TerminateAction_3;
+ }
- @Override
+ @Override
public ImageDescriptor getDisabledImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE);
+ }
- @Override
+ @Override
public ImageDescriptor getHoverImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE);
+ }
- @Override
+ @Override
public ImageDescriptor getImageDescriptor() {
- return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE);
- }
+ return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE);
+ }
@Override
protected Class<ITerminateHandler> getCommandType() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandActionDelegate.java
index d2c5d1ce5..7f1a77480 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandActionDelegate.java
@@ -21,10 +21,10 @@ package org.eclipse.debug.internal.ui.commands.actions;
*/
public class TerminateCommandActionDelegate extends DebugCommandActionDelegate {
- public TerminateCommandActionDelegate() {
- super();
- setAction(new TerminateCommandAction());
- }
+ public TerminateCommandActionDelegate() {
+ super();
+ setAction(new TerminateCommandAction());
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandHandler.java
index 9fc2cda56..a0a67efa9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandHandler.java
@@ -25,9 +25,9 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler;
*/
public class TerminateCommandHandler extends DebugCommandHandler {
- @Override
+ @Override
protected Class<ITerminateHandler> getCommandType() {
- return ITerminateHandler.class;
- }
+ return ITerminateHandler.class;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java
index bd69e7102..60b5eb8ad 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java
@@ -111,28 +111,28 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref
return IStepFiltersHandler.class;
}
- /**
- * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#run()
- */
- @Override
+ /**
+ * @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#run()
+ */
+ @Override
public void run() {
- // ignore initial call to run from abstract debug view
- // that runs the action to initialize it's state when
- // the workbench persisted the action as "on"
- if (fInitialized) {
- DebugUITools.setUseStepFilters(!DebugUITools.isUseStepFilters());
- } else {
- fInitialized = true;
- }
- }
-
- /**
- * @see org.eclipse.jface.action.Action#getStyle()
- */
- @Override
+ // ignore initial call to run from abstract debug view
+ // that runs the action to initialize it's state when
+ // the workbench persisted the action as "on"
+ if (fInitialized) {
+ DebugUITools.setUseStepFilters(!DebugUITools.isUseStepFilters());
+ } else {
+ fInitialized = true;
+ }
+ }
+
+ /**
+ * @see org.eclipse.jface.action.Action#getStyle()
+ */
+ @Override
public int getStyle() {
- return AS_CHECK_BOX;
- }
+ return AS_CHECK_BOX;
+ }
/**
* @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#debugContextChanged(org.eclipse.debug.ui.contexts.DebugContextEvent)
@@ -165,15 +165,15 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref
initState();
}
- /**
- * Initializes the state, by adding this action as a property listener
- */
- protected void initState() {
+ /**
+ * Initializes the state, by adding this action as a property listener
+ */
+ protected void initState() {
IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugPlugin.getUniqueIdentifier());
if (node != null) {
node.addPreferenceChangeListener(this);
}
- }
+ }
/**
* @see org.eclipse.debug.internal.ui.commands.actions.DebugCommandAction#dispose()
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandActionDelegate.java
index 10b369b84..983fdf372 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandActionDelegate.java
@@ -24,17 +24,17 @@ import org.eclipse.jface.action.IAction;
*/
public class ToggleStepFiltersCommandActionDelegate extends DebugCommandActionDelegate {
- /**
- * Constructor
- */
- public ToggleStepFiltersCommandActionDelegate() {
- super();
- setAction(new ToggleStepFiltersAction());
- }
+ /**
+ * Constructor
+ */
+ public ToggleStepFiltersCommandActionDelegate() {
+ super();
+ setAction(new ToggleStepFiltersAction());
+ }
- @Override
+ @Override
public void init(IAction action) {
- super.init(action);
- action.setChecked(DebugUITools.isUseStepFilters());
- }
+ super.init(action);
+ action.setChecked(DebugUITools.isUseStepFilters());
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandHandler.java
index 8aa7376e7..626f89979 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersCommandHandler.java
@@ -25,9 +25,9 @@ import org.eclipse.debug.ui.actions.DebugCommandHandler;
*/
public class ToggleStepFiltersCommandHandler extends DebugCommandHandler {
- @Override
+ @Override
protected Class<IStepFiltersHandler> getCommandType() {
- return IStepFiltersHandler.class;
- }
+ return IStepFiltersHandler.class;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java
index 26189abdc..2accbd644 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java
@@ -115,11 +115,11 @@ public class DebugContextManager implements IDebugContextManager {
@Override
public void windowClosed(final IWorkbenchWindow window) {
- DebugWindowContextService service = fServices.get(window);
- if (service != null) {
- fServices.remove(window);
- service.dispose();
- }
+ DebugWindowContextService service = fServices.get(window);
+ if (service != null) {
+ fServices.remove(window);
+ service.dispose();
+ }
}
@Override
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextSourceProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextSourceProvider.java
index 69add3b9c..961af8776 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextSourceProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextSourceProvider.java
@@ -35,12 +35,12 @@ import org.eclipse.ui.services.IEvaluationService;
*/
public class DebugContextSourceProvider extends AbstractSourceProvider implements IDebugContextListener {
- /**
- * The names of the sources supported by this source provider.
- */
- private static final String[] PROVIDED_SOURCE_NAMES = new String[] { IDebugUIConstants.DEBUG_CONTEXT_SOURCE_NAME };
+ /**
+ * The names of the sources supported by this source provider.
+ */
+ private static final String[] PROVIDED_SOURCE_NAMES = new String[] { IDebugUIConstants.DEBUG_CONTEXT_SOURCE_NAME };
- private final IDebugContextService fDebugContextService;
+ private final IDebugContextService fDebugContextService;
private final IEvaluationService fEvaluationService;
@@ -59,7 +59,7 @@ public class DebugContextSourceProvider extends AbstractSourceProvider implement
@Override
public void debugContextChanged(DebugContextEvent event) {
final Map<String, ISelection> values = new HashMap<>(1);
- values.put(IDebugUIConstants.DEBUG_CONTEXT_SOURCE_NAME, event.getContext());
+ values.put(IDebugUIConstants.DEBUG_CONTEXT_SOURCE_NAME, event.getContext());
// make sure fireSourceChanged is called on the UI thread
if (Display.getCurrent() == null) {
DebugUIPlugin.getStandardDisplay().asyncExec(() -> fireSourceChanged(ISources.ACTIVE_CURRENT_SELECTION, values));
@@ -82,8 +82,8 @@ public class DebugContextSourceProvider extends AbstractSourceProvider implement
@Override
public Map getCurrentState() {
Map<String, ISelection> currentState = new HashMap<>(1);
- currentState.put(IDebugUIConstants.DEBUG_CONTEXT_SOURCE_NAME, fDebugContextService.getActiveContext());
- return currentState;
+ currentState.put(IDebugUIConstants.DEBUG_CONTEXT_SOURCE_NAME, fDebugContextService.getActiveContext());
+ return currentState;
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java
index e4a08ec34..73e9c12d1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java
@@ -145,14 +145,14 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
String modelIdentifier = element.getAttribute(ATTR_DEBUG_MODEL_ID);
String contextId = element.getAttribute(ATTR_CONTEXT_ID);
synchronized (this) {
- if (modelIdentifier != null && contextId != null) {
+ if (modelIdentifier != null && contextId != null) {
List<String> contextIds = fModelToContextIds.get(modelIdentifier);
- if (contextIds == null) {
+ if (contextIds == null) {
contextIds = new ArrayList<>();
- fModelToContextIds.put(modelIdentifier, contextIds);
- }
- contextIds.add(contextId);
- }
+ fModelToContextIds.put(modelIdentifier, contextIds);
+ }
+ contextIds.add(contextId);
+ }
}
}
}
@@ -211,20 +211,20 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
List<String> toEnable = new ArrayList<>(modelIds.length);
synchronized (this) {
Set<String> alreadyEnabled = fLaunchToModelIds.get(launch);
- if (alreadyEnabled == null) {
+ if (alreadyEnabled == null) {
alreadyEnabled = new HashSet<>();
- fLaunchToModelIds.put(launch, alreadyEnabled);
- }
- for (int i = 0; i < modelIds.length; i++) {
- String id = modelIds[i];
- if (!alreadyEnabled.contains(id)) {
- alreadyEnabled.add(id);
- toEnable.add(id);
- }
- }
+ fLaunchToModelIds.put(launch, alreadyEnabled);
+ }
+ for (int i = 0; i < modelIds.length; i++) {
+ String id = modelIds[i];
+ if (!alreadyEnabled.contains(id)) {
+ alreadyEnabled.add(id);
+ toEnable.add(id);
+ }
+ }
}
for (int i = 0; i < toEnable.size(); i++) {
- activateModel(toEnable.get(i), launch);
+ activateModel(toEnable.get(i), launch);
}
enableActivitiesFor(modelIds);
@@ -239,17 +239,17 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
*/
private void activateModel(String modelId, ILaunch launch) {
List<String> contextIds = null;
- synchronized (this) {
- contextIds = fModelToContextIds.get(modelId);
- if (contextIds == null) {
- // if there are no contexts for a model, the base debug context should
- // be activated (i.e. a debug model with no org.eclipse.ui.contexts and
- // associated org.eclipse.debug.ui.modelContextBindings)
+ synchronized (this) {
+ contextIds = fModelToContextIds.get(modelId);
+ if (contextIds == null) {
+ // if there are no contexts for a model, the base debug context should
+ // be activated (i.e. a debug model with no org.eclipse.ui.contexts and
+ // associated org.eclipse.debug.ui.modelContextBindings)
contextIds = new ArrayList<>();
- contextIds.add(DEBUG_CONTEXT);
- fModelToContextIds.put(modelId, contextIds);
- }
- }
+ contextIds.add(DEBUG_CONTEXT);
+ fModelToContextIds.put(modelId, contextIds);
+ }
+ }
for (String id : contextIds) {
activateContext(id, launch);
}
@@ -303,7 +303,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
*/
private String[] getDebugModelIds(Object object) {
if (object instanceof IAdaptable) {
- IDebugModelProvider modelProvider= ((IAdaptable)object).getAdapter(IDebugModelProvider.class);
+ IDebugModelProvider modelProvider= ((IAdaptable)object).getAdapter(IDebugModelProvider.class);
if (modelProvider != null) {
String[] modelIds= modelProvider.getModelIdentifiers();
if (modelIds != null) {
@@ -342,8 +342,8 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
ILaunch launch = launches[i];
List<IContextActivation> activations;
synchronized(this) {
- activations = fLanuchToContextActivations.remove(launch);
- fLaunchToModelIds.remove(launch);
+ activations = fLanuchToContextActivations.remove(launch);
+ fLaunchToModelIds.remove(launch);
}
if (activations != null) {
final List<IContextActivation> _activations = activations;
@@ -389,13 +389,13 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
String modelId = modelIds[i];
synchronized (this) {
List<String> contextIds = fModelToContextIds.get(modelId);
- if (contextIds != null) {
+ if (contextIds != null) {
for (String contextId : contextIds) {
- if (!workbenchContexts.contains(contextId)) {
- workbenchContexts.add(contextId);
- }
- }
- }
+ if (!workbenchContexts.contains(contextId)) {
+ workbenchContexts.add(contextId);
+ }
+ }
+ }
}
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
index 15d529686..2252c2baa 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
@@ -79,7 +79,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
@Override
public synchronized void addDebugContextProvider(IDebugContextProvider provider) {
- if (fWindow == null)
+ if (fWindow == null)
{
return; // disposed
}
@@ -89,26 +89,26 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
// Check if provider is a window context provider
boolean canSetActive = true;
- if (provider instanceof IDebugContextProvider2) {
- canSetActive = ((IDebugContextProvider2) provider).isWindowContextProvider();
- }
- // Make the provider active if matches the active part. Otherwise, it
- // may still become the active provider if fProviders.isEmpty().
+ if (provider instanceof IDebugContextProvider2) {
+ canSetActive = ((IDebugContextProvider2) provider).isWindowContextProvider();
+ }
+ // Make the provider active if matches the active part. Otherwise, it
+ // may still become the active provider if fProviders.isEmpty().
if (canSetActive) {
- IWorkbenchPart activePart = null;
- IWorkbenchPage activePage = fWindow.getActivePage();
- if (activePage != null) {
- activePart = activePage.getActivePart();
- }
- canSetActive = (activePart == null && part == null) || (activePart != null && activePart.equals(part));
+ IWorkbenchPart activePart = null;
+ IWorkbenchPage activePage = fWindow.getActivePage();
+ if (activePage != null) {
+ activePart = activePage.getActivePart();
+ }
+ canSetActive = (activePart == null && part == null) || (activePart != null && activePart.equals(part));
}
if (canSetActive) {
- fProviders.add(0, provider);
+ fProviders.add(0, provider);
} else {
- fProviders.add(provider);
+ fProviders.add(provider);
}
- notify(provider);
+ notify(provider);
provider.addDebugContextListener(this);
}
@@ -124,16 +124,16 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
}
IDebugContextProvider activeProvider = getActiveProvider();
if (index == 0) {
- if (activeProvider != null) {
- notify(activeProvider);
- } else {
- // Removed last provider. Send empty selection to all listeners.
- notify(new DebugContextEvent(provider, StructuredSelection.EMPTY, DebugContextEvent.ACTIVATED));
- }
+ if (activeProvider != null) {
+ notify(activeProvider);
+ } else {
+ // Removed last provider. Send empty selection to all listeners.
+ notify(new DebugContextEvent(provider, StructuredSelection.EMPTY, DebugContextEvent.ACTIVATED));
+ }
} else {
- // Notify listeners of the removed provider with the active window context.
- notifyPart(provider.getPart(),
- new DebugContextEvent(activeProvider, getActiveContext(), DebugContextEvent.ACTIVATED));
+ // Notify listeners of the removed provider with the active window context.
+ notifyPart(provider.getPart(),
+ new DebugContextEvent(activeProvider, getActiveContext(), DebugContextEvent.ACTIVATED));
}
}
provider.removeDebugContextListener(this);
@@ -191,9 +191,9 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
}
protected void notify(DebugContextEvent event) {
- // Allow handling for case where getActiveProvider() == null.
- // This can happen upon removeContextProvider() called on last available
- // provider (bug 360637).
+ // Allow handling for case where getActiveProvider() == null.
+ // This can happen upon removeContextProvider() called on last available
+ // provider (bug 360637).
IDebugContextProvider provider = getActiveProvider();
IWorkbenchPart part = event.getDebugContextProvider().getPart();
@@ -215,11 +215,11 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
}
protected void notifyPart(IWorkbenchPart part, DebugContextEvent event) {
- if (part != null) {
- notify(event, getListeners(part));
- notify(event, getPostListeners(part));
- }
- }
+ if (part != null) {
+ notify(event, getListeners(part));
+ notify(event, getPostListeners(part));
+ }
+ }
protected void notify(final DebugContextEvent event, ListenerList<IDebugContextListener> listeners) {
for (final IDebugContextListener listener : listeners) {
@@ -237,12 +237,12 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
}
protected ListenerList<IDebugContextListener> getListeners(IWorkbenchPart part) {
- String id = null;
- if (part != null) {
- id = getCombinedPartId(part);
+ String id = null;
+ if (part != null) {
+ id = getCombinedPartId(part);
ListenerList<IDebugContextListener> listenerList = fListenersByPartId.get(id);
return listenerList != null ? listenerList : new ListenerList<>();
- } else {
+ } else {
ListenerList<IDebugContextListener> listenerList = fListenersByPartId.get(null);
ListenerList<IDebugContextListener> retVal = new ListenerList<>();
if (listenerList != null) {
@@ -252,15 +252,15 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
}
outer: for (Iterator<String> itr = fListenersByPartId.keySet().iterator(); itr.hasNext();) {
- String listenerPartId = itr.next();
- for (int i = 0; i < fProviders.size(); i++) {
- String providerPartId = getCombinedPartId(fProviders.get(i).getPart());
- if ((listenerPartId == null && providerPartId == null) ||
- (listenerPartId != null && listenerPartId.equals(providerPartId)))
- {
- continue outer;
- }
- }
+ String listenerPartId = itr.next();
+ for (int i = 0; i < fProviders.size(); i++) {
+ String providerPartId = getCombinedPartId(fProviders.get(i).getPart());
+ if ((listenerPartId == null && providerPartId == null) ||
+ (listenerPartId != null && listenerPartId.equals(providerPartId)))
+ {
+ continue outer;
+ }
+ }
ListenerList<IDebugContextListener> listenersForPart = fListenersByPartId.get(listenerPartId);
if (listenersForPart != null) {
for (IDebugContextListener iDebugContextListener : listenersForPart) {
@@ -270,7 +270,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
}
}
return retVal;
- }
+ }
}
protected ListenerList<IDebugContextListener> getPostListeners(IWorkbenchPart part) {
@@ -412,16 +412,16 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
}
private String getCombinedPartId(IWorkbenchPart part) {
- if (part == null) {
- return null;
- } else if (part.getSite() instanceof IViewSite) {
- IViewSite site = (IViewSite)part.getSite();
- return getCombinedPartId(site.getId(), site.getSecondaryId());
-
- } else {
- return part.getSite().getId();
- }
- }
+ if (part == null) {
+ return null;
+ } else if (part.getSite() instanceof IViewSite) {
+ IViewSite site = (IViewSite)part.getSite();
+ return getCombinedPartId(site.getId(), site.getSecondaryId());
+
+ } else {
+ return part.getSite().getId();
+ }
+ }
private String getCombinedPartId(String id, String secondaryId) {
return id + (secondaryId != null ? ":" + secondaryId : ""); //$NON-NLS-1$//$NON-NLS-2$
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/LaunchSuspendTrigger.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/LaunchSuspendTrigger.java
index 61f788708..33531919e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/LaunchSuspendTrigger.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/LaunchSuspendTrigger.java
@@ -56,19 +56,19 @@ public class LaunchSuspendTrigger implements ISuspendTrigger, IDebugEventSetList
@Override
public void addSuspendTriggerListener(ISuspendTriggerListener listener) {
- if (fListeners != null) {
- fListeners.add(listener);
- }
+ if (fListeners != null) {
+ fListeners.add(listener);
+ }
}
@Override
public void removeSuspendTriggerListener(ISuspendTriggerListener listener) {
- if (fListeners != null) {
- fListeners.remove(listener);
- }
- if (fListeners.size() == 0) {
- dispose();
- }
+ if (fListeners != null) {
+ fListeners.remove(listener);
+ }
+ if (fListeners.size() == 0) {
+ dispose();
+ }
}
@Override
@@ -111,23 +111,23 @@ public class LaunchSuspendTrigger implements ISuspendTrigger, IDebugEventSetList
}
final Object temp = context;
ListenerList<ISuspendTriggerListener> list = fListeners;
- if (list != null) {
+ if (list != null) {
for (ISuspendTriggerListener iSuspendTriggerListener : list) {
final ISuspendTriggerListener listener = iSuspendTriggerListener;
- SafeRunner.run(new ISafeRunnable() {
- @Override
+ SafeRunner.run(new ISafeRunnable() {
+ @Override
public void run() throws Exception {
- listener.suspended(launch, temp);
- }
+ listener.suspended(launch, temp);
+ }
- @Override
+ @Override
public void handleException(Throwable exception) {
- DebugUIPlugin.log(exception);
- }
+ DebugUIPlugin.log(exception);
+ }
- });
- }
- }
+ });
+ }
+ }
}
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 756e5dffc..9515644d4 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
@@ -41,31 +41,31 @@ public class AsynchronousDebugLabelAdapter extends AsynchronousLabelAdapter {
@Override
protected void computeLabels(Object element, IPresentationContext context, ILabelRequestMonitor monitor) {
- DelegatingModelPresentation presentation = DebugElementHelper.getPresentation();
- // Honor view specific settings in a debug view by copying model presentation settings
- // into the debug element helper's presentation before we get the label. This allows
- // for qualified name and type name settings to remain in tact.
- if (element instanceof IDebugElement && context.getPart() instanceof IDebugView) {
- IDebugView debugView = (IDebugView)context.getPart();
+ DelegatingModelPresentation presentation = DebugElementHelper.getPresentation();
+ // Honor view specific settings in a debug view by copying model presentation settings
+ // into the debug element helper's presentation before we get the label. This allows
+ // for qualified name and type name settings to remain in tact.
+ if (element instanceof IDebugElement && context.getPart() instanceof IDebugView) {
+ IDebugView debugView = (IDebugView)context.getPart();
IDebugModelPresentation pres = debugView.getPresentation(((IDebugElement)element).getModelIdentifier());
Map<String, Object> settings = null;
- synchronized (presentation) {
- if (pres instanceof DelegatingModelPresentation) {
- settings = ((DelegatingModelPresentation)pres).getAttributes();
- } else if (pres instanceof LazyModelPresentation) {
- settings = ((LazyModelPresentation)pres).getAttributes();
- }
- if (settings != null) {
+ synchronized (presentation) {
+ if (pres instanceof DelegatingModelPresentation) {
+ settings = ((DelegatingModelPresentation)pres).getAttributes();
+ } else if (pres instanceof LazyModelPresentation) {
+ settings = ((LazyModelPresentation)pres).getAttributes();
+ }
+ if (settings != null) {
for (Entry<String, Object> entry : settings.entrySet()) {
- presentation.setAttribute(entry.getKey(), entry.getValue());
- }
- super.computeLabels(element, context, monitor);
- return;
- }
- }
+ presentation.setAttribute(entry.getKey(), entry.getValue());
+ }
+ super.computeLabels(element, context, monitor);
+ return;
+ }
+ }
}
- super.computeLabels(element, context, monitor);
- }
+ super.computeLabels(element, context, monitor);
+ }
@Override
protected String[] getLabels(Object element, IPresentationContext context) throws CoreException {
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 063a79dff..48b9df963 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
@@ -47,26 +47,26 @@ public class DefaultBreakpointsViewInput {
return fContext;
}
- @Override
+ @Override
public int hashCode() {
- if (getContext() != null) {
- return getContext().hashCode();
- } else {
- return 1;
- }
- }
+ if (getContext() != null) {
+ return getContext().hashCode();
+ } else {
+ return 1;
+ }
+ }
- @Override
+ @Override
public boolean equals(Object arg0) {
- if ( (arg0 != null) && arg0.getClass().equals(this.getClass()) ) {
+ if ( (arg0 != null) && arg0.getClass().equals(this.getClass()) ) {
- IPresentationContext context = ((DefaultBreakpointsViewInput) arg0).getContext();
- if (getContext() != null && context != null) {
+ 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 ca4642f13..5dd952441 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
@@ -55,8 +55,8 @@ public class DefaultVariableCellModifier implements ICellModifier {
@Override
public void modify(Object element, String property, Object value) {
Object oldValue = getValue(element, property);
- if (!value.equals(oldValue)) {
- if (VariableColumnPresentation.COLUMN_VARIABLE_VALUE.equals(property)) {
+ if (!value.equals(oldValue)) {
+ if (VariableColumnPresentation.COLUMN_VARIABLE_VALUE.equals(property)) {
if (element instanceof IVariable) {
if (value instanceof String) {
// The value column displays special characters escaped, so encode the string with any special characters escaped properly
@@ -65,7 +65,7 @@ public class DefaultVariableCellModifier implements ICellModifier {
DetailPaneAssignValueAction.assignValue(DebugUIPlugin.getShell(), variable, valueExpression);
}
}
- }
+ }
}
}
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 a43f926c2..041702722 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
@@ -27,12 +27,12 @@ public class MemoryRetrievalContentAdapter extends AsynchronousContentAdapter{
protected Object[] getChildren(Object parent, IPresentationContext context) throws CoreException {
String id = context.getId();
if (id.equals(IDebugUIConstants.ID_MEMORY_VIEW))
- {
+ {
if (parent instanceof IMemoryBlockRetrieval)
{
- return DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks((IMemoryBlockRetrieval)parent);
+ return DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks((IMemoryBlockRetrieval)parent);
}
- }
+ }
return EMPTY;
}
@@ -40,14 +40,14 @@ public class MemoryRetrievalContentAdapter extends AsynchronousContentAdapter{
protected boolean hasChildren(Object element, IPresentationContext context) throws CoreException {
String id = context.getId();
if (id.equals(IDebugUIConstants.ID_MEMORY_VIEW))
- {
+ {
if (element instanceof IMemoryBlockRetrieval)
{
if (((IMemoryBlockRetrieval)element).supportsStorageRetrieval())
- return DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks((IMemoryBlockRetrieval)element).length > 0;
+ return DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks((IMemoryBlockRetrieval)element).length > 0;
}
- }
- return false;
+ }
+ return false;
}
@Override
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 ed3b76001..e802b3469 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
@@ -30,21 +30,21 @@ public class StackFrameViewerInputProvider extends ViewerInputProvider {
@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);
- } else if ( IDebugUIConstants.ID_BREAKPOINT_VIEW.equals(context.getId()) ) {
- return new DefaultBreakpointsViewInput(context);
- } else {
- return DebugPlugin.getDefault().getExpressionManager();
- }
+ if ( IDebugUIConstants.ID_REGISTER_VIEW.equals(context.getId()) ) {
+ return new RegisterGroupProxy((IStackFrame) source);
+ } else if ( IDebugUIConstants.ID_BREAKPOINT_VIEW.equals(context.getId()) ) {
+ return new DefaultBreakpointsViewInput(context);
+ } else {
+ return DebugPlugin.getDefault().getExpressionManager();
+ }
}
@Override
protected boolean supportsContextId(String id) {
return IDebugUIConstants.ID_REGISTER_VIEW.equals(id) ||
- IDebugUIConstants.ID_EXPRESSION_VIEW.equals(id) ||
- IDebugUIConstants.ID_BREAKPOINT_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 e32ff8f05..6e6dca082 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
@@ -31,10 +31,10 @@ 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();
}
@@ -46,8 +46,8 @@ public class VariableColumnFactoryAdapter implements IColumnPresentationFactory
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))
+ 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/WatchExpressionCellModifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/WatchExpressionCellModifier.java
index 61246b462..0bc7ffddf 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
@@ -29,30 +29,30 @@ public class WatchExpressionCellModifier implements ICellModifier {
@Override
public boolean canModify(Object element, String property) {
- if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) {
- return element instanceof IWatchExpression;
- }
+ if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) {
+ return element instanceof IWatchExpression;
+ }
return false;
}
@Override
public Object getValue(Object element, String property) {
- if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) {
- return DefaultLabelProvider.escapeSpecialChars( ((IWatchExpression)element).getExpressionText() );
- }
- return null;
+ if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) {
+ return DefaultLabelProvider.escapeSpecialChars( ((IWatchExpression)element).getExpressionText() );
+ }
+ return null;
}
@Override
public void modify(Object element, String property, Object value) {
Object oldValue = getValue(element, property);
- if (!value.equals(oldValue)) {
- if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)) {
+ if (!value.equals(oldValue)) {
+ 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
- // characters escaped properly
+ // escaped, so encode the string with any special
+ // characters escaped properly
String expressionText = DefaultLabelProvider.encodeEsacpedChars((String)value);
IWatchExpression expression = (IWatchExpression) element;
// Bug 345974 see ExpressionManagerContentProvider.AddNewExpressionElement.modify does not allow an empty string
@@ -63,7 +63,7 @@ public class WatchExpressionCellModifier implements ICellModifier {
}
}
}
- }
+ }
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java
index ac5966fd2..6edb7a674 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java
@@ -241,9 +241,9 @@ class CommonTabLite extends AbstractLaunchConfigurationTab {
String currentContainerString = fSharedLocationText.getText();
IContainer currentContainer = getContainer(currentContainerString);
ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(),
- currentContainer,
- false,
- LaunchConfigurationsMessages.CommonTab_Select_a_location_for_the_launch_configuration_13);
+ currentContainer,
+ false,
+ LaunchConfigurationsMessages.CommonTab_Select_a_location_for_the_launch_configuration_13);
dialog.showClosedProjects(false);
dialog.setDialogBoundsSettings(getDialogBoundsSettings(), Dialog.DIALOG_PERSISTSIZE);
dialog.open();
@@ -427,11 +427,11 @@ class CommonTabLite extends AbstractLaunchConfigurationTab {
return validateLocalShared();
}
- /**
- * validates the local shared config file location
- * @return true if the local shared file exists, false otherwise
- */
- private boolean validateLocalShared() {
+ /**
+ * validates the local shared config file location
+ * @return true if the local shared file exists, false otherwise
+ */
+ private boolean validateLocalShared() {
if (isShared()) {
String path = fSharedLocationText.getText().trim();
IContainer container = getContainer(path);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationTabGroup.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationTabGroup.java
index 783599a96..f1073c598 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationTabGroup.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationTabGroup.java
@@ -134,12 +134,12 @@ public class GroupLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio
}
try {
- String key = el.data.getType().getIdentifier();
- return DebugPluginImages.getImage(key);
- } catch (CoreException e) {
- Image errorImage = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+ String key = el.data.getType().getIdentifier();
+ return DebugPluginImages.getImage(key);
+ } catch (CoreException e) {
+ Image errorImage = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
return errorImage;
- }
+ }
}
return null;
}
@@ -398,7 +398,7 @@ public class GroupLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio
return -1;
}
GroupLaunchElement el = ((GroupLaunchElement) sel
- .getFirstElement());
+ .getFirstElement());
return input.indexOf(el);
}
@@ -444,8 +444,8 @@ public class GroupLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio
protected boolean isDownEnabled() {
final int index = getSingleSelectionIndex();
- return (index >= 0) && (index != input.size() - 1);
- }
+ return (index >= 0) && (index != input.size() - 1);
+ }
protected boolean isUpEnabled(){
return getSingleSelectionIndex() > 0;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/DebugTextHover.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/DebugTextHover.java
index 6cbddd8cd..9ca00b61c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/DebugTextHover.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/DebugTextHover.java
@@ -82,50 +82,50 @@ public class DebugTextHover implements ITextHover, ITextHoverExtension, ITextHov
* Replaces reserved HTML characters in the given string with
* their escaped equivalents. This is to ensure that variable
* values containing reserved characters are correctly displayed.
- */
- private static String replaceHTMLChars(String variableText) {
- StringBuilder buffer= new StringBuilder(variableText.length());
- char[] characters = variableText.toCharArray();
- for (int i = 0; i < characters.length; i++) {
- char character= characters[i];
- switch (character) {
- case '<':
- buffer.append("&lt;"); //$NON-NLS-1$
- break;
- case '>':
- buffer.append("&gt;"); //$NON-NLS-1$
- break;
- case '&':
- buffer.append("&amp;"); //$NON-NLS-1$
- break;
- case '"':
- buffer.append("&quot;"); //$NON-NLS-1$
- break;
- default:
- buffer.append(character);
- }
- }
- return buffer.toString();
- }
+ */
+ private static String replaceHTMLChars(String variableText) {
+ StringBuilder buffer= new StringBuilder(variableText.length());
+ char[] characters = variableText.toCharArray();
+ for (int i = 0; i < characters.length; i++) {
+ char character= characters[i];
+ switch (character) {
+ case '<':
+ buffer.append("&lt;"); //$NON-NLS-1$
+ break;
+ case '>':
+ buffer.append("&gt;"); //$NON-NLS-1$
+ break;
+ case '&':
+ buffer.append("&amp;"); //$NON-NLS-1$
+ break;
+ case '"':
+ buffer.append("&quot;"); //$NON-NLS-1$
+ break;
+ default:
+ buffer.append(character);
+ }
+ }
+ return buffer.toString();
+ }
- /**
- * Returns the value of this filters preference (on/off) for the given
- * view.
- *
- * @param part
- * @return boolean
- */
- public static boolean getBooleanPreferenceValue(String id, String preference) {
- String compositeKey = id + "." + preference; //$NON-NLS-1$
+ /**
+ * Returns the value of this filters preference (on/off) for the given
+ * view.
+ *
+ * @param part
+ * @return boolean
+ */
+ public static boolean getBooleanPreferenceValue(String id, String preference) {
+ String compositeKey = id + "." + preference; //$NON-NLS-1$
IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore();
- boolean value = false;
- if (store.contains(compositeKey)) {
- value = store.getBoolean(compositeKey);
- } else {
- value = store.getBoolean(preference);
- }
- return value;
- }
+ boolean value = false;
+ if (store.contains(compositeKey)) {
+ value = store.getBoolean(compositeKey);
+ } else {
+ value = store.getBoolean(preference);
+ }
+ return value;
+ }
@Override
public IInformationControlCreator getHoverControlCreator() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/ExpressionInformationControlCreator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/ExpressionInformationControlCreator.java
index f9ab8ae56..dc4f6f322 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/ExpressionInformationControlCreator.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/ExpressionInformationControlCreator.java
@@ -94,16 +94,16 @@ public class ExpressionInformationControlCreator implements IInformationControlC
private IVariable fVariable;
private IPresentationContext fContext;
- private TreeModelViewer fViewer;
- private SashForm fSashForm;
- private Composite fDetailPaneComposite;
- private DetailPaneProxy fDetailPane;
- private Tree fTree;
+ private TreeModelViewer fViewer;
+ private SashForm fSashForm;
+ private Composite fDetailPaneComposite;
+ private DetailPaneProxy fDetailPane;
+ private Tree fTree;
/**
- * Creates the content for the root element of the tree viewer in the hover
- */
- private class TreeRoot extends ElementContentProvider {
+ * Creates the content for the root element of the tree viewer in the hover
+ */
+ private class TreeRoot extends ElementContentProvider {
@Override
protected int getChildCount(Object element, IPresentationContext context, IViewerUpdate monitor) throws CoreException {
return 1;
@@ -118,7 +118,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
protected boolean supportsContextId(String id) {
return true;
}
- }
+ }
/**
* Inner class implementing IDetailPaneContainer methods. Handles changes to detail
@@ -219,7 +219,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
@Override
public void dispose() {
persistSettings(getShell());
- fContext.dispose();
+ fContext.dispose();
super.dispose();
}
@@ -253,61 +253,61 @@ public class ExpressionInformationControlCreator implements IInformationControlC
@Override
protected void createContent(Composite parent) {
- fSashForm = new SashForm(parent, parent.getStyle());
- fSashForm.setOrientation(SWT.VERTICAL);
-
- // update presentation context
- AbstractDebugView view = getViewToEmulate();
- fContext = new PresentationContext(IDebugUIConstants.ID_VARIABLE_VIEW);
- if (view != null) {
- // copy over properties
- IPresentationContext copy = ((TreeModelViewer)view.getViewer()).getPresentationContext();
- String[] properties = copy.getProperties();
- for (int i = 0; i < properties.length; i++) {
+ fSashForm = new SashForm(parent, parent.getStyle());
+ fSashForm.setOrientation(SWT.VERTICAL);
+
+ // update presentation context
+ AbstractDebugView view = getViewToEmulate();
+ fContext = new PresentationContext(IDebugUIConstants.ID_VARIABLE_VIEW);
+ if (view != null) {
+ // copy over properties
+ IPresentationContext copy = ((TreeModelViewer)view.getViewer()).getPresentationContext();
+ String[] properties = copy.getProperties();
+ for (int i = 0; i < properties.length; i++) {
String key = properties[i];
fContext.setProperty(key, copy.getProperty(key));
}
- }
-
- fViewer = new TreeModelViewer(fSashForm, SWT.NO_TRIM | SWT.MULTI | SWT.VIRTUAL, fContext);
- fViewer.setAutoExpandLevel(1);
-
- if (view != null) {
- // copy over filters
- StructuredViewer structuredViewer = (StructuredViewer) view.getViewer();
- if (structuredViewer != null) {
- ViewerFilter[] filters = structuredViewer.getFilters();
- for (int i = 0; i < filters.length; i++) {
- fViewer.addFilter(filters[i]);
- }
- }
- }
-
- fDetailPaneComposite = SWTFactory.createComposite(fSashForm, 1, 1, GridData.FILL_BOTH);
- Layout layout = fDetailPaneComposite.getLayout();
- if (layout instanceof GridLayout) {
+ }
+
+ fViewer = new TreeModelViewer(fSashForm, SWT.NO_TRIM | SWT.MULTI | SWT.VIRTUAL, fContext);
+ fViewer.setAutoExpandLevel(1);
+
+ if (view != null) {
+ // copy over filters
+ StructuredViewer structuredViewer = (StructuredViewer) view.getViewer();
+ if (structuredViewer != null) {
+ ViewerFilter[] filters = structuredViewer.getFilters();
+ for (int i = 0; i < filters.length; i++) {
+ fViewer.addFilter(filters[i]);
+ }
+ }
+ }
+
+ fDetailPaneComposite = SWTFactory.createComposite(fSashForm, 1, 1, GridData.FILL_BOTH);
+ Layout layout = fDetailPaneComposite.getLayout();
+ if (layout instanceof GridLayout) {
GridLayout gl = (GridLayout) layout;
gl.marginHeight = 0;
gl.marginWidth = 0;
}
- fDetailPane = new DetailPaneProxy(new DetailPaneContainer());
- fDetailPane.display(null); // Bring up the default pane so the user doesn't see an empty composite
+ fDetailPane = new DetailPaneProxy(new DetailPaneContainer());
+ fDetailPane.display(null); // Bring up the default pane so the user doesn't see an empty composite
- fTree = fViewer.getTree();
- fTree.addSelectionListener(new SelectionListener() {
- @Override
+ fTree = fViewer.getTree();
+ fTree.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
fDetailPane.display(fViewer.getStructuredSelection());
- }
- @Override
+ }
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {}
- });
+ });
- initSashWeights();
+ initSashWeights();
- // add update listener to auto-select and display details of root expression
- fViewer.addViewerUpdateListener(new IViewerUpdateListener() {
+ // add update listener to auto-select and display details of root expression
+ fViewer.addViewerUpdateListener(new IViewerUpdateListener() {
@Override
public void viewerUpdatesComplete() {
}
@@ -328,55 +328,55 @@ public class ExpressionInformationControlCreator implements IInformationControlC
}
});
- setForegroundColor(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
- setBackgroundColor(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+ setForegroundColor(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
+ setBackgroundColor(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
}
/**
- * Attempts to find an appropriate view to emulate, this will either be the
- * variables view or the expressions view.
- * @return a view to emulate or <code>null</code>
- */
- private AbstractDebugView getViewToEmulate() {
+ * Attempts to find an appropriate view to emulate, this will either be the
+ * variables view or the expressions view.
+ * @return a view to emulate or <code>null</code>
+ */
+ private AbstractDebugView getViewToEmulate() {
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- AbstractDebugView expressionsView = (AbstractDebugView) page.findView(IDebugUIConstants.ID_EXPRESSION_VIEW);
- if (expressionsView != null && expressionsView.isVisible()) {
- return expressionsView;
- }
- AbstractDebugView variablesView = (AbstractDebugView) page.findView(IDebugUIConstants.ID_VARIABLE_VIEW);
- if (variablesView != null && variablesView.isVisible()) {
- return variablesView;
- }
- if (expressionsView != null) {
- return expressionsView;
- }
- return variablesView;
- }
+ AbstractDebugView expressionsView = (AbstractDebugView) page.findView(IDebugUIConstants.ID_EXPRESSION_VIEW);
+ if (expressionsView != null && expressionsView.isVisible()) {
+ return expressionsView;
+ }
+ AbstractDebugView variablesView = (AbstractDebugView) page.findView(IDebugUIConstants.ID_VARIABLE_VIEW);
+ if (variablesView != null && variablesView.isVisible()) {
+ return variablesView;
+ }
+ if (expressionsView != null) {
+ return expressionsView;
+ }
+ return variablesView;
+ }
/**
- * Initializes the sash form weights from the preference store (using default values if
- * no sash weights were stored previously).
- */
- protected void initSashWeights(){
- IDialogSettings settings = getDialogSettings(false);
- if (settings != null) {
- int tree = getIntSetting(settings, SASH_WEIGHT_TREE);
- if (tree > 0) {
- int details = getIntSetting(settings, SASH_WEIGHT_DETAILS);
- if (details > 0) {
- fSashForm.setWeights(new int[]{tree, details});
- }
- }
- }
- }
-
- @Override
- public void setForegroundColor(Color foreground) {
- super.setForegroundColor(foreground);
- fDetailPaneComposite.setForeground(foreground);
- fTree.setForeground(foreground);
- }
+ * Initializes the sash form weights from the preference store (using default values if
+ * no sash weights were stored previously).
+ */
+ protected void initSashWeights(){
+ IDialogSettings settings = getDialogSettings(false);
+ if (settings != null) {
+ int tree = getIntSetting(settings, SASH_WEIGHT_TREE);
+ if (tree > 0) {
+ int details = getIntSetting(settings, SASH_WEIGHT_DETAILS);
+ if (details > 0) {
+ fSashForm.setWeights(new int[]{tree, details});
+ }
+ }
+ }
+ }
+
+ @Override
+ public void setForegroundColor(Color foreground) {
+ super.setForegroundColor(foreground);
+ fDetailPaneComposite.setForeground(foreground);
+ fTree.setForeground(foreground);
+ }
@Override
public void setBackgroundColor(Color background) {
@@ -400,7 +400,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
public void setInput(Object input) {
if (input instanceof IVariable) {
fVariable = (IVariable) input;
- fViewer.setInput(new TreeRoot());
+ fViewer.setInput(new TreeRoot());
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java
index b259cad20..533a342ee 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java
@@ -117,7 +117,7 @@ public class EmbeddedBreakpointsViewer {
//presentation of the embedded viewer matches the current view
Map<String, Object> map = null;
IDebugModelPresentation current = view.getAdapter(IDebugModelPresentation.class);
- if (current instanceof DelegatingModelPresentation) {
+ if (current instanceof DelegatingModelPresentation) {
map = ((DelegatingModelPresentation) current).getAttributes();
}
if(map != null) {
@@ -157,7 +157,7 @@ public class EmbeddedBreakpointsViewer {
list.add(breakpoint);
}
else if (item instanceof IBreakpointContainer) {
- getBreakpointsFromContainers((IBreakpointContainer)item, list);
+ getBreakpointsFromContainers((IBreakpointContainer)item, list);
}
}
for(int i = 0; i < list.size(); i++) {
@@ -171,11 +171,11 @@ public class EmbeddedBreakpointsViewer {
* @param list the list of breakpoints to update state for
*/
private void getBreakpointsFromContainers(IBreakpointContainer container, ArrayList<IBreakpoint> list) {
- IBreakpoint[] bps = container.getBreakpoints();
- list.ensureCapacity(list.size() + bps.length);
- for (int j = 0; j < bps.length; j++) {
- list.add(bps[j]);
- }
+ IBreakpoint[] bps = container.getBreakpoints();
+ list.ensureCapacity(list.size() + bps.length);
+ for (int j = 0; j < bps.length; j++) {
+ list.add(bps[j]);
+ }
}
/**
@@ -206,115 +206,115 @@ public class EmbeddedBreakpointsViewer {
* @param element the element to search for when finding occurrences
* @return a list of widget occurrences to update or an empty list
*/
- private Widget[] searchItems(Object element) {
+ private Widget[] searchItems(Object element) {
ArrayList<TreeItem> list = new ArrayList<>();
- TreeItem[] items = fTree.getItems();
- for (int i = 0; i < items.length; i++) {
- findAllOccurrences(items[i], element, list);
- }
- return list.toArray(new Widget[0]);
- }
+ TreeItem[] items = fTree.getItems();
+ for (int i = 0; i < items.length; i++) {
+ findAllOccurrences(items[i], element, list);
+ }
+ return list.toArray(new Widget[0]);
+ }
- /**
- * performs the actual search for items in the tree
- * @param list the list to add matches to
- * @param item the item in the tree
- * @param element the element to compare
- */
+ /**
+ * performs the actual search for items in the tree
+ * @param list the list to add matches to
+ * @param item the item in the tree
+ * @param element the element to compare
+ */
private void findAllOccurrences(TreeItem item, Object element, ArrayList<TreeItem> list) {
- if (element.equals(item.getData())) {
- list.add(item);
- }
- TreeItem[] items = item.getItems();
- for (int i = 0; i < items.length; i++) {
- findAllOccurrences(items[i], element, list);
- }
- }
+ if (element.equals(item.getData())) {
+ list.add(item);
+ }
+ TreeItem[] items = item.getItems();
+ for (int i = 0; i < items.length; i++) {
+ findAllOccurrences(items[i], element, list);
+ }
+ }
/**
- * Update the checked state of the given element and all of its children.
- *
- * @param obj the object that has been changed
- * @param enable the checked status of the obj
- */
- private void updateCheckedState(Object obj, boolean enable) {
- IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(obj, IBreakpoint.class);
- if (breakpoint != null) {
- Widget[] list = searchItems(obj);
- TreeItem item = null;
- for(int i = 0; i < list.length; i++) {
- item = (TreeItem)list[i];
- item.setChecked(enable);
- refreshParents(item);
- }
- }
- else if (obj instanceof BreakpointContainer) {
+ * Update the checked state of the given element and all of its children.
+ *
+ * @param obj the object that has been changed
+ * @param enable the checked status of the obj
+ */
+ private void updateCheckedState(Object obj, boolean enable) {
+ IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(obj, IBreakpoint.class);
+ if (breakpoint != null) {
+ Widget[] list = searchItems(obj);
+ TreeItem item = null;
+ for(int i = 0; i < list.length; i++) {
+ item = (TreeItem)list[i];
+ item.setChecked(enable);
+ refreshParents(item);
+ }
+ }
+ else if (obj instanceof BreakpointContainer) {
ArrayList<IBreakpoint> bps = new ArrayList<>();
- getBreakpointsFromContainers((BreakpointContainer)obj, bps);
- for(int j = 0; j < bps.size(); j++) {
- updateCheckedState(bps.get(j), enable);
- }
- }
- }
+ getBreakpointsFromContainers((BreakpointContainer)obj, bps);
+ for(int j = 0; j < bps.size(); j++) {
+ updateCheckedState(bps.get(j), enable);
+ }
+ }
+ }
- /**
- * refreshes the grayed/checked state of the parents of item
- * @param item the item to refresh parents of
- */
- private void refreshParents(TreeItem item) {
- TreeItem parent = item.getParentItem();
- while (parent != null) {
- int checked = getNumberChildrenChecked(parent);
- if(checked == 0) {
- parent.setGrayed(false);
- parent.setChecked(false);
- }
- else if(checked == parent.getItemCount()) {
- if(getNumberChildrenGrayed(parent) > 0) {
- parent.setGrayed(true);
- }
- else {
- parent.setGrayed(false);
- }
- parent.setChecked(true);
- }
- else {
- parent.setGrayed(true);
- parent.setChecked(true);
- }
- parent = parent.getParentItem();
- }
- }
+ /**
+ * refreshes the grayed/checked state of the parents of item
+ * @param item the item to refresh parents of
+ */
+ private void refreshParents(TreeItem item) {
+ TreeItem parent = item.getParentItem();
+ while (parent != null) {
+ int checked = getNumberChildrenChecked(parent);
+ if(checked == 0) {
+ parent.setGrayed(false);
+ parent.setChecked(false);
+ }
+ else if(checked == parent.getItemCount()) {
+ if(getNumberChildrenGrayed(parent) > 0) {
+ parent.setGrayed(true);
+ }
+ else {
+ parent.setGrayed(false);
+ }
+ parent.setChecked(true);
+ }
+ else {
+ parent.setGrayed(true);
+ parent.setChecked(true);
+ }
+ parent = parent.getParentItem();
+ }
+ }
- /**
- * Gets the number of grayed children for this parent
- * @param parent the parent to inspect
- * @return treu is any one or more children is grayed, false otherwise
- */
- private int getNumberChildrenGrayed(TreeItem parent) {
- TreeItem[] children = parent.getItems();
- int count = 0;
- for(int i = 0; i < children.length; i++) {
- if(children[i].getGrayed()) {
- count++;
- }
- }
- return count;
- }
+ /**
+ * Gets the number of grayed children for this parent
+ * @param parent the parent to inspect
+ * @return treu is any one or more children is grayed, false otherwise
+ */
+ private int getNumberChildrenGrayed(TreeItem parent) {
+ TreeItem[] children = parent.getItems();
+ int count = 0;
+ for(int i = 0; i < children.length; i++) {
+ if(children[i].getGrayed()) {
+ count++;
+ }
+ }
+ return count;
+ }
- /**
- * Checks to see if all of the children under an given parent are checked or not
- * @param children the children to check
- * @return true if all children are checked, false otherwise
- */
- private int getNumberChildrenChecked(TreeItem parent) {
- TreeItem[] children = parent.getItems();
- int count = 0;
- for(int i = 0; i < children.length; i++) {
- if(children[i].getChecked()) {
- count++;
- }
- }
- return count;
- }
+ /**
+ * Checks to see if all of the children under an given parent are checked or not
+ * @param children the children to check
+ * @return true if all children are checked, false otherwise
+ */
+ private int getNumberChildrenChecked(TreeItem parent) {
+ TreeItem[] children = parent.getItems();
+ int count = 0;
+ for(int i = 0; i < children.length; i++) {
+ if(children[i].getChecked()) {
+ count++;
+ }
+ }
+ return count;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java
index 98cb4768c..1c31ff369 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java
@@ -96,6 +96,6 @@ public class WizardExportBreakpoints extends Wizard implements IExportWizard {
public void init(IWorkbench workbench, IStructuredSelection selection) {
fSelection = selection;
setWindowTitle(ImportExportMessages.WizardExportBreakpoints_0);
- setNeedsProgressMonitor(true);
+ setNeedsProgressMonitor(true);
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
index 2e3123bb8..958de66e4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
@@ -203,17 +203,17 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
}
/**
- * Creates the buttons for selecting all or none of the elements.
- *
- * @param parent the parent control
- */
- private void createButtonsGroup(Composite parent) {
- Composite composite = SWTFactory.createComposite(parent, parent.getFont(), 3, 1, GridData.FILL_HORIZONTAL, 0, 0);
- fSelectAll = SWTFactory.createPushButton(composite, ImportExportMessages.WizardBreakpointsPage_1, null);
- fSelectAll.addListener(SWT.Selection, this);
+ * Creates the buttons for selecting all or none of the elements.
+ *
+ * @param parent the parent control
+ */
+ private void createButtonsGroup(Composite parent) {
+ Composite composite = SWTFactory.createComposite(parent, parent.getFont(), 3, 1, GridData.FILL_HORIZONTAL, 0, 0);
+ fSelectAll = SWTFactory.createPushButton(composite, ImportExportMessages.WizardBreakpointsPage_1, null);
+ fSelectAll.addListener(SWT.Selection, this);
fDeselectAll = SWTFactory.createPushButton(composite, ImportExportMessages.WizardBreakpointsPage_2, null);
fDeselectAll.addListener(SWT.Selection, this);
- }
+ }
/**
* This method is used to determine if the page can be "finished".
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java
index b357a6d1a..a13af565b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java
@@ -99,7 +99,7 @@ public class WizardImportBreakpoints extends Wizard implements IImportWizard {
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
setWindowTitle(ImportExportMessages.WizardImportBreakpoints_0);
- setNeedsProgressMonitor(true);
+ setNeedsProgressMonitor(true);
}
@Override
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java
index 291ffe62c..e5cd4bfcf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java
@@ -144,11 +144,11 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage {
@Override
public void createControl(Composite parent) {
Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH);
- //add the check table
+ //add the check table
createViewer(comp);
- //add the file path and browse button
+ //add the file path and browse button
createFilePath(comp);
- //add the overwrite option
+ //add the overwrite option
fOverwrite = SWTFactory.createCheckButton(comp, WizardMessages.ExportLaunchConfigurationsWizardPage_1, null, getDialogSettings().getBoolean(OVERWRITE), 2);
setControl(comp);
PlatformUI .getWorkbench().getHelpSystem().setHelp(comp, IDebugHelpContextIds.EXPORT_LAUNCH_CONFIGURATIONS_PAGE);
@@ -475,6 +475,6 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage {
while ((i = is.read(buf)) != -1) {
os.write(buf, 0, i);
}
- }
+ }
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java
index 403c34c27..67bad5c5f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java
@@ -263,16 +263,16 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa
protected void createSourceGroup(Composite parent) {}
/**
- * Create the group for creating the root directory
- */
- protected void createRootDirectoryGroup(Composite parent) {
- Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 3, 1, GridData.FILL_HORIZONTAL, 0, 0);
- SWTFactory.createLabel(comp, WizardMessages.ImportLaunchConfigurationsWizardPage_6, 1);
- // source name entry field
- fFromDirectory = SWTFactory.createText(comp, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY, 1, GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
- // source browse button
- Button browse = SWTFactory.createPushButton(comp, WizardMessages.ImportLaunchConfigurationsWizardPage_7, null);
- browse.addSelectionListener(new SelectionAdapter () {
+ * Create the group for creating the root directory
+ */
+ protected void createRootDirectoryGroup(Composite parent) {
+ Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 3, 1, GridData.FILL_HORIZONTAL, 0, 0);
+ SWTFactory.createLabel(comp, WizardMessages.ImportLaunchConfigurationsWizardPage_6, 1);
+ // source name entry field
+ fFromDirectory = SWTFactory.createText(comp, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY, 1, GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
+ // source browse button
+ Button browse = SWTFactory.createPushButton(comp, WizardMessages.ImportLaunchConfigurationsWizardPage_7, null);
+ browse.addSelectionListener(new SelectionAdapter () {
@Override
public void widgetSelected(SelectionEvent e) {
DirectoryDialog dd = new DirectoryDialog(getContainer().getShell(), SWT.SHEET);
@@ -287,14 +287,14 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa
}
}
}
- });
- }
+ });
+ }
- /**
- * Resets the selection of the tree root element for the viewer
- * @param path the path from the text widget
- */
- protected void resetSelection(final IPath path) {
+ /**
+ * Resets the selection of the tree root element for the viewer
+ * @param path the path from the text widget
+ */
+ protected void resetSelection(final IPath path) {
BusyIndicator.showWhile(getShell().getDisplay(), () -> {
File file = new File(path.toOSString());
DebugFileSystemElement dummyparent = new DebugFileSystemElement(IInternalDebugCoreConstants.EMPTY_STRING,
@@ -306,47 +306,47 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa
element.getFiles();
selectionGroup.setRoot(dummyparent);
});
- }
+ }
@Override
protected ITreeContentProvider getFileProvider() {
return new WorkbenchContentProvider() {
- @Override
+ @Override
public Object[] getChildren(Object o) {
- if (o instanceof DebugFileSystemElement) {
- DebugFileSystemElement element = (DebugFileSystemElement) o;
- return element.getFiles().getChildren(element);
- }
- return new Object[0];
- }
- };
+ if (o instanceof DebugFileSystemElement) {
+ DebugFileSystemElement element = (DebugFileSystemElement) o;
+ return element.getFiles().getChildren(element);
+ }
+ return new Object[0];
+ }
+ };
}
@Override
protected ITreeContentProvider getFolderProvider() {
return new WorkbenchContentProvider() {
- @Override
+ @Override
public Object[] getChildren(Object o) {
- if (o instanceof DebugFileSystemElement) {
- DebugFileSystemElement element = (DebugFileSystemElement) o;
- return element.getFolders().getChildren();
- }
- return new Object[0];
- }
+ if (o instanceof DebugFileSystemElement) {
+ DebugFileSystemElement element = (DebugFileSystemElement) o;
+ return element.getFolders().getChildren();
+ }
+ return new Object[0];
+ }
- @Override
+ @Override
public boolean hasChildren(Object o) {
- if (o instanceof DebugFileSystemElement) {
- DebugFileSystemElement element = (DebugFileSystemElement) o;
- if (element.isPopulated()) {
+ if (o instanceof DebugFileSystemElement) {
+ DebugFileSystemElement element = (DebugFileSystemElement) o;
+ if (element.isPopulated()) {
return getChildren(element).length > 0;
}
- //If we have not populated then wait until asked
- return true;
- }
- return false;
- }
- };
+ //If we have not populated then wait until asked
+ return true;
+ }
+ return false;
+ }
+ };
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java
index 818e965ca..5f2d1a69b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java
@@ -90,15 +90,15 @@ public class CompileErrorProjectPromptStatusHandler implements IStatusHandler {
0,
LaunchConfigurationsMessages.CompileErrorProjectPromptStatusHandler_1,
false);
- int open = dialog.open();
+ int open = dialog.open();
if (open == IDialogConstants.PROCEED_ID) {
- if(dialog.getToggleState()) {
- store.setValue(IInternalDebugUIConstants.PREF_CONTINUE_WITH_COMPILE_ERROR, MessageDialogWithToggle.ALWAYS);
- }
- return Boolean.TRUE;
- }
- else {
- return Boolean.FALSE;
- }
+ if(dialog.getToggleState()) {
+ store.setValue(IInternalDebugUIConstants.PREF_CONTINUE_WITH_COMPILE_ERROR, MessageDialogWithToggle.ALWAYS);
+ }
+ return Boolean.TRUE;
+ }
+ else {
+ return Boolean.FALSE;
+ }
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java
index 0658aabf2..5794c6751 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java
@@ -39,16 +39,16 @@ public class DebugModePromptStatusHandler implements IStatusHandler {
}
IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore();
- ILaunchConfiguration configuration = (ILaunchConfiguration)source;
- String pref = store.getString(IInternalDebugUIConstants.PREF_RELAUNCH_IN_DEBUG_MODE);
- if (pref != null) {
- if (pref.equals(MessageDialogWithToggle.NEVER)) {
- return Boolean.FALSE;
- } else if (pref.equals(MessageDialogWithToggle.ALWAYS)) {
- relaunchInDebugMode(configuration);
- return Boolean.TRUE;
- }
- }
+ ILaunchConfiguration configuration = (ILaunchConfiguration)source;
+ String pref = store.getString(IInternalDebugUIConstants.PREF_RELAUNCH_IN_DEBUG_MODE);
+ if (pref != null) {
+ if (pref.equals(MessageDialogWithToggle.NEVER)) {
+ return Boolean.FALSE;
+ } else if (pref.equals(MessageDialogWithToggle.ALWAYS)) {
+ relaunchInDebugMode(configuration);
+ return Boolean.TRUE;
+ }
+ }
Shell activeShell = DebugUIPlugin.getShell();
String title = LaunchConfigurationsMessages.DebugModePromptStatusHandler_0;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java
index 3a2b105e7..5779bf0b8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java
@@ -248,17 +248,17 @@ public class FavoritesDialog extends TrayDialog {
/**
* Returns a label to use for launch mode with accelerators removed.
*
- * @return label to use for launch mode with accelerators removed
- */
- private String getModeLabel() {
- return DebugUIPlugin.removeAccelerators(fHistory.getLaunchGroup().getLabel());
- }
-
- /**
- * Creates the main area of the dialog
- * @param parent the parent to add this content to
- */
- protected void createFavoritesArea(Composite parent) {
+ * @return label to use for launch mode with accelerators removed
+ */
+ private String getModeLabel() {
+ return DebugUIPlugin.removeAccelerators(fHistory.getLaunchGroup().getLabel());
+ }
+
+ /**
+ * Creates the main area of the dialog
+ * @param parent the parent to add this content to
+ */
+ protected void createFavoritesArea(Composite parent) {
Composite topComp = SWTFactory.createComposite(parent, parent.getFont(), 2, 1, GridData.FILL_BOTH, 0, 0);
SWTFactory.createLabel(topComp, LaunchConfigurationsMessages.FavoritesDialog_2, 2);
fFavoritesTable = createTable(topComp, new FavoritesContentProvider());
@@ -451,15 +451,15 @@ public class FavoritesDialog extends TrayDialog {
super.okPressed();
}
- @Override
+ @Override
protected IDialogSettings getDialogBoundsSettings() {
- IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings();
- IDialogSettings section = settings.getSection(getDialogSettingsSectionName());
- if (section == null) {
- section = settings.addNewSection(getDialogSettingsSectionName());
- }
- return section;
- }
+ IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings();
+ IDialogSettings section = settings.getSection(getDialogSettingsSectionName());
+ if (section == null) {
+ section = settings.addNewSection(getDialogSettingsSectionName());
+ }
+ return section;
+ }
/**
* Returns the name of the section that this dialog stores its settings in
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java
index fe801b623..ddb52e0f9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java
@@ -325,16 +325,16 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
* @param newLaunch the newly added launch to leave in the view
*/
protected void removeTerminatedLaunches(ILaunch newLaunch) {
- if (DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugUIConstants.PREF_AUTO_REMOVE_OLD_LAUNCHES)) {
- ILaunchManager lManager= DebugPlugin.getDefault().getLaunchManager();
- Object[] launches= lManager.getLaunches();
- for (int i= 0; i < launches.length; i++) {
- ILaunch launch= (ILaunch)launches[i];
- if (launch != newLaunch && launch.isTerminated()) {
- lManager.removeLaunch(launch);
- }
- }
- }
+ if (DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugUIConstants.PREF_AUTO_REMOVE_OLD_LAUNCHES)) {
+ ILaunchManager lManager= DebugPlugin.getDefault().getLaunchManager();
+ Object[] launches= lManager.getLaunches();
+ for (int i= 0; i < launches.length; i++) {
+ ILaunch launch= (ILaunch)launches[i];
+ if (launch != newLaunch && launch.isTerminated()) {
+ lManager.removeLaunch(launch);
+ }
+ }
+ }
}
/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java
index baae46074..71352717f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java
@@ -107,9 +107,9 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia
@Override
public boolean close() {
- if (!isSafeToClose()) {
- return false;
- }
+ if (!isSafeToClose()) {
+ return false;
+ }
DebugPlugin.getDefault().getLaunchManager().removeLaunchConfigurationListener(this);
return super.close();
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
index f947492a9..75201c55d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
@@ -172,13 +172,13 @@ public class LaunchConfigurationTabGroupViewer {
* A link to allow users to select a valid set of launch options for the specified mode
* @since 3.3
*/
- private Link fOptionsLink = null;
+ private Link fOptionsLink = null;
- /**
- * A label to indicate that the user needs to select an a launcher.
- * @since 3.5
- */
- private Label fOptionsErrorLabel = null;
+ /**
+ * A label to indicate that the user needs to select an a launcher.
+ * @since 3.5
+ */
+ private Label fOptionsErrorLabel = null;
/**
* A new composite replacing the perspectives tab
@@ -232,17 +232,17 @@ public class LaunchConfigurationTabGroupViewer {
*/
private void createControl(Composite parent) {
fViewerControl = parent;
- fViewform = new ViewForm(parent, SWT.FLAT | SWT.BORDER);
- GridLayout layout = new GridLayout(1, false);
- layout.horizontalSpacing = 0;
- layout.verticalSpacing = 0;
- fViewform.setLayout(layout);
+ fViewform = new ViewForm(parent, SWT.FLAT | SWT.BORDER);
+ GridLayout layout = new GridLayout(1, false);
+ layout.horizontalSpacing = 0;
+ layout.verticalSpacing = 0;
+ fViewform.setLayout(layout);
GridData gd = new GridData(GridData.FILL_BOTH);
fViewform.setLayoutData(gd);
- fViewform.setTopLeft(null);
+ fViewform.setTopLeft(null);
- Composite mainComp = SWTFactory.createComposite(fViewform, fViewform.getFont(), 1, 1, 1, 0, 0);
- fViewform.setContent(mainComp);
+ Composite mainComp = SWTFactory.createComposite(fViewform, fViewform.getFont(), 1, 1, 1, 0, 0);
+ fViewform.setContent(mainComp);
fTabPlaceHolder = SWTFactory.createComposite(mainComp, 1, 1, GridData.FILL_BOTH);
fTabPlaceHolder.setLayout(new StackLayout());
@@ -254,13 +254,13 @@ public class LaunchConfigurationTabGroupViewer {
SWTFactory.createLabel(fGroupComposite, LaunchConfigurationsMessages.LaunchConfigurationDialog__Name__16, 1);
fNameWidget = new Text(fGroupComposite, SWT.SINGLE | SWT.BORDER);
- fNameWidget.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ fNameWidget.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
fNameWidget.addModifyListener(e -> {
if (!fInitializingTabs) {
handleNameModified();
}
}
- );
+ );
createTabFolder(fGroupComposite);
@@ -269,8 +269,8 @@ public class LaunchConfigurationTabGroupViewer {
//a link for launch options
fOptionsErrorLabel = new Label(linkComp, SWT.NONE);
- gd = new GridData();
- fOptionsErrorLabel.setLayoutData(gd);
+ gd = new GridData();
+ fOptionsErrorLabel.setLayoutData(gd);
fOptionsLink = new Link(linkComp, SWT.WRAP);
fOptionsLink.setFont(linkComp.getFont());
@@ -347,7 +347,7 @@ public class LaunchConfigurationTabGroupViewer {
}
}
});
- Dialog.applyDialogFont(parent);
+ Dialog.applyDialogFont(parent);
}
/**
@@ -521,7 +521,7 @@ public class LaunchConfigurationTabGroupViewer {
boolean newwc = !getWorkingCopy().isDirty();
ILaunchConfigurationTab tab = getActiveTab();
if (tab != null) {
- tab.performApply(getWorkingCopy());
+ tab.performApply(getWorkingCopy());
}
if((fOriginal instanceof ILaunchConfigurationWorkingCopy) && newwc) {
try {
@@ -583,9 +583,9 @@ public class LaunchConfigurationTabGroupViewer {
}
fOptionsLink.setVisible(!canLaunchWithModes() || hasMultipleDelegates());
if (hasDuplicateDelegates()) {
- fOptionsErrorLabel.setImage(JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_ERROR));
+ fOptionsErrorLabel.setImage(JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_ERROR));
} else {
- fOptionsErrorLabel.setImage(null);
+ fOptionsErrorLabel.setImage(null);
}
fViewform.layout(true, true);
}
@@ -820,12 +820,12 @@ public class LaunchConfigurationTabGroupViewer {
fShowCommandLineButton.setVisible(visible);
}
}
- /**
- * sets the current widget focus to the 'Name' widget
- */
- protected void setFocusOnName() {
- fNameWidget.setFocus();
- }
+ /**
+ * sets the current widget focus to the 'Name' widget
+ */
+ protected void setFocusOnName() {
+ fNameWidget.setFocus();
+ }
/**
* Displays tabs for the current working copy
@@ -929,7 +929,7 @@ public class LaunchConfigurationTabGroupViewer {
}
//set the default tab as the first one
if (tabs.length > 0) {
- setActiveTab(tabs[0]);
+ setActiveTab(tabs[0]);
}
// select same tab as before, if possible
for (int i = 0; i < tabs.length; i++) {
@@ -1142,7 +1142,7 @@ public class LaunchConfigurationTabGroupViewer {
* Returns the working copy used to edit the original, possibly
* <code>null</code>.
* @return the backing {@link ILaunchConfigurationWorkingCopy}
- */
+ */
protected ILaunchConfigurationWorkingCopy getWorkingCopy() {
return fWorkingCopy;
}
@@ -1292,7 +1292,7 @@ public class LaunchConfigurationTabGroupViewer {
}
if(hasDuplicateDelegates()) {
- return LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_18;
+ return LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_18;
}
String message = null;
@@ -1429,8 +1429,8 @@ public class LaunchConfigurationTabGroupViewer {
*/
private void disposeExistingTabs() {
fDisposingTabs = true;
- fTabFolder.dispose();
- fTabFolder = null;
+ fTabFolder.dispose();
+ fTabFolder = null;
createTabFolder(fGroupComposite);
disposeTabGroup();
fDisposingTabs = false;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java
index f4d8d8098..24bef0588 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java
@@ -161,9 +161,9 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT
TabCollector collector = new TabCollector(Arrays.asList(fGroup.getTabs()), Arrays.asList(ext));
while(collector.hasNext()) {
ILaunchConfigurationTab next = collector.next();
- if (next != null) {
- fTabs.add(next);
- }
+ if (next != null) {
+ fTabs.add(next);
+ }
}
}
else {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java
index 70f3161cc..39537b252 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java
@@ -310,13 +310,13 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc
}
}
- /**
- * The given launch configuration has been added. Add it to the tree.
- * @param configuration the added configuration
- */
- private void handleConfigurationAdded(ILaunchConfiguration configuration, ILaunchConfiguration from) {
- TreeViewer viewer = getTreeViewer();
- if (viewer != null) {
+ /**
+ * The given launch configuration has been added. Add it to the tree.
+ * @param configuration the added configuration
+ */
+ private void handleConfigurationAdded(ILaunchConfiguration configuration, ILaunchConfiguration from) {
+ TreeViewer viewer = getTreeViewer();
+ if (viewer != null) {
try {
viewer.getControl().setRedraw(false);
if (configuration.getPrototype() != null) {
@@ -324,49 +324,49 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc
} else {
viewer.add(configuration.getType(), configuration);
}
- // if moved, remove original now
- if (from != null) {
- viewer.remove(from);
- }
- if (isAutoSelect()) {
- viewer.setSelection(new StructuredSelection(configuration), true);
- }
- updateFilterLabel();
+ // if moved, remove original now
+ if (from != null) {
+ viewer.remove(from);
+ }
+ if (isAutoSelect()) {
+ viewer.setSelection(new StructuredSelection(configuration), true);
+ }
+ updateFilterLabel();
}
catch (CoreException e) {}
finally {
viewer.getControl().setRedraw(true);
}
- }
- }
-
- /**
- * Returns if the specified configuration is supported by this instance of the view.
- * Supported means that:
- * <ul>
- * <li>The configuration is not private</li>
- * <li>AND that the configurations' type supports the mode of the current launch group</li>
- * <li>AND that the category of the configurations' type matches that of the current launch group</li>
- * </ul>
- * @param configuration the configuration
- * @return true if the configuration is supported by this instance of the view, false otherwise
- *
- * @since 3.4
- */
- protected boolean isSupportedConfiguration(ILaunchConfiguration configuration) {
- try {
- ILaunchConfigurationType type = configuration.getType();
- return !configuration.getAttribute(IDebugUIConstants.ATTR_PRIVATE, false) &&
- type.supportsMode(getLaunchGroup().getMode()) &&
- equalCategories(type.getCategory(), getLaunchGroup().getCategory());
- }
- catch(CoreException ce) {
- DebugUIPlugin.log(ce);
- }
- return false;
- }
-
- /**
+ }
+ }
+
+ /**
+ * Returns if the specified configuration is supported by this instance of the view.
+ * Supported means that:
+ * <ul>
+ * <li>The configuration is not private</li>
+ * <li>AND that the configurations' type supports the mode of the current launch group</li>
+ * <li>AND that the category of the configurations' type matches that of the current launch group</li>
+ * </ul>
+ * @param configuration the configuration
+ * @return true if the configuration is supported by this instance of the view, false otherwise
+ *
+ * @since 3.4
+ */
+ protected boolean isSupportedConfiguration(ILaunchConfiguration configuration) {
+ try {
+ ILaunchConfigurationType type = configuration.getType();
+ return !configuration.getAttribute(IDebugUIConstants.ATTR_PRIVATE, false) &&
+ type.supportsMode(getLaunchGroup().getMode()) &&
+ equalCategories(type.getCategory(), getLaunchGroup().getCategory());
+ }
+ catch(CoreException ce) {
+ DebugUIPlugin.log(ce);
+ }
+ return false;
+ }
+
+ /**
* Returns whether the given categories are equal.
*
* @param c1 category identifier or <code>null</code>
@@ -409,14 +409,14 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc
/**
* The given launch configuration has been removed. Remove it from the tree.
- * @param configuration the deleted configuration
- */
- private void handleConfigurationRemoved(ILaunchConfiguration configuration) {
- getTreeViewer().remove(configuration);
+ * @param configuration the deleted configuration
+ */
+ private void handleConfigurationRemoved(ILaunchConfiguration configuration) {
+ getTreeViewer().remove(configuration);
updateFilterLabel();
- }
+ }
- /**
+ /**
* This is similar to IWorkbenchPart#createPartControl(Composite), but it is
* called by the launch dialog when creating the launch config tree view.
* Since this view is not contained in the workbench, we cannot do all the
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
index a4a49817d..308b17848 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
@@ -346,11 +346,11 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
@Override
public boolean close() {
- if (!isSafeToClose()) {
- return false;
- }
- persistSashWeights();
- persistExpansion();
+ if (!isSafeToClose()) {
+ return false;
+ }
+ persistSashWeights();
+ persistExpansion();
setCurrentlyVisibleLaunchConfigurationDialog(null);
fTabViewer.dispose();
if (fLaunchConfigurationView != null) {
@@ -394,9 +394,9 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
composite.setFont(font);
// create help control if needed
- if (isHelpAvailable()) {
- createHelpControl(composite);
- }
+ if (isHelpAvailable()) {
+ createHelpControl(composite);
+ }
Composite monitorComposite = new Composite(composite, SWT.NULL);
layout = new GridLayout();
layout.marginHeight = 0;
@@ -447,7 +447,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
@Override
protected void createButtonsForButtonBar(Composite parent) {
Button button = createButton(parent, ID_LAUNCH_BUTTON, getLaunchButtonText(), true);
- button.setEnabled(false);
+ button.setEnabled(false);
Listener[] listeners = button.getListeners(SWT.Selection);
for (Listener listener : listeners) {
button.removeListener(SWT.Selection, listener);
@@ -528,26 +528,26 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
* @return the composite used for launch configuration selection area
*/
protected Control createLaunchConfigurationSelectionArea(Composite parent) {
- Composite comp = new Composite(parent, SWT.FLAT);
- GridLayout gridLayout = new GridLayout(1, false);
- gridLayout.marginHeight = 0;
- gridLayout.marginWidth = 0;
- comp.setLayout(gridLayout);
- comp.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- ViewForm viewForm = new ViewForm(comp, SWT.FLAT | SWT.BORDER);
- ToolBarManager toolBarManager= new ToolBarManager(SWT.FLAT);
- ToolBar toolBar = toolBarManager.createControl(viewForm);
- toolBar.setBackground(parent.getBackground());
- viewForm.setTopLeft(toolBar);
- viewForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Composite viewFormContents = new Composite(viewForm, SWT.FLAT);
- gridLayout = new GridLayout();
- gridLayout.marginHeight = 5;
- gridLayout.marginWidth = 5;
- viewFormContents.setLayout(gridLayout);
- viewFormContents.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
+ Composite comp = new Composite(parent, SWT.FLAT);
+ GridLayout gridLayout = new GridLayout(1, false);
+ gridLayout.marginHeight = 0;
+ gridLayout.marginWidth = 0;
+ comp.setLayout(gridLayout);
+ comp.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+ ViewForm viewForm = new ViewForm(comp, SWT.FLAT | SWT.BORDER);
+ ToolBarManager toolBarManager= new ToolBarManager(SWT.FLAT);
+ ToolBar toolBar = toolBarManager.createControl(viewForm);
+ toolBar.setBackground(parent.getBackground());
+ viewForm.setTopLeft(toolBar);
+ viewForm.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+ Composite viewFormContents = new Composite(viewForm, SWT.FLAT);
+ gridLayout = new GridLayout();
+ gridLayout.marginHeight = 5;
+ gridLayout.marginWidth = 5;
+ viewFormContents.setLayout(gridLayout);
+ viewFormContents.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
fLaunchConfigurationView = new LaunchConfigurationView(getLaunchGroup(), createViewerFilters());
fLaunchConfigurationView.createLaunchDialogControl(viewFormContents);
Text filterText = fLaunchConfigurationView.getFilteringTextControl();
@@ -588,7 +588,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
Control control = viewer.getControl();
GridData gd = new GridData(GridData.FILL_BOTH);
control.setLayoutData(gd);
- viewForm.setContent(viewFormContents);
+ viewForm.setContent(viewFormContents);
AbstractLaunchConfigurationAction.IConfirmationRequestor requestor = new AbstractLaunchConfigurationAction.IConfirmationRequestor() {
@Override
public boolean getConfirmation() {
@@ -737,15 +737,15 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
*
* @since 3.2
*/
- @Override
+ @Override
protected IDialogSettings getDialogBoundsSettings() {
- return getDialogSettings();
- }
+ return getDialogSettings();
+ }
- @Override
+ @Override
protected int getDialogBoundsStrategy() {
- return DIALOG_PERSISTSIZE;
- }
+ return DIALOG_PERSISTSIZE;
+ }
/**
* Returns the dialog settings for this dialog. Subclasses should override
@@ -784,12 +784,12 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
return DebugUIPlugin.getStandardDisplay();
}
- /**
- * Gets the duplicate menu action
- *
- * @return the duplicate menu action
- */
- protected AbstractLaunchConfigurationAction getDuplicateAction() {
+ /**
+ * Gets the duplicate menu action
+ *
+ * @return the duplicate menu action
+ */
+ protected AbstractLaunchConfigurationAction getDuplicateAction() {
return (AbstractLaunchConfigurationAction)fLaunchConfigurationView.getAction(DuplicateLaunchConfigurationAction.ID_DUPLICATE_ACTION);
}
@@ -811,7 +811,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
return IDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG;
}
- /**
+ /**
* Returns the status the dialog was opened on or <code>null</code> if none.
*
* @return IStatus
@@ -820,7 +820,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
return fInitialStatus;
}
- /**
+ /**
* Return the last launched configuration in the workspace.
*
* @return the last launched configuration
@@ -829,7 +829,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
return DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLastLaunch(getLaunchGroup().getIdentifier());
}
- /**
+ /**
* Returns the appropriate text for the launch button - run or debug.
*
* @return the launch button text
@@ -838,7 +838,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
return DebugPlugin.getDefault().getLaunchManager().getLaunchMode(getMode()).getLabel();
}
- /**
+ /**
* Returns the launch group being displayed.
*
* @return launch group
@@ -847,10 +847,10 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
return fGroup;
}
- @Override
+ @Override
public String getMode() {
- return getLaunchGroup().getMode();
- }
+ return getLaunchGroup().getMode();
+ }
/**
* Gets the new menu action
@@ -944,24 +944,24 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
}
/**
- * Returns the current tab group
- *
- * @return the current tab group, or <code>null</code> if none
- */
- public ILaunchConfigurationTabGroup getTabGroup() {
- if (fTabViewer != null) {
- return fTabViewer.getTabGroup();
- }
- return null;
- }
+ * Returns the current tab group
+ *
+ * @return the current tab group, or <code>null</code> if none
+ */
+ public ILaunchConfigurationTabGroup getTabGroup() {
+ if (fTabViewer != null) {
+ return fTabViewer.getTabGroup();
+ }
+ return null;
+ }
- @Override
+ @Override
public ILaunchConfigurationTab[] getTabs() {
- if (getTabGroup() == null) {
- return null;
- }
- return getTabGroup().getTabs();
- }
+ if (getTabGroup() == null) {
+ return null;
+ }
+ return getTabGroup().getTabs();
+ }
/**
* Returns the viewer used to display the tabs for a launch configuration.
@@ -1001,43 +1001,43 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
*
* @param event selection changed event
*/
- protected void handleLaunchConfigurationSelectionChanged(SelectionChangedEvent event) {
- Object input = fTabViewer.getInput();
- Object newInput = null;
+ protected void handleLaunchConfigurationSelectionChanged(SelectionChangedEvent event) {
+ Object input = fTabViewer.getInput();
+ Object newInput = null;
IStructuredSelection selection = event.getStructuredSelection();
- if (selection.size() == 1) {
+ if (selection.size() == 1) {
newInput = selection.getFirstElement();
- }
- if (!isEqual(input, newInput)) {
- ILaunchConfiguration original = fTabViewer.getOriginal();
- if (original != null && newInput == null && getLaunchManager().getMovedTo(original) != null) {
- return;
- }
- boolean deleted = false;
- if (original != null) {
- deleted = !original.exists();
- }
+ }
+ if (!isEqual(input, newInput)) {
+ ILaunchConfiguration original = fTabViewer.getOriginal();
+ if (original != null && newInput == null && getLaunchManager().getMovedTo(original) != null) {
+ return;
+ }
+ boolean deleted = false;
+ if (original != null) {
+ deleted = !original.exists();
+ }
boolean renamed = false;
if (newInput instanceof ILaunchConfiguration) {
renamed = getLaunchManager().getMovedFrom((ILaunchConfiguration)newInput) != null;
}
try {
fSettingInput = true;
- if (fTabViewer.canSave() && fTabViewer.isDirty() && !deleted && !renamed) {
- if(fLaunchConfigurationView != null) {
- fLaunchConfigurationView.setAutoSelect(false);
- }
- int ret = showUnsavedChangesDialog();
- if(ret == IDialogConstants.YES_ID) {
- fTabViewer.handleApplyPressed();
+ if (fTabViewer.canSave() && fTabViewer.isDirty() && !deleted && !renamed) {
+ if(fLaunchConfigurationView != null) {
+ fLaunchConfigurationView.setAutoSelect(false);
+ }
+ int ret = showUnsavedChangesDialog();
+ if(ret == IDialogConstants.YES_ID) {
+ fTabViewer.handleApplyPressed();
ILaunchConfigurationTab[] tabs = getTabs();
if (tabs != null) {
for (ILaunchConfigurationTab tab : tabs) {
tab.postApply();
}
}
- fTabViewer.setInput(newInput);
- }
+ fTabViewer.setInput(newInput);
+ }
else if(ret == IDialogConstants.NO_ID) {
fTabViewer.handleRevertPressed();
fTabViewer.setInput(newInput);
@@ -1045,24 +1045,24 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
else {
fLaunchConfigurationView.getViewer().setSelection(new StructuredSelection(input));
}
- fLaunchConfigurationView.setAutoSelect(true);
- }
- else {
- fTabViewer.setInput(newInput);
- if(fTabViewer.isDirty()) {
- fTabViewer.handleApplyPressed();
- }
- }
+ fLaunchConfigurationView.setAutoSelect(true);
+ }
+ else {
+ fTabViewer.setInput(newInput);
+ if(fTabViewer.isDirty()) {
+ fTabViewer.handleApplyPressed();
+ }
+ }
} finally {
fSettingInput = false;
updateButtons();
updateMessage();
}
- if(getShell() != null && getShell().isVisible()) {
- resize();
- }
- }
- }
+ if(getShell() != null && getShell().isVisible()) {
+ resize();
+ }
+ }
+ }
/**
* Notification the 'launch' button has been pressed. Save and launch.
@@ -1201,14 +1201,14 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
* @return true if they are equal, false if object 1 is null, the result of o1.equals(o2) otherwise
*/
protected boolean isEqual(Object o1, Object o2) {
- if (o1 == o2) {
- return true;
- } else if (o1 == null) {
- return false;
- } else {
- return o1.equals(o2);
- }
- }
+ if (o1 == o2) {
+ return true;
+ } else if (o1 == null) {
+ return false;
+ } else {
+ return o1.equals(o2);
+ }
+ }
/**
* Returns whether the dialog can be closed
@@ -1216,7 +1216,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
* @return whether the dialog can be closed
*/
protected boolean isSafeToClose() {
- return fActiveRunningOperations == 0;
+ return fActiveRunningOperations == 0;
}
/**
@@ -1349,17 +1349,17 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
* resize the dialog to show all relevant content
*/
protected void resize() {
- if(getTabGroup() != null) {
+ if(getTabGroup() != null) {
Point shell = getShell().getSize();
- int maxx = (int)(getDisplay().getBounds().width * MAX_DIALOG_WIDTH_PERCENT),
+ int maxx = (int)(getDisplay().getBounds().width * MAX_DIALOG_WIDTH_PERCENT),
maxy = (int) (getDisplay().getBounds().height * MAX_DIALOG_HEIGHT_PERCENT);
- maxx = (maxx < DEFAULT_INITIAL_DIALOG_SIZE.x ? DEFAULT_INITIAL_DIALOG_SIZE.x : maxx);
- maxy = (maxy < DEFAULT_INITIAL_DIALOG_SIZE.y ? DEFAULT_INITIAL_DIALOG_SIZE.y : maxy);
- Point psize = getShell().computeSize(SWT.DEFAULT, maxy);
- if((psize.x > maxx ? maxx : psize.x) > shell.x || (psize.y > maxy ? maxy : psize.y) > shell.y) {
+ maxx = (maxx < DEFAULT_INITIAL_DIALOG_SIZE.x ? DEFAULT_INITIAL_DIALOG_SIZE.x : maxx);
+ maxy = (maxy < DEFAULT_INITIAL_DIALOG_SIZE.y ? DEFAULT_INITIAL_DIALOG_SIZE.y : maxy);
+ Point psize = getShell().computeSize(SWT.DEFAULT, maxy);
+ if((psize.x > maxx ? maxx : psize.x) > shell.x || (psize.y > maxy ? maxy : psize.y) > shell.y) {
setShellSize(Math.min(psize.x, maxx), Math.min(psize.y, maxy));
constrainShellSize();
- }
+ }
}
}
@@ -1512,9 +1512,9 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
}
/**
- * Increase the size of this dialog's <code>Shell</code> by the specified amounts.
- * Do not increase the size of the Shell beyond the bounds of the Display.
- */
+ * Increase the size of this dialog's <code>Shell</code> by the specified amounts.
+ * Do not increase the size of the Shell beyond the bounds of the Display.
+ */
protected void setShellSize(int width, int height) {
Rectangle bounds = getShell().getMonitor().getBounds();
getShell().setSize(Math.min(width, bounds.width), Math.min(height, bounds.height));
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java
index adbb16e75..e8b188773 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java
@@ -68,29 +68,29 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib
* Command handler for launch shortcut key binding.
*/
private class LaunchCommandHandler extends AbstractHandler {
- // the shortcut to invoke
- private LaunchShortcutExtension fShortcut;
- private String fMode;
-
- /**
- * Constructs a new command handler for the given shortcut
- *
- * @param shortcut
- */
- public LaunchCommandHandler(LaunchShortcutExtension shortcut, String mode) {
- fShortcut = shortcut;
- fMode = mode;
- }
+ // the shortcut to invoke
+ private LaunchShortcutExtension fShortcut;
+ private String fMode;
+
+ /**
+ * Constructs a new command handler for the given shortcut
+ *
+ * @param shortcut
+ */
+ public LaunchCommandHandler(LaunchShortcutExtension shortcut, String mode) {
+ fShortcut = shortcut;
+ fMode = mode;
+ }
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
- LaunchShortcutAction action = new LaunchShortcutAction(fMode, fShortcut);
- if (action.isEnabled()) {
- action.run();
- } else {
- fShortcut.launch(new StructuredSelection(), fMode);
- }
- return null;
+ LaunchShortcutAction action = new LaunchShortcutAction(fMode, fShortcut);
+ if (action.isEnabled()) {
+ action.run();
+ } else {
+ fShortcut.launch(new StructuredSelection(), fMode);
+ }
+ return null;
}
}
@@ -116,16 +116,16 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib
/**
* Registers command handlers for launch shortcut key bindings
*/
- private void registerLaunchCommandHandlers() {
- IHandlerService handlerService = PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
- if(handlerService != null) {
+ private void registerLaunchCommandHandlers() {
+ IHandlerService handlerService = PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
+ if(handlerService != null) {
for (String mode : getModes()) {
- String id = getId() + "." + mode; //$NON-NLS-1$
- IHandler handler = new LaunchCommandHandler(this, mode);
- handlerService.activateHandler(id, handler);
- }
- }
- }
+ String id = getId() + "." + mode; //$NON-NLS-1$
+ IHandler handler = new LaunchCommandHandler(this, mode);
+ handlerService.activateHandler(id, handler);
+ }
+ }
+ }
/**
* Sets the configuration element that defines the attributes
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
index 2e3bd4845..606540170 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
@@ -215,13 +215,13 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe
@Override
protected IStatus run(final IProgressMonitor monitor) {
- if (monitor.isCanceled()) {
+ if (monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+ Display asyncDisplay = DebugUIPlugin.getStandardDisplay();
+ if (asyncDisplay == null || asyncDisplay.isDisposed()) {
return Status.CANCEL_STATUS;
}
- Display asyncDisplay = DebugUIPlugin.getStandardDisplay();
- if (asyncDisplay == null || asyncDisplay.isDisposed()) {
- return Status.CANCEL_STATUS;
- }
asyncDisplay.asyncExec(() -> {
IStatus result = null;
Throwable throwable = null;
@@ -242,10 +242,10 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe
done(result);
}
});
- return Job.ASYNC_FINISH;
+ return Job.ASYNC_FINISH;
}
- public abstract IStatus runInUIThread(IProgressMonitor monitor);
+ public abstract IStatus runInUIThread(IProgressMonitor monitor);
}
@@ -270,10 +270,10 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe
*/
private boolean fPrompting;
- /**
- * Maps each launch to its perspective context activation. These
- * are disabled when a launch terminates.
- */
+ /**
+ * Maps each launch to its perspective context activation. These
+ * are disabled when a launch terminates.
+ */
private Map<ILaunch, IContextActivation[]> fLaunchToContextActivations = new HashMap<>();
/**
@@ -304,10 +304,10 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe
*/
@Override
public synchronized void launchRemoved(final ILaunch launch) {
- ISuspendTrigger trigger = launch.getAdapter(ISuspendTrigger.class);
- if (trigger != null) {
- trigger.removeSuspendTriggerListener(this);
- }
+ ISuspendTrigger trigger = launch.getAdapter(ISuspendTrigger.class);
+ if (trigger != null) {
+ trigger.removeSuspendTriggerListener(this);
+ }
Runnable r = () -> {
IContextActivation[] activations = fLaunchToContextActivations.remove(launch);
if (activations != null) {
@@ -336,10 +336,10 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe
*/
@Override
public synchronized void launchAdded(ILaunch launch) {
- ISuspendTrigger trigger = launch.getAdapter(ISuspendTrigger.class);
- if (trigger != null) {
- trigger.addSuspendTriggerListener(this);
- }
+ ISuspendTrigger trigger = launch.getAdapter(ISuspendTrigger.class);
+ if (trigger != null) {
+ trigger.addSuspendTriggerListener(this);
+ }
String perspectiveId = null;
// check event filters
try {
@@ -890,8 +890,8 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe
*
* @return XML
* @exception IOException if unable to generate the XML
- * @exception TransformerException if unable to generate the XML
- * @exception ParserConfigurationException if unable to generate the XML
+ * @exception TransformerException if unable to generate the XML
+ * @exception ParserConfigurationException if unable to generate the XML
*/
private String generatePerspectiveXML() throws ParserConfigurationException, CoreException {
Document doc = DebugUIPlugin.getDocument();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SaveScopeResourcesHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SaveScopeResourcesHandler.java
index 500ef030b..f8a61893c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SaveScopeResourcesHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SaveScopeResourcesHandler.java
@@ -169,27 +169,27 @@ public class SaveScopeResourcesHandler implements IStatusHandler {
projects = (IProject[]) objects[1];
}
}
- if (config != null) {
- if (DebugUITools.isPrivate(config)) {
- return Boolean.TRUE;
- }
- }
- if (projects != null && projects.length > 0) {
- IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore();
- String save = store.getString(IInternalDebugUIConstants.PREF_SAVE_DIRTY_EDITORS_BEFORE_LAUNCH);
- int ret = showSaveDialog(projects, !save.equals(MessageDialogWithToggle.NEVER), save.equals(MessageDialogWithToggle.PROMPT));
- if(ret == IDialogConstants.OK_ID) {
- doSave();
- return Boolean.TRUE;
- }
- return Boolean.FALSE;
- }
- else {
+ if (config != null) {
+ if (DebugUITools.isPrivate(config)) {
+ return Boolean.TRUE;
+ }
+ }
+ if (projects != null && projects.length > 0) {
+ IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore();
+ String save = store.getString(IInternalDebugUIConstants.PREF_SAVE_DIRTY_EDITORS_BEFORE_LAUNCH);
+ int ret = showSaveDialog(projects, !save.equals(MessageDialogWithToggle.NEVER), save.equals(MessageDialogWithToggle.PROMPT));
+ if(ret == IDialogConstants.OK_ID) {
+ doSave();
+ return Boolean.TRUE;
+ }
+ return Boolean.FALSE;
+ }
+ else {
@SuppressWarnings("deprecation")
boolean cancel = DebugUIPlugin.preLaunchSave();
- return Boolean.valueOf(cancel);
- }
- }
+ return Boolean.valueOf(cancel);
+ }
+ }
/**
*
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectFavoritesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectFavoritesDialog.java
index b10f6b6fe..eba5ab2f7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectFavoritesDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectFavoritesDialog.java
@@ -91,11 +91,11 @@ public class SelectFavoritesDialog extends AbstractDebugCheckboxSelectionDialog
/**
* Returns a label to use for launch mode with accelerators removed.
*
- * @return label to use for launch mode with accelerators removed
- */
- private String getModeLabel() {
- return DebugUIPlugin.removeAccelerators(fHistory.getLaunchGroup().getLabel());
- }
+ * @return label to use for launch mode with accelerators removed
+ */
+ private String getModeLabel() {
+ return DebugUIPlugin.removeAccelerators(fHistory.getLaunchGroup().getLabel());
+ }
@Override
protected String getDialogSettingsId() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingType.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingType.java
index 2b027a688..d1380037a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingType.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingType.java
@@ -30,55 +30,55 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate;
*/
class MemoryRenderingType implements IMemoryRenderingType {
- private IConfigurationElement fConfigurationElement;
- private IMemoryRenderingTypeDelegate fDelegate;
+ private IConfigurationElement fConfigurationElement;
+ private IMemoryRenderingTypeDelegate fDelegate;
- // attributes for a memoryRenderingType
- static final String ATTR_MEM_RENDERING_TYPE_NAME = "name"; //$NON-NLS-1$
- static final String ATTR_MEM_RENDERING_TYPE_ID = "id"; //$NON-NLS-1$
- static final String ATTR_MEM_RENDERING_TYPE_DELEGATE = "class"; //$NON-NLS-1$
+ // attributes for a memoryRenderingType
+ static final String ATTR_MEM_RENDERING_TYPE_NAME = "name"; //$NON-NLS-1$
+ static final String ATTR_MEM_RENDERING_TYPE_ID = "id"; //$NON-NLS-1$
+ static final String ATTR_MEM_RENDERING_TYPE_DELEGATE = "class"; //$NON-NLS-1$
- /**
- * Constructs a rendering type from a contribution.
- */
- MemoryRenderingType(IConfigurationElement element) {
- fConfigurationElement = element;
- }
+ /**
+ * Constructs a rendering type from a contribution.
+ */
+ MemoryRenderingType(IConfigurationElement element) {
+ fConfigurationElement = element;
+ }
- @Override
+ @Override
public String getLabel() {
- return fConfigurationElement.getAttribute(ATTR_MEM_RENDERING_TYPE_NAME);
- }
+ return fConfigurationElement.getAttribute(ATTR_MEM_RENDERING_TYPE_NAME);
+ }
- @Override
+ @Override
public String getId() {
- return fConfigurationElement.getAttribute(ATTR_MEM_RENDERING_TYPE_ID);
- }
+ return fConfigurationElement.getAttribute(ATTR_MEM_RENDERING_TYPE_ID);
+ }
- @Override
+ @Override
public IMemoryRendering createRendering() throws CoreException {
- if (fDelegate == null) {
- fDelegate = (IMemoryRenderingTypeDelegate) fConfigurationElement.createExecutableExtension(ATTR_MEM_RENDERING_TYPE_DELEGATE);
- }
- return fDelegate.createRendering(getId());
- }
+ if (fDelegate == null) {
+ fDelegate = (IMemoryRenderingTypeDelegate) fConfigurationElement.createExecutableExtension(ATTR_MEM_RENDERING_TYPE_DELEGATE);
+ }
+ return fDelegate.createRendering(getId());
+ }
- /**
- * Validates this contribution.
- *
- * @exception CoreException if invalid
- */
- void validate() throws CoreException {
- verifyPresent(ATTR_MEM_RENDERING_TYPE_ID);
- verifyPresent(ATTR_MEM_RENDERING_TYPE_NAME);
- verifyPresent(ATTR_MEM_RENDERING_TYPE_DELEGATE);
- }
+ /**
+ * Validates this contribution.
+ *
+ * @exception CoreException if invalid
+ */
+ void validate() throws CoreException {
+ verifyPresent(ATTR_MEM_RENDERING_TYPE_ID);
+ verifyPresent(ATTR_MEM_RENDERING_TYPE_NAME);
+ verifyPresent(ATTR_MEM_RENDERING_TYPE_DELEGATE);
+ }
- private void verifyPresent(String attrName) throws CoreException {
- if (fConfigurationElement.getAttribute(attrName) == null) {
- Status status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR,
- "<memoryRenderingType> element missing required attribute: " + attrName, null); //$NON-NLS-1$
- throw new CoreException(status);
- }
- }
+ private void verifyPresent(String attrName) throws CoreException {
+ if (fConfigurationElement.getAttribute(attrName) == null) {
+ Status status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR,
+ "<memoryRenderingType> element missing required attribute: " + attrName, null); //$NON-NLS-1$
+ throw new CoreException(status);
+ }
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java
index 57f5608e7..13f305fe1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java
@@ -39,28 +39,28 @@ public class BreakpointContainerLabelProvider extends DebugElementLabelProvider
ImageDescriptor desc = super.getImageDescriptor(elementPath, presentationContext, columnId);
int flags = computeAdornmentFlags();
- if (flags > 0) {
- Image image = DebugUIPlugin.getImageDescriptorRegistry().get(desc);
- CompositeDebugImageDescriptor compDesc = new CompositeDebugImageDescriptor(image, flags);
- return compDesc;
- }
- return desc;
+ if (flags > 0) {
+ Image image = DebugUIPlugin.getImageDescriptorRegistry().get(desc);
+ CompositeDebugImageDescriptor compDesc = new CompositeDebugImageDescriptor(image, flags);
+ return compDesc;
+ }
+ return desc;
}
@Override
public boolean getChecked(TreePath path, IPresentationContext presentationContext) throws CoreException {
Object lastSegment = path.getLastSegment();
- if (lastSegment instanceof IBreakpointContainer) {
- IBreakpointContainer container = (IBreakpointContainer) lastSegment;
- IBreakpoint[] breakpoints = container.getBreakpoints();
- for (int i = 0; i < breakpoints.length; ++i) {
- if (breakpoints[i].isEnabled()) {
+ if (lastSegment instanceof IBreakpointContainer) {
+ IBreakpointContainer container = (IBreakpointContainer) lastSegment;
+ IBreakpoint[] breakpoints = container.getBreakpoints();
+ for (int i = 0; i < breakpoints.length; ++i) {
+ if (breakpoints[i].isEnabled()) {
return true;
}
- }
+ }
- return false;
- }
+ return false;
+ }
return super.getChecked(path, presentationContext);
}
@@ -102,10 +102,10 @@ public class BreakpointContainerLabelProvider extends DebugElementLabelProvider
FontData fontData = super.getFontData(elementPath, presentationContext, columnId);
if (fontData == null && element instanceof IAdaptable) {
- IWorkbenchAdapter2 adapter = ((IAdaptable)element).getAdapter(IWorkbenchAdapter2.class);
- if (adapter != null) {
- fontData = adapter.getFont(element);
- }
+ IWorkbenchAdapter2 adapter = ((IAdaptable)element).getAdapter(IWorkbenchAdapter2.class);
+ if (adapter != null) {
+ fontData = adapter.getFont(element);
+ }
}
return fontData;
}
@@ -117,10 +117,10 @@ public class BreakpointContainerLabelProvider extends DebugElementLabelProvider
RGB rgb = super.getForeground(elementPath, presentationContext, columnId);
if (rgb == null && element instanceof IAdaptable) {
- IWorkbenchAdapter2 adapter = ((IAdaptable)element).getAdapter(IWorkbenchAdapter2.class);
- if (adapter != null) {
- rgb = adapter.getForeground(element);
- }
+ IWorkbenchAdapter2 adapter = ((IAdaptable)element).getAdapter(IWorkbenchAdapter2.class);
+ if (adapter != null) {
+ rgb = adapter.getForeground(element);
+ }
}
return rgb;
}
@@ -132,23 +132,23 @@ public class BreakpointContainerLabelProvider extends DebugElementLabelProvider
RGB rgb = super.getBackground(elementPath, presentationContext, columnId);
if (rgb == null && element instanceof IAdaptable) {
- IWorkbenchAdapter2 adapter = ((IAdaptable)element).getAdapter(IWorkbenchAdapter2.class);
- if (adapter != null) {
- rgb = adapter.getBackground(element);
- }
+ IWorkbenchAdapter2 adapter = ((IAdaptable)element).getAdapter(IWorkbenchAdapter2.class);
+ if (adapter != null) {
+ rgb = adapter.getBackground(element);
+ }
}
return rgb;
}
/**
- * Computes and return common adornment flags for the given category.
- *
- * @return adornment flags defined in CompositeDebugImageDescriptor
- */
- private int computeAdornmentFlags() {
- if (!DebugPlugin.getDefault().getBreakpointManager().isEnabled()) {
- return CompositeDebugImageDescriptor.SKIP_BREAKPOINT;
- }
- return 0;
- }
+ * Computes and return common adornment flags for the given category.
+ *
+ * @return adornment flags defined in CompositeDebugImageDescriptor
+ */
+ private int computeAdornmentFlags() {
+ if (!DebugPlugin.getDefault().getBreakpointManager().isEnabled()) {
+ return CompositeDebugImageDescriptor.SKIP_BREAKPOINT;
+ }
+ return 0;
+ }
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java
index 175603b8c..d0a952f4e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java
@@ -74,209 +74,209 @@ import org.eclipse.ui.IWorkbenchWindow;
* @since 3.6
*/
public class BreakpointManagerContentProvider extends ElementContentProvider
- implements IBreakpointsListener {
-
- /**
- * Breakpoint input data. Contains all input specific data.
- *
- * @since 3.6
- */
- private class InputData {
- /**
- * Breakpoint manager input
- */
- final private DefaultBreakpointsViewInput fInput;
-
- /**
- * Model proxy of the input
- */
+ implements IBreakpointsListener {
+
+ /**
+ * Breakpoint input data. Contains all input specific data.
+ *
+ * @since 3.6
+ */
+ private class InputData {
+ /**
+ * Breakpoint manager input
+ */
+ final private DefaultBreakpointsViewInput fInput;
+
+ /**
+ * Model proxy of the input
+ */
final private List<BreakpointManagerProxy> fProxies = new ArrayList<>(1);
- /**
- * Element comparator, use to compare the ordering of elements for the model
- * <br/> Note: We assume that the comparator does not change.
- */
- private ElementComparator fComparator;
+ /**
+ * Element comparator, use to compare the ordering of elements for the model
+ * <br/> Note: We assume that the comparator does not change.
+ */
+ private ElementComparator fComparator;
- /**
- * The breakpoint root container.<br/>
- * Note: The final qualifier guarantees that fContainer will be
- * initialized before the class is accessed on other threads.
- */
- final private BreakpointContainer fContainer;
+ /**
+ * The breakpoint root container.<br/>
+ * Note: The final qualifier guarantees that fContainer will be
+ * initialized before the class is accessed on other threads.
+ */
+ final private BreakpointContainer fContainer;
- /**
- * Known current breakpoint organizers.
- */
- private IBreakpointOrganizer[] fOrganizers;
+ /**
+ * Known current breakpoint organizers.
+ */
+ private IBreakpointOrganizer[] fOrganizers;
- private IStructuredSelection fDebugContext = StructuredSelection.EMPTY;
+ private IStructuredSelection fDebugContext = StructuredSelection.EMPTY;
- private IPropertyChangeListener fOrganizersListener = new IPropertyChangeListener() {
- @Override
+ private IPropertyChangeListener fOrganizersListener = new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
- // For any property changes in breakpoint organizers, refresh the containers.
- updateContainers();
- }
- };
+ // For any property changes in breakpoint organizers, refresh the containers.
+ updateContainers();
+ }
+ };
- private IPropertyChangeListener fPresentationContextListener = new IPropertyChangeListener() {
- @Override
+ private IPropertyChangeListener fPresentationContextListener = new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
- presentationPropertyChanged(event);
- }
- };
+ presentationPropertyChanged(event);
+ }
+ };
- private IDebugContextListener fDebugContextListener = new IDebugContextListener() {
- @Override
+ private IDebugContextListener fDebugContextListener = new IDebugContextListener() {
+ @Override
public void debugContextChanged(DebugContextEvent event) {
- InputData.this.debugContextChanged(event);
- }
- };
-
- /**
- * Constructor
- *
- * @param input the breakpoint manager input
- */
- InputData(DefaultBreakpointsViewInput input) {
- fInput = input;
- fComparator = (ElementComparator)
- input.getContext().getProperty(IBreakpointUIConstants.PROP_BREAKPOINTS_ELEMENT_COMPARATOR);
-
- fOrganizers = (IBreakpointOrganizer[])
- input.getContext().getProperty(IBreakpointUIConstants.PROP_BREAKPOINTS_ORGANIZERS);
-
- // Create the initial container.
- ModelDelta initialDelta = new ModelDelta(fInput, 0, IModelDelta.NO_CHANGE, -1);
- IBreakpoint[] breakpoints = filterBreakpoints(
- fInput, getSelectionFilter(fInput, getDebugContext()), fBpManager.getBreakpoints());
- fContainer = createRootContainer(initialDelta, fInput, fOrganizers, breakpoints);
-
- registerOrganizersListener(null, fOrganizers);
- input.getContext().addPropertyChangeListener(fPresentationContextListener);
-
- IWorkbenchWindow window = fInput.getContext().getWindow();
- if (window != null) {
- IDebugContextService debugContextService = DebugUITools.getDebugContextManager().getContextService(window);
- ISelection debugContext = debugContextServi