Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.core.externaltools/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.core.externaltools/pom.xml4
-rw-r--r--org.eclipse.core.variables/pom.xml2
-rw-r--r--org.eclipse.debug.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunch.java123
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java22
-rw-r--r--org.eclipse.debug.core/pom.xml6
-rw-r--r--org.eclipse.debug.examples.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.debug.examples.core/pom.xml4
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java14
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java4
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunch.java26
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java20
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/SequencerControl.java50
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TimeControl.java12
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java18
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java50
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java16
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java44
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/IPDAEventListener.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugElement.java42
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAMemoryBlock.java4
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackFrame.java36
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackValue.java16
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java22
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java18
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java6
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java6
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDACommand.java18
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDACommandResult.java6
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java12
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java14
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java16
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java12
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvent.java36
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java18
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommandResult.java6
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java12
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java6
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java14
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommandResult.java6
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java12
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java14
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java6
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java14
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java14
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java12
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java14
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java14
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourceLookupDirector.java8
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourceLookupParticipant.java10
-rw-r--r--org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourcePathComputerDelegate.java10
-rw-r--r--org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.debug.examples.memory/pom.xml4
-rw-r--r--org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/MemoryViewSamplePlugin.java2
-rw-r--r--org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleDebugTarget.java4
-rw-r--r--org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleMemoryBlock.java6
-rw-r--r--org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleStackFrame.java4
-rw-r--r--org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleThread.java4
-rw-r--r--org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleEngine.java12
-rw-r--r--org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleMemoryUnit.java2
-rwxr-xr-xorg.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.debug.examples.mixedmode/pom.xml4
-rwxr-xr-xorg.eclipse.debug.examples.mixedmode/src/org/eclipse/debug/internal/examples/mixedmode/Activator.java2
-rw-r--r--org.eclipse.debug.examples.mixedmode/src/org/eclipse/debug/internal/examples/mixedmode/DoNothingLaunchConfigurationDelegate.java2
-rw-r--r--org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.debug.examples.ui/pom.xml4
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/CheckboxModelProxyFactory.java4
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlCellModifier.java8
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlEditor.java4
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlEventHandler.java20
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlLabelProvider.java4
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlsMementoProvider.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiAdapterFactory.java22
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiStepOverHandler.java2
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnFactory.java4
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnPresentation.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerContentProvider.java12
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerControlsModelProxy.java24
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerModelProxyFactory.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnFactory.java4
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnPresentation.java8
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackContentProvider.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackLabelProvider.java4
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackModelProxy.java10
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ClockSliderDetailPane.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/TempoSliderDetailPane.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/ExampleLaunchStatusHandler.java2
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java36
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiTabGroup.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/AddPDAMemoryBlockAction.java10
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/CommandAdapterFactory.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/ModelProxyFactory.java2
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDADebugTargetContentProvider.java4
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDADebugTargetProxy.java2
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDARestartDebugCommand.java4
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java20
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDABreakpointAdapter.java32
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAEditorAdapterFactory.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDARunToLineAdapter.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java40
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAContentAssistant.java16
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAEditor.java10
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java16
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDASourceViewerConfiguration.java10
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PopFrameActionDelegate.java12
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/TextHover.java8
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/WordFinder.java34
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDALaunchShortcut.java4
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java32
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDATabGroup.java6
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/presentation/PDAModelPresentation.java26
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/AbstractDataStackViewHandler.java18
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CheckboxView.java8
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/DataStackView.java22
-rw-r--r--org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PushHandler.java2
-rw-r--r--org.eclipse.debug.tests/.classpath2
-rw-r--r--org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs16
-rw-r--r--org.eclipse.debug.tests/META-INF/MANIFEST.MF4
-rw-r--r--org.eclipse.debug.tests/pom.xml6
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/AbstractDebugTest.java95
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestUtil.java225
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java5
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java47
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java58
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/TestHelper.java49
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java10
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java5
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AcceleratorSubstitutionTests.java5
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentParsingTests.java5
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchFavoriteTests.java2
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java39
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/sourcelookup/SourceLookupFacilityTests.java5
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/statushandlers/StatusHandlerTests.java5
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/stepfilters/StepFiltersTests.java5
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/MemoryRenderingTests.java5
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/CheckTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ChildrenUpdateTests.java8
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ColumnPresentationTests.java13
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/DeltaTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTransformTests.java5
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/JFaceViewerTopIndexTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/LazyTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PerformanceTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PopupTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PresentationContextTests.java5
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/SelectionTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/StateTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/UpdateTests.java7
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/VirtualViewerLazyModeTests.java7
-rw-r--r--org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs5
-rw-r--r--org.eclipse.debug.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.debug.ui/pom.xml6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ColorManager.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchConfigurationTabExtension.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariableValueEditorManager.java2
-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/ConfigureColumnsAction.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchShortcutAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllTerminatedAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SelectAllAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleBreakpointsTargetManager.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsActionDelegate.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SelectBreakpointWorkingsetDialog.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowSupportedBreakpointsAction.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/OtherBreakpointCategory.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DebugCommandService.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java20
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextSourceProvider.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java30
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/SuspendTriggerAdapterFactory.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockContentAdapter.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/RegisterGroupProxy.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationTabGroup.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsSelectionPage.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizardPage.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java5
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchDelegatesStatusHandler.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java36
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java22
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationViewer.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java18
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties18
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistory.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java23
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SaveScopeResourcesHandler.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectFavoritesDialog.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchModesDialog.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetsFilter.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/MemoryRenderingManager.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/RenderingBindings.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ElementLabelProvider.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java16
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java18
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/RunDebugPropertiesPage.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/BasicContainerContentProvider.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/ResolveDuplicatesHandler.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerAction.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerViewer.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupManager.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupPanel.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupUIUtils.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveFilter.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerBrowser.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerBrowser.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/WorkingSetSourceContainerBrowser.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariablePresentationManager.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/TreeViewerDropDown.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/FilterTransform.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java20
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java119
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerStateTracker.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ModelDelta.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/PresentationContext.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTree.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointManagerProxy.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/EventHandlerModelProxy.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchProxy.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ThreadEventHandler.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java32
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerManager.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java18
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetCache.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetElementAdapter.java2
-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/BreakpointsContentProvider.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDropAdapter.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsViewer.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementHelper.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DecorationManager.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewCopyToClipboardActionDelegate.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewIdRegistry.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneSelectionProvider.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncCopyTableRenderingAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncPrintTableRenderingAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/MemorySegment.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java14
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/LogicalStructureCache.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AbstractDetailPane.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPaneFactory.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java10
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/EnvironmentTab.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/BreakpointTypesContribution.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandHandler.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.java2
-rw-r--r--org.eclipse.ui.console/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.ui.console/pom.xml4
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java86
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/ConsolePlugin.java70
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IConsole.java24
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IConsoleConstants.java44
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IConsoleDocumentPartitioner.java42
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IConsoleFactory.java14
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IConsoleListener.java10
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IConsoleManager.java60
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IConsolePageParticipant.java54
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IConsoleView.java52
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IHyperlink.java8
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IHyperlink2.java6
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsole.java324
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleInputStream.java436
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleOutputStream.java320
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IPatternMatchListener.java66
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/IPatternMatchListenerDelegate.java42
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/MessageConsole.java88
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/MessageConsoleStream.java36
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/PatternMatchEvent.java86
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java752
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsolePage.java299
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsoleViewer.java1142
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java12
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/console/actions/CloseConsoleAction.java16
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocument.java30
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocumentAdapter.java506
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDropDownAction.java38
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleFactoryExtension.java136
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleHyperlinkPosition.java2
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java274
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleMessages.java22
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java62
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java236
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleResourceBundleMessages.java30
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleTypePropertyTester.java14
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java325
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleViewConsoleFactory.java40
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleWorkbenchPart.java2
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/FollowHyperlinkAction.java22
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/HyperlinkUpdater.java6
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IInternalConsoleConstants.java2
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePage.java178
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartition.java348
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java456
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsoleViewer.java214
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java172
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListener.java70
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java202
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PinConsoleAction.java2
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ScrollLockAction.java10
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ShowConsoleAction.java16
-rw-r--r--org.eclipse.ui.console/src/org/eclipse/ui/internal/console/WordWrapAction.java2
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java4
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java34
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/menu/OpenExternalToolsConfigurations.java2
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsImages.java42
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.java6
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/IExternalToolsHelpContextIds.java10
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/IPreferenceConstants.java4
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java4
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.java4
-rw-r--r--org.eclipse.ui.externaltools/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.java4
-rw-r--r--org.eclipse.ui.externaltools/pom.xml4
-rw-r--r--pom.xml4
432 files changed, 5840 insertions, 5397 deletions
diff --git a/org.eclipse.core.externaltools/META-INF/MANIFEST.MF b/org.eclipse.core.externaltools/META-INF/MANIFEST.MF
index a431bb41a..83109043c 100644
--- a/org.eclipse.core.externaltools/META-INF/MANIFEST.MF
+++ b/org.eclipse.core.externaltools/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.core.externaltools;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
Bundle-Activator: org.eclipse.core.externaltools.internal.ExternalToolsCore
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.9.0,4.0.0)",
diff --git a/org.eclipse.core.externaltools/pom.xml b/org.eclipse.core.externaltools/pom.xml
index ffe2d03da..f93e7d8a8 100644
--- a/org.eclipse.core.externaltools/pom.xml
+++ b/org.eclipse.core.externaltools/pom.xml
@@ -14,10 +14,10 @@
<parent>
<artifactId>eclipse.platform.debug</artifactId>
<groupId>eclipse.platform.debug</groupId>
- <version>4.7.1-SNAPSHOT</version>
+ <version>4.8.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.externaltools</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.core.variables/pom.xml b/org.eclipse.core.variables/pom.xml
index f327bc612..40689dabd 100644
--- a/org.eclipse.core.variables/pom.xml
+++ b/org.eclipse.core.variables/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.debug</artifactId>
<groupId>eclipse.platform.debug</groupId>
- <version>4.7.1-SNAPSHOT</version>
+ <version>4.8.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.variables</artifactId>
diff --git a/org.eclipse.debug.core/META-INF/MANIFEST.MF b/org.eclipse.debug.core/META-INF/MANIFEST.MF
index 5e1017435..ed8865310 100644
--- a/org.eclipse.debug.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.debug.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.debug.core; singleton:=true
-Bundle-Version: 3.11.0.qualifier
+Bundle-Version: 3.11.100.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.debug.core.DebugPlugin
Bundle-Vendor: %providerName
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunch.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunch.java
index e611a4686..d46953cf4 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunch.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunch.java
@@ -46,8 +46,8 @@ public class GroupLaunch extends Launch implements ILaunchesListener2 {
private boolean fLaunched = false;
/**
- * A map of all our sub-launches and the current processes that belong
- * to each one.
+ * A map of all our sub-launches and the current processes that belong to
+ * each one.
*/
private Map<ILaunch, IProcess[]> subLaunches = new HashMap<ILaunch, IProcess[]>();
@@ -66,21 +66,25 @@ public class GroupLaunch extends Launch implements ILaunchesListener2 {
* @param subLaunch
*/
public void addSubLaunch(ILaunch subLaunch) {
- subLaunches.put(subLaunch, new IProcess[] {});
+ synchronized (subLaunches) {
+ subLaunches.put(subLaunch, new IProcess[] {});
+ }
}
private boolean isChild(ILaunch launch) {
- for (ILaunch subLaunch : subLaunches.keySet()) {
- if (subLaunch == launch) {
- return true;
+ synchronized (subLaunches) {
+ for (ILaunch subLaunch : subLaunches.keySet()) {
+ if (subLaunch == launch) {
+ return true;
+ }
}
+ return false;
}
- return false;
}
/**
- * Override default behavior by querying all sub-launches to see if they
- * are terminated
+ * Override default behavior by querying all sub-launches to see if they are
+ * terminated
*
* @see org.eclipse.debug.core.Launch#isTerminated()
*/
@@ -90,14 +94,16 @@ public class GroupLaunch extends Launch implements ILaunchesListener2 {
return true;
}
- if (subLaunches.size() == 0) {
- return fLaunched; // in case we're done launching and there is
- // nobody -> terminated
- }
+ synchronized (subLaunches) {
+ if (subLaunches.size() == 0) {
+ return fLaunched; // in case we're done launching and there is
+ // nobody -> terminated
+ }
- for (ILaunch launch : subLaunches.keySet()) {
- if (!launch.isTerminated()) {
- return false;
+ for (ILaunch launch : subLaunches.keySet()) {
+ if (!launch.isTerminated()) {
+ return false;
+ }
}
}
return fLaunched; // we're done only if we're already done launching.
@@ -113,16 +119,18 @@ public class GroupLaunch extends Launch implements ILaunchesListener2 {
*/
@Override
public boolean canTerminate() {
- if (subLaunches.size() == 0) {
- return false;
- }
+ synchronized (subLaunches) {
+ if (subLaunches.size() == 0) {
+ return false;
+ }
- for (ILaunch launch : subLaunches.keySet()) {
- if (launch.canTerminate()) {
- return true;
+ for (ILaunch launch : subLaunches.keySet()) {
+ if (launch.canTerminate()) {
+ return true;
+ }
}
+ return false;
}
- return false;
}
/**
@@ -139,12 +147,14 @@ public class GroupLaunch extends Launch implements ILaunchesListener2 {
// group when children disappear even if launching has not finished yet.
markLaunched();
- for (ILaunch launch : subLaunches.keySet()) {
- if (launch.canTerminate()) {
- try {
- launch.terminate();
- } catch (DebugException e) {
- status.merge(e.getStatus());
+ synchronized (subLaunches) {
+ for (ILaunch launch : subLaunches.keySet()) {
+ if (launch.canTerminate()) {
+ try {
+ launch.terminate();
+ } catch (DebugException e) {
+ status.merge(e.getStatus());
+ }
}
}
}
@@ -171,13 +181,16 @@ public class GroupLaunch extends Launch implements ILaunchesListener2 {
return;
}
- // Remove sub launch, keeping the processes of the terminated launch
- // to show the association and to keep the console content accessible
- if (subLaunches.remove(launch) != null) {
- // terminate ourselves if this is the last sub launch
- if (subLaunches.size() == 0 && fLaunched) {
- fTerminated = true;
- fireTerminate();
+ synchronized (subLaunches) {
+ // Remove sub launch, keeping the processes of the terminated launch
+ // to show the association and to keep the console content
+ // accessible
+ if (subLaunches.remove(launch) != null) {
+ // terminate ourselves if this is the last sub launch
+ if (subLaunches.size() == 0 && fLaunched) {
+ fTerminated = true;
+ fireTerminate();
+ }
}
}
}
@@ -188,25 +201,27 @@ public class GroupLaunch extends Launch implements ILaunchesListener2 {
return;
}
- // add/remove processes
- if (isChild(launch)) {
- // Remove old processes
- IProcess[] oldProcesses = subLaunches.get(launch);
- IProcess[] newProcesses = launch.getProcesses();
-
- // avoid notifications when processes have not changed.
- if (!Arrays.equals(oldProcesses, newProcesses)) {
- for (IProcess oldProcess : oldProcesses) {
- removeProcess(oldProcess);
- }
-
- // Add new processes
- for (IProcess newProcess : newProcesses) {
- addProcess(newProcess);
+ synchronized (subLaunches) {
+ // add/remove processes
+ if (isChild(launch)) {
+ // Remove old processes
+ IProcess[] oldProcesses = subLaunches.get(launch);
+ IProcess[] newProcesses = launch.getProcesses();
+
+ // avoid notifications when processes have not changed.
+ if (!Arrays.equals(oldProcesses, newProcesses)) {
+ for (IProcess oldProcess : oldProcesses) {
+ removeProcess(oldProcess);
+ }
+
+ // Add new processes
+ for (IProcess newProcess : newProcesses) {
+ addProcess(newProcess);
+ }
+
+ // Replace the processes of the changed launch
+ subLaunches.put(launch, newProcesses);
}
-
- // Replace the processes of the changed launch
- subLaunches.put(launch, newProcesses);
}
}
}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java
index fbd3397d4..c948c63b3 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java
@@ -147,8 +147,10 @@ public class GroupLaunchConfigurationDelegate extends LaunchConfigurationDelegat
private boolean launchChild(SubMonitor monitor, final GroupLaunch group, GroupLaunchElement le, final ILaunchConfiguration child, final String localMode, boolean lastConfig) throws CoreException {
final Set<ILaunch> running = le.adoptIfRunning ? findRunningLaunch(le.name) : Collections.emptySet();
ILaunch subLaunch = running.stream().findFirst().orElse(null);
+ boolean launched = false;
if (subLaunch == null) {
subLaunch = child.launch(localMode, monitor);
+ launched = true;
}
group.addSubLaunch(subLaunch);
@@ -159,11 +161,13 @@ public class GroupLaunchConfigurationDelegate extends LaunchConfigurationDelegat
// So, fake another event now.
group.launchChanged(subLaunch);
- // give handler a chance to perform additional actions after
- // launching each of the members.
- IStatusHandler postLaunchHandler = DebugPlugin.getDefault().getStatusHandler(GROUP_ELEMENT_STARTED);
- postLaunchHandler.handleStatus(GROUP_ELEMENT_STARTED, new ILaunch[] {
- group, subLaunch });
+ if (launched) {
+ // give handler a chance to perform additional actions after
+ // launching each of the members.
+ IStatusHandler postLaunchHandler = DebugPlugin.getDefault().getStatusHandler(GROUP_ELEMENT_STARTED);
+ postLaunchHandler.handleStatus(GROUP_ELEMENT_STARTED, new ILaunch[] {
+ group, subLaunch });
+ }
// if this is the last child, mark the group as "launching finished", so
// that from now on the last terminating child will also terminate the
@@ -172,7 +176,13 @@ public class GroupLaunchConfigurationDelegate extends LaunchConfigurationDelegat
group.markLaunched();
}
- return postLaunchAction(subLaunch, le, monitor);
+ // in case we adopted the launch, and did not launch outselves, don't
+ // execute the post launch action!
+ if (launched) {
+ return postLaunchAction(subLaunch, le, monitor);
+ } else {
+ return true;
+ }
}
private boolean postLaunchAction(ILaunch subLaunch, GroupLaunchElement le, IProgressMonitor monitor) {
diff --git a/org.eclipse.debug.core/pom.xml b/org.eclipse.debug.core/pom.xml
index 0c518a089..05b173188 100644
--- a/org.eclipse.debug.core/pom.xml
+++ b/org.eclipse.debug.core/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2016 Eclipse Foundation and others.
+ Copyright (c) 2012, 2017 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -14,10 +14,10 @@
<parent>
<artifactId>eclipse.platform.debug</artifactId>
<groupId>eclipse.platform.debug</groupId>
- <version>4.7.1-SNAPSHOT</version>
+ <version>4.8.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.debug</groupId>
<artifactId>org.eclipse.debug.core</artifactId>
- <version>3.11.0-SNAPSHOT</version>
+ <version>3.11.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF b/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF
index 62626c322..b4b7e0fd4 100644
--- a/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.debug.examples.core;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.100.qualifier
Bundle-Activator: org.eclipse.debug.examples.core.pda.DebugCorePlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
diff --git a/org.eclipse.debug.examples.core/pom.xml b/org.eclipse.debug.examples.core/pom.xml
index e0236b3b8..b935c211a 100644
--- a/org.eclipse.debug.examples.core/pom.xml
+++ b/org.eclipse.debug.examples.core/pom.xml
@@ -14,10 +14,10 @@
<parent>
<artifactId>eclipse.platform.debug</artifactId>
<groupId>eclipse.platform.debug</groupId>
- <version>4.7.1-SNAPSHOT</version>
+ <version>4.8.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.debug</groupId>
<artifactId>org.eclipse.debug.examples.core</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java
index 242236705..7f00c883a 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -18,7 +18,7 @@ import org.eclipse.debug.examples.core.pda.DebugCorePlugin;
/**
* Controls the location of the sequencer in microseconds.
- *
+ *
* @since 1.0
*/
public class ClockControl extends TimeControl {
@@ -29,7 +29,7 @@ public class ClockControl extends TimeControl {
public ClockControl(MidiLaunch launch) {
super("Time" , launch); //$NON-NLS-1$
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.examples.core.midi.launcher.TimeControl#getTimeValue()
*/
@@ -73,13 +73,13 @@ public class ClockControl extends TimeControl {
return e.getStatus();
}
}
-
+
/**
* Returns a float for the string.
- *
+ *
* @param value string
* @return float
- * @throws CoreException if not a valid value
+ * @throws CoreException if not a valid value
*/
protected long getLong(String value) throws CoreException {
try {
@@ -92,6 +92,6 @@ public class ClockControl extends TimeControl {
}
return 0L;
}
-
+
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java
index 3ab8d18c4..173dad87c 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -13,7 +13,7 @@ package org.eclipse.debug.examples.core.midi.launcher;
/**
* Describes the length of the sequence in microseconds.
- *
+ *
* @since 1.0
*/
public class LengthControl extends TimeControl {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunch.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunch.java
index 674e2fc49..fd637904d 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunch.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunch.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -22,16 +22,16 @@ import org.eclipse.debug.core.model.ISuspendResume;
/**
* A launch containing a MIDI sequencer.
- *
+ *
* @since 1.0
*/
public class MidiLaunch extends Launch implements ISuspendResume {
-
+
/**
* MIDI Sequencer
*/
private Sequencer fSequencer;
-
+
/**
* MIDI file format
*/
@@ -39,24 +39,24 @@ public class MidiLaunch extends Launch implements ISuspendResume {
/**
* Constructs a new MIDI launch.
- *
+ *
* @param launchConfiguration configuration to play
* @param mode mode to play in
*/
public MidiLaunch(ILaunchConfiguration launchConfiguration, String mode) {
super(launchConfiguration, mode, null);
}
-
+
/**
* Sets the sequencer used to play MIDI files.
- *
+ *
* @param sequencer
*/
public void setSequencer(Sequencer sequencer) {
fSequencer = sequencer;
fireChanged();
}
-
+
/**
* Sets the format of the sequence
* @param format
@@ -67,7 +67,7 @@ public class MidiLaunch extends Launch implements ISuspendResume {
/**
* Returns the file format of the sequence.
- *
+ *
* @return file format
*/
public MidiFileFormat getFormat() {
@@ -75,7 +75,7 @@ public class MidiLaunch extends Launch implements ISuspendResume {
}
/**
* Returns the sequencer used to play MIDI files.
- *
+ *
* @return the sequencer used to play MIDI files
*/
public Sequencer getSequencer() {
@@ -161,13 +161,13 @@ public class MidiLaunch extends Launch implements ISuspendResume {
fireChanged();
fireEvent(new DebugEvent(getSequencer(), DebugEvent.SUSPEND, DebugEvent.CLIENT_REQUEST));
}
-
+
/**
* Fires a debug event.
- *
+ *
* @param event debug event to fire
*/
protected void fireEvent(DebugEvent event) {
DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[] {event});
- }
+ }
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java
index 65123a55c..fdad7c253 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -35,7 +35,7 @@ import org.eclipse.debug.examples.core.pda.DebugCorePlugin;
/**
* Creates and starts a MIDI sequencer.
- *
+ *
* @since 1.0
*/
public class MidiLaunchDelegate extends LaunchConfigurationDelegate {
@@ -45,25 +45,25 @@ public class MidiLaunchDelegate extends LaunchConfigurationDelegate {
* (value <code>midi.launchType</code>)
*/
public static final String ID_MIDI_LAUNCH_CONFIGURATION_TYPE = "midi.launchType"; //$NON-NLS-1$
-
+
/**
* Launch configuration attribute for the MIDI file to play
* (value <code>midi.file</code>)
*/
public static final String ATTR_MIDI_FILE = "midi.file"; //$NON-NLS-1$
-
+
/**
* Launch configuration attribute for the MIDI launcher. Specifies whether to throw
* an exception when present. Value is one of <code>HANDLED</code> or <code>UNHANDLED</code>.
*/
public static final String ATTR_THROW_EXCEPTION = "throw.exception"; //$NON-NLS-1$
-
+
/**
* Possible values for the <code>ATTR_THROW_EXCEPTION</code>.
*/
public static final String HANDLED = "HANDLED"; //$NON-NLS-1$
public static final String UNHANDLED = "UNHANDLED"; //$NON-NLS-1$
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
@@ -124,7 +124,7 @@ public class MidiLaunchDelegate extends LaunchConfigurationDelegate {
/**
* Throws an exception with a new status containing the given
* message and optional exception.
- *
+ *
* @param message error message
* @param e underlying exception
* @throws CoreException
@@ -132,7 +132,7 @@ public class MidiLaunchDelegate extends LaunchConfigurationDelegate {
private void abort(String message, Throwable e) throws CoreException {
throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, 0, message, e));
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#getLaunch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
*/
@@ -148,7 +148,7 @@ public class MidiLaunchDelegate extends LaunchConfigurationDelegate {
public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
return false;
}
-
-
+
+
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/SequencerControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/SequencerControl.java
index c5b51ea6a..11fa41510 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/SequencerControl.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/SequencerControl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -18,21 +18,21 @@ import org.eclipse.debug.core.DebugPlugin;
/**
* Controls some aspect of a MIDI sequencer.
- *
+ *
* @since 1.0
*/
public abstract class SequencerControl {
-
+
/**
* The launch
*/
private MidiLaunch fLaunch;
-
- /**
+
+ /**
* Control name
*/
private String fName;
-
+
/**
* Constructs a control with the given name.
*/
@@ -40,10 +40,10 @@ public abstract class SequencerControl {
fName = name;
fLaunch = launch;
}
-
+
/**
* Returns the launch this control is associated with.
- *
+ *
* @return MIDI launch
*/
public MidiLaunch getLaunch() {
@@ -52,64 +52,64 @@ public abstract class SequencerControl {
/**
* Returns the sequencer associated with this control.
- *
+ *
* @return associated sequencer
*/
public Sequencer getSequencer() {
return fLaunch.getSequencer();
}
-
+
/**
* Returns the name of this control.
- *
+ *
* @return control name
*/
public String getName() {
return fName;
}
-
+
/**
* Returns this controls current value.
- *
+ *
* @return current value
*/
public abstract String getValue();
-
+
/**
* Whether this contol's value can be modified.
- *
+ *
* @return Whether this contol's value can be modified
*/
public abstract boolean isEditable();
-
+
/**
* Returns a status indicating if the given value is
* a valid value for this control to accept.
- *
+ *
* @param value new value
* @return whether the value is valid
*/
public abstract IStatus validateValue(String value);
-
+
/**
* Sets the value of this control to the given value
* and returns a status indicating if the value was
* successfully set.
- *
+ *
* @param newValue value
* @return whether successful
*/
public abstract IStatus setValue(String newValue);
-
+
/**
* Fires a debug event.
- *
+ *
* @param event debug event to fire
*/
public void fireEvent(DebugEvent event) {
DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[] {event});
- }
-
+ }
+
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
@@ -118,7 +118,7 @@ public abstract class SequencerControl {
if (obj != null) {
if (getClass().equals(obj.getClass())) {
return ((SequencerControl)obj).getSequencer().equals(getSequencer());
-
+
}
}
return false;
@@ -130,5 +130,5 @@ public abstract class SequencerControl {
@Override
public int hashCode() {
return getSequencer().hashCode() + getClass().hashCode();
- }
+ }
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java
index 2980adc83..e16f002d7 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -18,7 +18,7 @@ import org.eclipse.debug.examples.core.pda.DebugCorePlugin;
/**
* Controls the tempo of a sequencer.
- *
+ *
* @since 1.0
*/
public class TempoControl extends SequencerControl {
@@ -77,14 +77,14 @@ public class TempoControl extends SequencerControl {
/**
* Returns a float for the string.
- *
+ *
* @param value string
* @return float
- * @throws CoreException if not a valid value
+ * @throws CoreException if not a valid value
*/
protected float getFloat(String value) throws CoreException {
try {
- return Float.parseFloat(value);
+ return Float.parseFloat(value);
} catch (NumberFormatException e) {
throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Tempo must be a number", e)); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TimeControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TimeControl.java
index 4bcb85ac6..cbc4c4cca 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TimeControl.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TimeControl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -14,7 +14,7 @@ import org.eclipse.core.runtime.IStatus;
/**
* Displays a time value based on underlying microsecond value
- *
+ *
* @since 1.0
*/
public abstract class TimeControl extends SequencerControl {
@@ -22,14 +22,14 @@ public abstract class TimeControl extends SequencerControl {
/**
* Constructs a time control with the given name for the
* given launch.
- *
+ *
* @param name
* @param launch
*/
public TimeControl(String name, MidiLaunch launch) {
super(name, launch);
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.examples.core.midi.launcher.SequencerControl#getValue()
*/
@@ -57,10 +57,10 @@ public abstract class TimeControl extends SequencerControl {
}
return clock.toString();
}
-
+
/**
* Provided by subclasses for the control.
- *
+ *
* @return time in microseconds
*/
protected abstract long getTimeValue();
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java
index 759f1088a..870d8870d 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java
@@ -30,13 +30,13 @@ public class DebugCorePlugin extends Plugin {
private static DebugCorePlugin plugin;
//Resource bundle.
private ResourceBundle resourceBundle;
-
+
/**
- * Unique identifier for the PDA debug model (value
+ * Unique identifier for the PDA debug model (value
* <code>pda.debugModel</code>).
*/
public static final String ID_PDA_DEBUG_MODEL = "pda.debugModel"; //$NON-NLS-1$
-
+
/**
* Name of the string substitution variable that resolves to the
* location of a local Perl executable (value <code>perlExecutable</code>).
@@ -45,21 +45,21 @@ public class DebugCorePlugin extends Plugin {
/**
* Launch configuration attribute key. Value is a path to a Perl
* program. The path is a string representing a full path
- * to a Perl program in the workspace.
+ * to a Perl program in the workspace.
*/
public static final String ATTR_PDA_PROGRAM = ID_PDA_DEBUG_MODEL + ".ATTR_PDA_PROGRAM"; //$NON-NLS-1$
-
+
/**
* Identifier for the PDA launch configuration type
* (value <code>pda.launchType</code>)
*/
public static final String ID_PDA_LAUNCH_CONFIGURATION_TYPE = "pda.launchType"; //$NON-NLS-1$
-
+
/**
* Plug-in identifier.
*/
public static final String PLUGIN_ID = "org.eclipse.debug.examples.core"; //$NON-NLS-1$
-
+
/**
* The constructor.
*/
@@ -118,7 +118,7 @@ public class DebugCorePlugin extends Plugin {
}
return resourceBundle;
}
-
+
/**
* Return a <code>java.io.File</code> object that corresponds to the specified
* <code>IPath</code> in the plug-in directory, or <code>null</code> if none.
@@ -131,5 +131,5 @@ public class DebugCorePlugin extends Plugin {
} catch (IOException ioe) {
return null;
}
- }
+ }
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java
index 325402c7f..99775760d 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java
@@ -35,10 +35,10 @@ import org.eclipse.debug.examples.core.pda.protocol.PDAVMSuspendedEvent;
* PDA line breakpoint
*/
public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListener {
-
+
// target currently installed in
private PDADebugTarget fTarget;
-
+
/**
* Default constructor is required for the breakpoint manager
* to re-create persisted breakpoints. After instantiating a breakpoint,
@@ -47,13 +47,13 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen
*/
public PDALineBreakpoint() {
}
-
+
/**
* Constructs a line breakpoint on the given resource at the given
* line number. The line number is 1-based (i.e. the first line of a
* file is line number 1). The PDA VM uses 0-based line numbers,
* so this line number translation is done at breakpoint install time.
- *
+ *
* @param resource file on which to set the breakpoint
* @param lineNumber 1-based line number of the breakpoint
* @throws CoreException if unable to create the breakpoint
@@ -72,7 +72,7 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen
};
run(getMarkerRule(resource), runnable);
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IBreakpoint#getModelIdentifier()
*/
@@ -80,21 +80,21 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen
public String getModelIdentifier() {
return DebugCorePlugin.ID_PDA_DEBUG_MODEL;
}
-
+
/**
* Returns whether this breakpoint is a run-to-line breakpoint
- *
+ *
* @return whether this breakpoint is a run-to-line breakpoint
*/
public boolean isRunToLineBreakpoint() {
return false;
}
-
+
/**
* Installs this breakpoint in the given interprettor.
* Registeres this breakpoint as an event listener in the
* given target and creates the breakpoint specific request.
- *
+ *
* @param target PDA interprettor
* @throws CoreException if installation fails
*/
@@ -103,26 +103,26 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen
target.addEventListener(this);
createRequest(target);
}
-
+
/**
* Create the breakpoint specific request in the target. Subclasses
* should override.
- *
+ *
* @param target PDA interprettor
* @throws CoreException if request creation fails
*/
protected void createRequest(PDADebugTarget target) throws CoreException {
//#ifdef ex3
-//# // TODO: Exercise 3 - create breakpoint request in interpreter
+//# // TODO: Exercise 3 - create breakpoint request in interpreter
//#else
target.sendCommand(new PDASetBreakpointCommand((getLineNumber() - 1), false));
//#endif
}
-
+
/**
* Removes this breakpoint's event request from the target. Subclasses
* should override.
- *
+ *
* @param target PDA interprettor
* @throws CoreException if clearing the request fails
*/
@@ -133,12 +133,12 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen
target.sendCommand(new PDAClearBreakpointCommand((getLineNumber() - 1)));
//#endif
}
-
+
/**
* Removes this breakpoint from the given interprettor.
* Removes this breakpoint as an event listener and clears
* the request for the interprettor.
- *
+ *
* @param target PDA interprettor
* @throws CoreException if removal fails
*/
@@ -146,18 +146,18 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen
target.removeEventListener(this);
clearRequest(target);
fTarget = null;
-
+
}
-
+
/**
* Returns the target this breakpoint is installed in or <code>null</code>.
- *
+ *
* @return the target this breakpoint is installed in or <code>null</code>
*/
protected PDADebugTarget getDebugTarget() {
return fTarget;
}
-
+
/**
* Notify's the PDA interprettor that this breakpoint has been hit.
*/
@@ -171,9 +171,9 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen
}
/* (non-Javadoc)
- *
+ *
* Subclasses should override to handle their breakpoint specific event.
- *
+ *
* @see org.eclipse.debug.examples.core.pda.model.IPDAEventListener#handleEvent(java.lang.String)
*/
@Override
@@ -185,10 +185,10 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen
}
}
}
-
+
/**
* Determines if this breakpoint was hit and notifies the thread.
- *
+ *
* @param event breakpoint event
*/
private void handleHit(PDARunControlEvent event) {
@@ -205,5 +205,5 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen
} catch (CoreException e) {
}
}
- }
+ }
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java
index 2d406d9d2..584965ecf 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java
@@ -24,12 +24,12 @@ import org.eclipse.debug.core.model.IBreakpoint;
* A run to line breakpoint.
*/
public class PDARunToLineBreakpoint extends PDALineBreakpoint {
-
+
private IFile fSourceFile;
-
+
/**
* Constructs a run-to-line breakpoint in the given PDA program.
- *
+ *
* @param resource PDA source file
* @param lineNumber line to run to
* @exception DebugException if unable to create the breakpoint
@@ -48,22 +48,22 @@ public class PDARunToLineBreakpoint extends PDALineBreakpoint {
fSourceFile = resource;
}
};
- run(getMarkerRule(resource), runnable);
+ run(getMarkerRule(resource), runnable);
}
-
+
/**
* Returns whether this breakpoint is a run-to-line breakpoint
- *
+ *
* @return whether this breakpoint is a run-to-line breakpoint
*/
@Override
public boolean isRunToLineBreakpoint() {
return true;
}
-
+
/**
* Returns the source file this breakpoint is contained in.
- *
+ *
* @return the source file this breakpoint is contained in
*/
public IFile getSourceFile() {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java
index ce7c15226..b81992bed 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java
@@ -31,10 +31,10 @@ import org.eclipse.debug.examples.core.pda.protocol.PDAWatchCommand;
* A watchpoint.
*/
public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
-
+
// 'read' or 'write' depending on what caused the last suspend for this watchpoint
private String fLastSuspendType;
-
+
// marker attributes
public static final String ACCESS = "ACCESS"; //$NON-NLS-1$
public static final String MODIFICATION = "MODIFICATION"; //$NON-NLS-1$
@@ -54,7 +54,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
* line number. The line number is 1-based (i.e. the first line of a
* file is line number 1). The PDA VM uses 0-based line numbers,
* so this line number translation is done at breakpoint install time.
- *
+ *
* @param resource file on which to set the breakpoint
* @param lineNumber 1-based line number of the breakpoint
* @param functionName function name the variable is defined in
@@ -79,7 +79,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
}
};
run(getMarkerRule(resource), runnable);
- }
+ }
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IWatchpoint#isAccess()
@@ -110,7 +110,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
*/
@Override
public void setModification(boolean modification) throws CoreException {
- setAttribute(MODIFICATION, modification);
+ setAttribute(MODIFICATION, modification);
}
/* (non-Javadoc)
@@ -128,10 +128,10 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
public boolean supportsModification() {
return true;
}
-
+
/**
* Sets the variable and function names the watchpoint is set on.
- *
+ *
* @param functionName function name
* @param variableName variable name
* @throws CoreException if an exception occurrs setting marker attribtues
@@ -140,10 +140,10 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
setAttribute(VAR_NAME, variableName);
setAttribute(FUNCTION_NAME, functionName);
}
-
+
/**
* Returns the name of the variable this watchpoint is set on.
- *
+ *
* @return the name of the variable this watchpoint is set on
* @throws CoreException if unable to access the attribute
*/
@@ -153,32 +153,32 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
/**
* Returns the name of the function the variable associted with this watchpoint is defined in.
- *
+ *
* @return the name of the function the variable associted with this watchpoint is defined in
* @throws CoreException if unable to access the attribute
*/
public String getFunctionName() throws CoreException {
return getMarker().getAttribute(FUNCTION_NAME, (String)null);
- }
-
+ }
+
/**
* Sets the type of event that causes the last suspend event.
- *
+ *
* @param description one of 'read' or 'write'
*/
public void setSuspendType(String description) {
fLastSuspendType = description;
}
-
+
/**
* Returns the type of event that caused the last suspend.
- *
+ *
* @return 'read', 'write', or <code>null</code> if undefined
*/
public String getSuspendType() {
return fLastSuspendType;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.examples.core.pda.breakpoints.PDALineBreakpoint#createRequest(org.eclipse.debug.examples.core.pda.model.PDADebugTarget)
*/
@@ -190,10 +190,10 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
}
if (isModification()) {
flag = flag | 2;
- }
+ }
target.sendCommand(new PDAWatchCommand(getFunctionName(), getVariableName(), flag));
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.examples.core.pda.breakpoints.PDALineBreakpoint#clearRequest(org.eclipse.debug.examples.core.pda.model.PDADebugTarget)
*/
@@ -201,7 +201,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
protected void clearRequest(PDADebugTarget target) throws CoreException {
target.sendCommand(new PDAWatchCommand(getFunctionName(), getVariableName(), 0));
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.examples.core.pda.model.IPDAEventListener#handleEvent(java.lang.String)
*/
@@ -214,10 +214,10 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
}
}
}
-
+
/**
* Determines if this breakpoint was hit and notifies the thread.
- *
+ *
* @param event breakpoint event
*/
private void handleHit(PDARunControlEvent event) {
@@ -237,5 +237,5 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
}
}
}
- }
+ }
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/IPDAEventListener.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/IPDAEventListener.java
index 257c4185e..a076a450b 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/IPDAEventListener.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/IPDAEventListener.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -17,7 +17,7 @@ import org.eclipse.debug.examples.core.pda.protocol.PDAEvent;
/**
* Listeners are notified of events occurring in a PDA program
* being interpreted.
- *
+ *
* @see org.eclipse.debug.examples.core.protocol.PDAVMStarted
* @see org.eclipse.debug.examples.core.protocol.PDAVMTerminated
* @see org.eclipse.debug.examples.core.protocol.PDAVMSuspneded
@@ -32,11 +32,11 @@ import org.eclipse.debug.examples.core.pda.protocol.PDAEvent;
* @see org.eclipse.debug.examples.core.pda.protocol.PDAEvalResultEvent
*/
public interface IPDAEventListener {
-
+
/**
* Notification the given event occurred in the target program
* being interpreted.
- *
+ *
* @param event the event
*/
public void handleEvent(PDAEvent event);
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java
index effe377c2..cd0473edf 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -20,8 +20,8 @@ public class PDAArray extends PDAValue {
/**
* An array splits a value into its words
*
- * @param value existing value
- * @throws DebugException
+ * @param value existing value
+ * @throws DebugException
*/
public PDAArray(PDAValue value) throws DebugException {
super(value.getVariable(), value.getValueString());
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java
index 2c9dd55cb..234d76ed8 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -17,13 +17,13 @@ import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
public class PDAArrayEntry extends PDADebugElement implements IVariable {
-
+
private IValue fValue;
private int fIndex;
/**
* Constructs a new array entry
- *
+ *
* @param target debug target
* @param index index in the array
* @param value value of the entry
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugElement.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugElement.java
index f07fac187..f0c60b11d 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugElement.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugElement.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -29,7 +29,7 @@ public class PDADebugElement extends DebugElement {
/**
* Constructs a new debug element in the given target.
- *
+ *
* @param target debug target
*/
public PDADebugElement(IDebugTarget target) {
@@ -43,68 +43,68 @@ public class PDADebugElement extends DebugElement {
public String getModelIdentifier() {
return DebugCorePlugin.ID_PDA_DEBUG_MODEL;
}
-
+
/**
* Sends a request to the PDA interpreter, waits for and returns the reply.
- *
+ *
* @param request command
* @return reply
* @throws DebugException if the request fails
- *
+ *
* @see org.eclipse.debug.examples.core.pda.protocol.PDATerminateCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAVMSuspendCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAVMResumeCommand
- *
+ *
* @see org.eclipse.debug.examples.core.pda.protocol.PDASuspendCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAResumeCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAStepCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDADropFrameCommand
- *
+ *
* @see org.eclipse.debug.examples.core.pda.protocol.PDASetBreakpointCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAClearBreakpointCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAWatchCommand
- *
+ *
* @see org.eclipse.debug.examples.core.pda.protocol.PDADataCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDASetDataCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAPopDataCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAPushDataCommand
- *
+ *
* @see org.eclipse.debug.examples.core.pda.protocol.PDAEvalCommand
- *
+ *
* @see org.eclipse.debug.examples.core.pda.protocol.PDAEventStopCommand
- *
+ *
* @see org.eclipse.debug.examples.core.pda.protocol.PDAStackCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAStackDepthCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAFrameCommand
- *
+ *
* @see org.eclipse.debug.examples.core.pda.protocol.PDASetVarCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAVarCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDAChildrenCommand
- *
+ *
* @see org.eclipse.debug.examples.core.pda.protocol.PDAGroupsCommand
* @see org.eclipse.debug.examples.core.pda.protocol.PDARegistersCommand
- *
+ *
* @since 3.5
- */
+ */
public PDACommandResult sendCommand(PDACommand command) throws DebugException {
return getPDADebugTarget().sendCommand(command);
}
-
+
/**
* Returns the debug target as a PDA target.
- *
+ *
* @return PDA debug target
*/
protected PDADebugTarget getPDADebugTarget() {
return (PDADebugTarget) getDebugTarget();
}
-
+
/**
* Returns the breakpoint manager
- *
+ *
* @return the breakpoint manager
*/
protected IBreakpointManager getBreakpointManager() {
return DebugPlugin.getDefault().getBreakpointManager();
- }
+ }
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAMemoryBlock.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAMemoryBlock.java
index 394c7c1da..c72c040b2 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAMemoryBlock.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAMemoryBlock.java
@@ -18,13 +18,13 @@ import org.eclipse.debug.core.model.IMemoryBlock;
* Example memory block
*/
public class PDAMemoryBlock extends PDADebugElement implements IMemoryBlock {
-
+
/**
* The bytes
*/
private byte[] fBytes = null;
private long fStart, fLength;
-
+
/**
* Constructs a new memory block
*/
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackFrame.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackFrame.java
index 24dfefcd2..a74b7f0b6 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackFrame.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackFrame.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -24,17 +24,17 @@ import org.eclipse.debug.examples.core.pda.protocol.PDAFrameData;
* PDA stack frame.
*/
public class PDAStackFrame extends PDADebugElement implements IStackFrame {
-
+
private PDAThread fThread;
private String fName;
private int fPC;
private IPath fFilePath;
private int fId;
-
+
/**
* Constructs a stack frame in the given thread with the given
* frame data.
- *
+ *
* @param thread
* @param data frame data
* @param id stack frame id (0 is the bottom of the stack)
@@ -45,10 +45,10 @@ public class PDAStackFrame extends PDADebugElement implements IStackFrame {
fThread = thread;
init(data);
}
-
+
/**
* Initializes this frame based on its data
- *
+ *
* @param data
*/
private void init(PDAFrameData data) {
@@ -61,7 +61,7 @@ public class PDAStackFrame extends PDADebugElement implements IStackFrame {
}
fThread.setVariables(this, vars);
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#getThread()
*/
@@ -97,7 +97,7 @@ public class PDAStackFrame extends PDADebugElement implements IStackFrame {
public int getCharStart() throws DebugException {
return -1;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#getCharEnd()
*/
@@ -231,11 +231,11 @@ public class PDAStackFrame extends PDADebugElement implements IStackFrame {
public void terminate() throws DebugException {
getThread().terminate();
}
-
+
/**
* Returns the name of the source file this stack frame is associated
* with.
- *
+ *
* @return the name of the source file this stack frame is associated
* with
*/
@@ -249,7 +249,7 @@ public class PDAStackFrame extends PDADebugElement implements IStackFrame {
public boolean equals(Object obj) {
if (obj instanceof PDAStackFrame) {
PDAStackFrame sf = (PDAStackFrame)obj;
- return sf.getThread().equals(getThread()) &&
+ return sf.getThread().equals(getThread()) &&
sf.getSourceName().equals(getSourceName()) &&
sf.fId == fId;
}
@@ -262,25 +262,25 @@ public class PDAStackFrame extends PDADebugElement implements IStackFrame {
public int hashCode() {
return getSourceName().hashCode() + fId;
}
-
+
/**
* Returns this stack frame's unique identifier within its thread
- *
+ *
* @return this stack frame's unique identifier within its thread
*/
protected int getIdentifier() {
return fId;
}
-
+
/**
* Returns the stack frame's thread's unique identifier
- *
+ *
* @return this stack frame's thread's unique identifier
- *
+ *
* @since 3.5
*/
protected int getThreadIdentifier() {
return fThread.getIdentifier();
}
-
+
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackValue.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackValue.java
index 4fc8e5289..d0920b45a 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackValue.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackValue.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -24,10 +24,10 @@ public class PDAStackValue extends PDADebugElement implements IValue {
final private PDAThread fThread;
final private String fValue;
final private int fIndex;
-
+
/**
* Constructs a value that appears on the data stack
- *
+ *
* @param target debug target
* @param value value on the stack
* @param index index on the stack
@@ -38,11 +38,11 @@ public class PDAStackValue extends PDADebugElement implements IValue {
fValue = value;
fIndex = index;
}
-
+
public PDAThread getThread() {
return fThread;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#getValueString()
*/
@@ -84,8 +84,8 @@ public class PDAStackValue extends PDADebugElement implements IValue {
*/
@Override
public boolean equals(Object obj) {
- return obj instanceof PDAStackValue &&
- ((PDAStackValue)obj).fValue.equals(fValue) &&
+ return obj instanceof PDAStackValue &&
+ ((PDAStackValue)obj).fValue.equals(fValue) &&
((PDAStackValue)obj).fIndex == fIndex;
}
/*
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java
index 620f7ac83..6559f2ccd 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -22,16 +22,16 @@ import org.eclipse.debug.examples.core.pda.protocol.PDAListResult;
* Value of a PDA variable.
*/
public class PDAValue extends PDADebugElement implements IValue {
-
+
final private PDAVariable fVariable;
final private String fValue;
-
+
public PDAValue(PDAVariable variable, String value) {
super(variable.getStackFrame().getPDADebugTarget());
fVariable = variable;
fValue = value;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#getReferenceTypeName()
*/
@@ -66,7 +66,7 @@ public class PDAValue extends PDADebugElement implements IValue {
PDAStackFrame frame = fVariable.getStackFrame();
PDAListResult result = (PDAListResult) sendCommand(
new PDAChildrenCommand(frame.getThreadIdentifier(), frame.getIdentifier(), fVariable.getName()) );
-
+
IVariable[] children = new IVariable[result.fValues.length];
for(int i = 0; i < result.fValues.length; i++) {
children[i] = new PDAVariable(frame, result.fValues[i]);
@@ -81,8 +81,8 @@ public class PDAValue extends PDADebugElement implements IValue {
if (getVariables().length != 0) {
return true;
}
- // Value with multiple words can be show as an array using logical
- // structures. If the value has multiple words, it needs to indicate
+ // Value with multiple words can be show as an array using logical
+ // structures. If the value has multiple words, it needs to indicate
// that it has children even if logical structures are not turned on.
return fValue.split("\\W+").length > 1; //$NON-NLS-1$
}
@@ -102,12 +102,12 @@ public class PDAValue extends PDADebugElement implements IValue {
public int hashCode() {
return fValue.hashCode();
}
-
+
/**
* Returns the variable that this value was created for.
- *
+ *
* @return The variable that this value was created for.
- *
+ *
* @since 3.5
*/
public PDAVariable getVariable() {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java
index 3745028e1..33e033602 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -25,15 +25,15 @@ import org.eclipse.debug.examples.core.pda.protocol.PDAVarCommand;
* A variable in a PDA stack frame
*/
public class PDAVariable extends PDADebugElement implements IVariable {
-
+
// name & stack frmae
private String fName;
private PDAStackFrame fFrame;
-
+
/**
* Constructs a variable contained in the given stack frame
* with the given name.
- *
+ *
* @param frame owning stack frame
* @param name variable name
*/
@@ -42,7 +42,7 @@ public class PDAVariable extends PDADebugElement implements IVariable {
fFrame = frame;
fName = name;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IVariable#getValue()
*/
@@ -52,7 +52,7 @@ public class PDAVariable extends PDADebugElement implements IVariable {
fFrame.getThreadIdentifier(), getStackFrame().getIdentifier(), getName()));
return new PDAValue(this, result.fResponseText);
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.core.model.IVariable#getName()
*/
@@ -110,10 +110,10 @@ public class PDAVariable extends PDADebugElement implements IVariable {
public boolean verifyValue(IValue value) throws DebugException {
return false;
}
-
+
/**
* Returns the stack frame owning this variable.
- *
+ *
* @return the stack frame owning this variable
*/
public PDAStackFrame getStackFrame() {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java
index 2d218e08f..583ecc1fd 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -46,7 +46,7 @@ public class WordStructureDelegate implements ILogicalStructureTypeDelegate {
public IValue getLogicalStructure(IValue value) throws CoreException {
//#ifdef ex6
//# // TODO: Exercise 6 - create an array from the given value
-//# return null;
+//# return null;
//#else
return new PDAArray((PDAValue)value);
//#endif
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java
index 9d9339b75..24fc3e3af 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,12 +13,12 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Retrieves data stack information
- *
+ * Retrieves data stack information
+ *
* <pre>
* C: children {thread_id} {frame_id} {variable_name}
* R: {child variable 1}|{child variable 2}|{child variable 3}|...|
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -28,7 +28,7 @@ public class PDAChildrenCommand extends PDACommand {
public PDAChildrenCommand(int threadId, int frameId, String name ) {
super("children " + threadId + " " + frameId + " " + name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
return new PDAListResult(resultText);
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java
index 20eba643f..8d3f9a5f5 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -14,7 +14,7 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Clears any breakpoint set on given line
- *
+ *
* <pre>
* C: clear {line}
* R: ok
@@ -25,7 +25,7 @@ public class PDAClearBreakpointCommand extends PDACommand {
public PDAClearBreakpointCommand(int line) {
super("clear " + line); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
return new PDACommandResult(resultText);
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDACommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDACommand.java
index 9aa2bfb15..52d44fb05 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDACommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDACommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
@@ -12,29 +12,29 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Base class for PDA commands. Sub-classes should format the request string
+ * Base class for PDA commands. Sub-classes should format the request string
* and implement the method to create the proper result object.
*/
abstract public class PDACommand {
final private String fRequest;
-
+
public PDACommand(String request) {
fRequest = request;
}
-
+
/**
- * Returns the request to be sent to PDA.
+ * Returns the request to be sent to PDA.
*/
public String getRequest() {
return fRequest;
}
/**
- * Returns the command result based on the given PDA response. This command
- * uses the class type parameter as the return type to allow the compiler to
- * enforce the correct command result. This class must be implemented by
- * each command to create the concrete result type.
+ * Returns the command result based on the given PDA response. This command
+ * uses the class type parameter as the return type to allow the compiler to
+ * enforce the correct command result. This class must be implemented by
+ * each command to create the concrete result type.
*/
abstract public PDACommandResult createResult(String resultText);
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDACommandResult.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDACommandResult.java
index 9991b0115..1de9e136b 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDACommandResult.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDACommandResult.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
@@ -13,14 +13,14 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Basic command result object. This command result simply allows access to the
+ * Basic command result object. This command result simply allows access to the
* PDA response. Sub-classes may override to optionally parse the response text
* and return higher-level objects.
*/
public class PDACommandResult {
final public String fResponseText;
-
+
public PDACommandResult(String response) {
fResponseText = response;
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java
index e82630f1a..d83b78c06 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,13 +13,13 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Return the contents of the data stack; reply is the data from oldest to newest
- * as a single string
- *
+ * Return the contents of the data stack; reply is the data from oldest to newest
+ * as a single string
+ *
* <pre>
* C: data {thread_id}
* R: {value 1}|{value 2}|{value 3}|...|
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -29,7 +29,7 @@ public class PDADataCommand extends PDACommand {
public PDADataCommand(int threadId) {
super("data " + threadId); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
return new PDAListResult(resultText);
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java
index 9777ff94c..c051f010a 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,22 +13,22 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Pops the top stack frame off the call stack setting the instruction pointer to
- * the calling statement in the calling frame
- *
+ * Pops the top stack frame off the call stack setting the instruction pointer to
+ * the calling statement in the calling frame
+ *
* <pre>
* If VM running:
* C: drop {thread_id}
* R: ok
* E: resumed {thread_id} drop
* E: suspended {thread_id} drop
- *
+ *
* If VM suspended:
* C: drop {thread_id}
* R: ok
* E: vmresumed drop
* E: vmsuspended {thread_id} drop
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -38,7 +38,7 @@ public class PDADropFrameCommand extends PDACommand {
public PDADropFrameCommand(int threadId) {
super("drop " + threadId); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
return new PDACommandResult(resultText);
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java
index 499a9dd0a..2c341dadd 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,31 +13,31 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Causes the interperter to execute the given set of instructions. At the end
+ * Causes the interperter to execute the given set of instructions. At the end
* of the evaluation the top value is poped off the stack and returned in the
* evaluation result.
- *
+ *
* <pre>
* C: eval {thread_id} {instruction}%20{parameter}|{instruction}%20{parameter}|...
* R: ok
* E: resumed {thread_id} client
* E: evalresult result
* E: suspended {thread_id} eval
- *
+ *
* Errors:
* error: invalid thread
* error: cannot evaluate while vm is suspended
- * error: thread running
+ * error: thread running
* </pre>
- *
- * Where event_name could be <code>unimpinstr</code> or <code>nosuchlabel</code>.
+ *
+ * Where event_name could be <code>unimpinstr</code> or <code>nosuchlabel</code>.
*/
public class PDAEvalCommand extends PDACommand {
public PDAEvalCommand(int threadId, String operation) {
super("eval " + threadId + " " + operation); //$NON-NLS-1$ //$NON-NLS-2$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
return new PDACommandResult(resultText);
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java
index d8dc61ef5..993786e62 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -12,21 +12,21 @@
package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Eval result event generated when an evaluation has completed.
- *
+ * Eval result event generated when an evaluation has completed.
+ *
* <pre>
* E: evalresult {result}
* </pre>
*/
public class PDAEvalResultEvent extends PDAEvent {
-
+
public final String fResult;
-
+
public PDAEvalResultEvent(String message) {
super(message);
fResult = message.substring(getName(message).length() + 1);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("evalresult"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvent.java
index ab841bf13..94bc59110 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
@@ -16,60 +16,60 @@ package org.eclipse.debug.examples.core.pda.protocol;
public class PDAEvent {
public final String fMessage;
public final String fName;
-
+
public PDAEvent(String message) {
fMessage = message;
fName = getName(message);
}
-
+
protected String getName(String message) {
int nameEnd = message.indexOf(' ');
nameEnd = nameEnd == -1 ? message.length() : nameEnd;
return message.substring(0, nameEnd);
}
-
+
public static PDAEvent parseEvent(String message) {
if (PDAEvalResultEvent.isEventMessage(message)) {
return new PDAEvalResultEvent(message);
- }
+ }
else if (PDAExitedEvent.isEventMessage(message)) {
return new PDAExitedEvent(message);
- }
+ }
else if (PDANoSuchLabelEvent.isEventMessage(message)) {
return new PDANoSuchLabelEvent(message);
- }
+ }
else if (PDARegistersEvent.isEventMessage(message)) {
return new PDARegistersEvent(message);
- }
+ }
else if (PDAResumedEvent.isEventMessage(message)) {
return new PDAResumedEvent(message);
- }
+ }
else if (PDAStartedEvent.isEventMessage(message)) {
return new PDAStartedEvent(message);
- }
+ }
else if (PDASuspendedEvent.isEventMessage(message)) {
return new PDASuspendedEvent(message);
- }
+ }
else if (PDATerminatedEvent.isEventMessage(message)) {
return new PDATerminatedEvent(message);
- }
+ }
else if (PDAUnimplementedInstructionEvent.isEventMessage(message)) {
return new PDAUnimplementedInstructionEvent(message);
- }
+ }
else if (PDAVMResumedEvent.isEventMessage(message)) {
return new PDAVMResumedEvent(message);
- }
+ }
else if (PDAVMStartedEvent.isEventMessage(message)) {
return new PDAVMStartedEvent(message);
- }
+ }
else if (PDAVMSuspendedEvent.isEventMessage(message)) {
return new PDAVMSuspendedEvent(message);
- }
+ }
else if (PDAExitedEvent.isEventMessage(message)) {
return new PDAExitedEvent(message);
- }
+ }
else {
return new PDAEvent(message);
- }
+ }
}
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java
index b96060fda..d6e30dfb1 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,35 +13,35 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Optionally stop the interpreter when an error event <code>event_name</code>
+ * Optionally stop the interpreter when an error event <code>event_name</code>
* is encountered; <code>{0|1}</code> specifies stop (<code>1</code>) or
* continue (<code>0</code>). The possible events are <code>unimpinstr</code> and
* <code>nosuchlabel</code>. Reply is <code>ok</code>. When an event is encountered,
- * the interpreter sends the error event (for example <code>unimlpemented instruction
- * foo</code>) and corresponding suspend event (for example <code>suspended event
+ * the interpreter sends the error event (for example <code>unimlpemented instruction
+ * foo</code>) and corresponding suspend event (for example <code>suspended event
* unimpinstr</code>).
- *
+ *
* <pre>
* C: eventstop {event_name} {0|1}
* R: ok
* ...
* E: suspended event {event_name}
* </pre>
- *
- * Where event_name could be <code>unimpinstr</code> or <code>nosuchlabel</code>.
+ *
+ * Where event_name could be <code>unimpinstr</code> or <code>nosuchlabel</code>.
*/
public class PDAEventStopCommand extends PDACommand {
public static final int UNIMPINSTR = 0;
public static final int NOSUCHLABEL = 1;
-
+
public PDAEventStopCommand(int event, boolean enable) {
super("eventstop " + //$NON-NLS-1$
(event == UNIMPINSTR ? "unimpinstr " : "nosuchlabel ") + //$NON-NLS-1$ //$NON-NLS-2$
(enable ? "1" : "0")); //$NON-NLS-1$ //$NON-NLS-2$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java
index 22c65c103..863b80868 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,17 +13,17 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Exited event generated when a thread has exited.
- *
+ *
* <pre>
* E: started {thread_id}
* </pre>
*/
public class PDAExitedEvent extends PDARunControlEvent {
-
+
public PDAExitedEvent(String message) {
super(message);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("exited"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java
index 92fb11de8..092ff8e1f 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -14,12 +14,12 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Retrieves command stack frame information for frame <code>frame_number</code>
- * (stack frames are indexed from 0, 0 being the oldest).
- *
+ * (stack frames are indexed from 0, 0 being the oldest).
+ *
* <pre>
* C: stack {thread_id} {frame_number}
* R: {file}|{line}|{function}|{var_1}|{var_2}|...
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -29,7 +29,7 @@ public class PDAFrameCommand extends PDACommand {
public PDAFrameCommand(int threadId, int frameNum) {
super("frame " + threadId + " " + frameNum); //$NON-NLS-1$ //$NON-NLS-2$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommandResult.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommandResult.java
index f52af48c0..6d92498c6 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommandResult.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommandResult.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
@@ -17,12 +17,12 @@ package org.eclipse.debug.examples.core.pda.protocol;
*/
public class PDAFrameCommandResult extends PDACommandResult {
-
+
/**
* Frame data return by the frame command.
*/
final public PDAFrameData fFrame;
-
+
PDAFrameCommandResult(String response) {
super(response);
fFrame = new PDAFrameData(response);
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java
index fb405b32c..a0a0e61c1 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,8 +13,8 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Retrieves register groups information
- *
+ * Retrieves register groups information
+ *
* <pre>
* C: groups
* R: {group 1}|{group 2}|{group 3}|...|
@@ -26,7 +26,7 @@ public class PDAGroupsCommand extends PDACommand {
public PDAGroupsCommand() {
super("groups"); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java
index d96681c5a..168ed6588 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -14,24 +14,24 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* No Such Label event generated when the PDA program encounters an call to a
* non-existant label in a PDA program.
- *
+ *
* <pre>
* E: no such label {label}
* </pre>
*/
public class PDANoSuchLabelEvent extends PDAEvent {
-
+
public final String fLabel;
-
+
public PDANoSuchLabelEvent(String message) {
super(message);
fLabel = message.substring(getName(message).length() + 1);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("no such label"); //$NON-NLS-1$
}
-
+
@Override
protected String getName(String message) {
if (isEventMessage(message)) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java
index 1e3726c25..4a87139f8 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,12 +13,12 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Pops the top value from the data stack
- *
+ * Pops the top value from the data stack
+ *
* <pre>
* C: popdata {thread_id}
* R: ok
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -28,7 +28,7 @@ public class PDAPopDataCommand extends PDACommand {
public PDAPopDataCommand(int threadId) {
super("popdata " + threadId); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
return new PDACommandResult(resultText);
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java
index fd3ccd8d1..dcbcdddac 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -14,11 +14,11 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Pushes the given value on top of the data stack.
- *
+ *
* <pre>
* C: pushdata {thread_id} {value}
* R: ok
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -29,7 +29,7 @@ public class PDAPushDataCommand extends PDACommand {
public PDAPushDataCommand(int threadId, String value) {
super("pushdata " + threadId + " " + value); //$NON-NLS-1$ //$NON-NLS-2$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java
index 045df225d..7f046e8c6 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,8 +13,8 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Retrieves registers definition information
- *
+ * Retrieves registers definition information
+ *
* <pre>
* C: registers {group name}
* R: {register name} {true|false}|{bit field name} {start bit} {bit count} {mnemonic 1} {mnemonic 2} ...#{register name} ...
@@ -26,7 +26,7 @@ public class PDARegistersCommand extends PDACommand {
public PDARegistersCommand(String group) {
super("registers " + group); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java
index 1abada3a8..604c0c9a5 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -12,19 +12,19 @@
package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Registers event generated when the registers' definitions are changed in a
+ * Registers event generated when the registers' definitions are changed in a
* program.
- *
+ *
* <pre>
* E: registers
* </pre>
*/
public class PDARegistersEvent extends PDAEvent {
-
+
public PDARegistersEvent(String message) {
super(message);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("registers"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java
index 29bfc78f3..b4dc050dc 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -14,7 +14,7 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Restarts the debug session. All threads exit and the main threads starts
- *
+ *
* <pre>
* C: restart
* E: exited 0
@@ -28,7 +28,7 @@ public class PDARestartCommand extends PDACommand {
public PDARestartCommand() {
super("restart"); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java
index 64bac76a2..531e7278c 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,14 +13,14 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Resumes the execution of a single thread. Can be issued only if the virtual
+ * Resumes the execution of a single thread. Can be issued only if the virtual
* machine is running.
- *
+ *
* <pre>
* C: resume {thread_id}
* R: ok
* E: resumed {thread_id} client
- *
+ *
* Errors:
* error: invalid thread
* error: cannot resume thread when vm is suspended
@@ -33,7 +33,7 @@ public class PDAResumeCommand extends PDACommand {
public PDAResumeCommand(int threadId) {
super("resume " + threadId); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java
index e8ee71750..5cbaf8342 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,17 +13,17 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Resumed event generated when a thread is resumed.
- *
+ *
* <pre>
* E: resumed {thread_id} [reason]
* </pre>
*/
public class PDAResumedEvent extends PDARunControlEvent {
-
+
public PDAResumedEvent(String message) {
super(message);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("resumed"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java
index c9e10a762..6934b4a70 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -16,16 +16,16 @@ package org.eclipse.debug.examples.core.pda.protocol;
* Base class for run-control events.
*/
public class PDARunControlEvent extends PDAEvent {
-
+
public final int fThreadId;
public final String fReason;
-
+
public PDARunControlEvent(String message) {
super(message);
fThreadId = getThreadId(message);
fReason = getStateChangeReason(message);
}
-
+
protected int getThreadId(String message) {
int nameEnd = getName(message).length();
if ( Character.isDigit(message.charAt(nameEnd + 1)) ) {
@@ -57,7 +57,7 @@ public class PDARunControlEvent extends PDAEvent {
endIdx = endIdx == -1 ? message.length() : endIdx;
return message.substring(idx, endIdx);
}
-
+
@Override
protected String getName(String message) {
int nameEnd = message.indexOf(' ');
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java
index 4459ebc2f..d758c8622 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -14,7 +14,7 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Sets a breakpoint at given line
- *
+ *
* <pre>
* Suspend a single thread:
* C: set {line_number} 0
@@ -22,7 +22,7 @@ package org.eclipse.debug.examples.core.pda.protocol;
* C: resume {thread_id}
* E: resumed {thread_id} client
* E: suspended {thread_id} breakpoint line_number
- *
+ *
* Suspend the VM:
* C: set {line_number} 1
* R: ok
@@ -39,7 +39,7 @@ public class PDASetBreakpointCommand extends PDACommand {
line + " " + //$NON-NLS-1$
(stopVM ? "1" : "0")); //$NON-NLS-1$ //$NON-NLS-2$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java
index c6f5278bc..81bbdb5f5 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,13 +13,13 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Sets a data value in the data stack at the given location (the data stack is
+ * Sets a data value in the data stack at the given location (the data stack is
* indexed from 0, 0 being the oldest).
- *
+ *
* <pre>
* C: setdata {thread_id} {index} {value}
* R: ok
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -29,7 +29,7 @@ public class PDASetDataCommand extends PDACommand {
public PDASetDataCommand(int threadId, int index, String value) {
super("setdata " + threadId + " " + index + " " + value); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java
index c32570a6a..f85a4f734 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,14 +13,14 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Set the contents of variable <code>variable</code> from the control stack
- * <code>frame_number</code> to value <code>value</code> (the control stack is
- * indexed from 0, 0 being the oldest).
- *
+ * Set the contents of variable <code>variable</code> from the control stack
+ * <code>frame_number</code> to value <code>value</code> (the control stack is
+ * indexed from 0, 0 being the oldest).
+ *
* <pre>
* C: setvar {thread_id} {frame_number} {variable} {value}
* R: ok
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -31,7 +31,7 @@ public class PDASetVarCommand extends PDACommand {
public PDASetVarCommand(int threadId, int frame, String variable, String value) {
super("setvar " + threadId + " " + frame + " " + variable + " " + value); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java
index 836f5d6a9..fc35365d3 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -16,12 +16,12 @@ package org.eclipse.debug.examples.core.pda.protocol;
* Return the contents of the control stack (program counters, function and
* variable names). The reply is control stack from oldest to newest as a single string
* <code>frame#frame#frame...#frame</code>, where each frame is a string
- * <code>"filename|pc|function name|variable name|variable name|...|variable name"</code></li>.
- *
+ * <code>"filename|pc|function name|variable name|variable name|...|variable name"</code></li>.
+ *
* <pre>
* C: stack {thread_id}
* R: {file}|{line}|{function}|{var_1}|{var_2}|...#{file}|{line}|{function}|{var_1}|{var_2}|...#...
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -32,7 +32,7 @@ public class PDAStackCommand extends PDACommand {
public PDAStackCommand(int threadId) {
super("stack " + threadId); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java
index f30db3c68..6facf5618 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,12 +13,12 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Retrieves command stack depth
- *
+ * Retrieves command stack depth
+ *
* <pre>
* C: stackdepth {thread_id}
* R: {depth}
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -29,7 +29,7 @@ public class PDAStackDepthCommand extends PDACommand {
public PDAStackDepthCommand(int threadId) {
super("stackdepth " + threadId); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommandResult.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommandResult.java
index e5ca2b969..72a67f077 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommandResult.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommandResult.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
@@ -17,9 +17,9 @@ package org.eclipse.debug.examples.core.pda.protocol;
*/
public class PDAStackDepthCommandResult extends PDACommandResult {
-
+
final public int fDepth;
-
+
PDAStackDepthCommandResult(String response) {
super(response);
int depth = 1; // default to something that won't cause NPEs
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java
index 39b21876a..7c260a1d2 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -12,19 +12,19 @@
package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Started event generated when a new thread is started. A started event
+ * Started event generated when a new thread is started. A started event
* is always sent for the first thread when a PDA program is started.
- *
+ *
* <pre>
* E: started {thread_id}
* </pre>
*/
public class PDAStartedEvent extends PDARunControlEvent {
-
+
public PDAStartedEvent(String message) {
super(message);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("started"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java
index f767ba746..d394d1a43 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,21 +13,21 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Executes next instruction
- *
+ * Executes next instruction
+ *
* <pre>
* If VM running:
* C: step {thread_id}
* R: ok
* E: resumed {thread_id} step
* E: suspended {thread_id} step
- *
+ *
* If VM suspended:
* C: step {thread_id}
* R: ok
* E: vmresumed step
* E: vmsuspended {thread_id} step
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -38,7 +38,7 @@ public class PDAStepCommand extends PDACommand {
public PDAStepCommand(int threadId) {
super("step " + threadId); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java
index 443513878..6a8b1c9f7 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,22 +13,22 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Single step forward until the next <code>return</code> op code. Stop before
- * executing the <code>return</code> .
- *
+ * Single step forward until the next <code>return</code> op code. Stop before
+ * executing the <code>return</code> .
+ *
* <pre>
* If VM running:
* C: stepreturn {thread_id}
* R: ok
* E: resumed {thread_id} client
* E: suspended {thread_id} step
- *
+ *
* If VM suspended:
* C: stepreturn {thread_id}
* R: ok
* E: vmresumed client
* E: vmsuspended {thread_id} step
- *
+ *
* Errors:
* error: invalid thread
* </pre>
@@ -39,7 +39,7 @@ public class PDAStepReturnCommand extends PDACommand {
public PDAStepReturnCommand(int threadId) {
super("stepreturn " + threadId); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java
index 2100c4b11..ecf864b22 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,14 +13,14 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Suspends execution of a single thread. Can be issued only if the virtual
+ * Suspends execution of a single thread. Can be issued only if the virtual
* machine is running.
- *
+ *
* <pre>
* C: suspend {thread_id}
* R: ok
* E: suspended {thread_id} client
- *
+ *
* Errors:
* error: invalid thread
error: vm already suspended
@@ -33,7 +33,7 @@ public class PDASuspendCommand extends PDACommand {
public PDASuspendCommand(int threadId) {
super("suspend " + threadId); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java
index de6363391..f8d01349f 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,11 +13,11 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Suspended event generated when a thread is suspended.
- *
+ *
* <pre>
* E: suspended {thread_id} [reason]
* </pre>
- *
+ *
* <code>[reason]</code> is the cause of the suspension and it's optional:
* <ul>
* <li><code>breakpoint N</code> - a breakpoint at line <code>N</code> was hit</li>
@@ -33,11 +33,11 @@ package org.eclipse.debug.examples.core.pda.protocol;
*/
public class PDASuspendedEvent extends PDARunControlEvent {
-
+
public PDASuspendedEvent(String message) {
super(message);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("suspended"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java
index 4f4ad3932..93fe3860a 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -14,7 +14,7 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Instructs the debugger to terminate.
- *
+ *
* <pre>
* C: terminate
* R: ok
@@ -27,7 +27,7 @@ public class PDATerminateCommand extends PDACommand {
public PDATerminateCommand() {
super("terminate"); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java
index d3aa4a2a0..3b95f94b5 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,17 +13,17 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Terminated event generated when the PDA program has ended execution.
- *
+ *
* <pre>
* E: termianted
* </pre>
*/
public class PDATerminatedEvent extends PDAEvent {
-
+
public PDATerminatedEvent(String message) {
super(message);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("terminated"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java
index 90e0103e9..4f866d1d8 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -12,27 +12,27 @@
package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Unimplemented Instruction event generated when the PDA program encounters
+ * Unimplemented Instruction event generated when the PDA program encounters
* an instruction that it does not recognize. This event is usually followed
* by a VM Suspended event.
- *
+ *
* <pre>
* E: unimplemented instruction {label}
* </pre>
*/
public class PDAUnimplementedInstructionEvent extends PDAEvent {
-
+
public final String fOperation;
-
+
public PDAUnimplementedInstructionEvent(String message) {
super(message);
fOperation = message.substring(getName(message).length() + 1);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("unimplemented instruction"); //$NON-NLS-1$
}
-
+
@Override
protected String getName(String message) {
if (isEventMessage(message)) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java
index 43c726ed0..8f917e2ce 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,13 +13,13 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Resumes the execution of the whole virtual machine
- *
+ * Resumes the execution of the whole virtual machine
+ *
* <pre>
* C: vmresume
* R: ok
* E: vmresumed client
- *
+ *
* Errors:
* error: vm already running
* </pre>
@@ -30,7 +30,7 @@ public class PDAVMResumeCommand extends PDACommand {
public PDAVMResumeCommand() {
super("vmresume"); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java
index 056270d61..a679a5e0d 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -12,13 +12,13 @@
package org.eclipse.debug.examples.core.pda.protocol;
/**
- * VM Resumed event generated when the whole virtual machine is resumed. When
- * the VM is resumed all previously suspended threads are resumed as well.
- *
+ * VM Resumed event generated when the whole virtual machine is resumed. When
+ * the VM is resumed all previously suspended threads are resumed as well.
+ *
* <pre>
* E: vmresumed [reason]
* </pre>
- *
+ *
* <code>[reason]</code> is the cause of the resume: and it's optional:
* <ul>
* <li><code>step</code> - a step request has been initiated</li>
@@ -26,11 +26,11 @@ package org.eclipse.debug.examples.core.pda.protocol;
* </ul>
*/
public class PDAVMResumedEvent extends PDARunControlEvent {
-
+
public PDAVMResumedEvent(String message) {
super(message);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("vmresumed"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java
index 27d519105..9b4520d41 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -12,19 +12,19 @@
package org.eclipse.debug.examples.core.pda.protocol;
/**
- * VM started event generated when the the interpreter has started (guaranteed
+ * VM started event generated when the the interpreter has started (guaranteed
* to be the first event sent)
- *
+ *
* <pre>
* E: vmstarted
* </pre>
*/
public class PDAVMStartedEvent extends PDAEvent {
-
+
public PDAVMStartedEvent(String message) {
super(message);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("vmstarted"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java
index d65d07dd0..03be38ebf 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,13 +13,13 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Suspends the execution of the whole virtual machine
- *
+ * Suspends the execution of the whole virtual machine
+ *
* <pre>
* C: vmsuspend
* R: ok
* E: vmsuspended client
- *
+ *
* Errors:
* error: thread already suspended
* </pre>
@@ -30,7 +30,7 @@ public class PDAVMSuspendCommand extends PDACommand {
public PDAVMSuspendCommand() {
super("vmsuspend"); //$NON-NLS-1$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java
index eac42a107..39d52fc35 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,13 +13,13 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* VM Suspended event generated when the virtual machine is suspended. If the VM
- * is suspended as a result of a thread event (e.g. thread hitting a breakpoint),
+ * is suspended as a result of a thread event (e.g. thread hitting a breakpoint),
* then the thread_id is included in the event.
- *
+ *
* <pre>
* E: vmsuspended [thread_id] {reason}
* </pre>
- *
+ *
* <code>{reason}</code> is the cause of the suspension:
* <ul>
* <li><code>breakpoint N</code> - a breakpoint at line <code>N</code> was hit</li>
@@ -34,11 +34,11 @@ package org.eclipse.debug.examples.core.pda.protocol;
* </ul>
*/
public class PDAVMSuspendedEvent extends PDARunControlEvent {
-
+
public PDAVMSuspendedEvent(String message) {
super(message);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("vmsuspended"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java
index b73884746..5756e16d5 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
@@ -12,17 +12,17 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
* Terminated event generated when the PDA program has ended execution.
- *
+ *
* <pre>
* E: termianted
* </pre>
*/
public class PDAVMTerminatedEvent extends PDAEvent {
-
+
public PDAVMTerminatedEvent(String message) {
super(message);
}
-
+
public static boolean isEventMessage(String message) {
return message.startsWith("vmterminated"); //$NON-NLS-1$
}
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java
index cab160251..203a9c2bf 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,14 +13,14 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Return the contents of variable <code>variable_name</code> in the control
- * stack frame <code>frame_number</code> (stack frames are indexed from 0, 0
- * being the oldest).
- *
+ * Return the contents of variable <code>variable_name</code> in the control
+ * stack frame <code>frame_number</code> (stack frames are indexed from 0, 0
+ * being the oldest).
+ *
* <pre>
* C: var {thread_id} {frame_number} {variable_name}
* R: {variable_value}
- *
+ *
* Errors:
* error: invalid thread
* error: variable undefined
@@ -32,7 +32,7 @@ public class PDAVarCommand extends PDACommand {
public PDAVarCommand(int threadId, int frameId, String name) {
super("var " + threadId + " " + frameId + " " + name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java
index 1440049ff..e8038bfed 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -13,11 +13,11 @@ package org.eclipse.debug.examples.core.pda.protocol;
/**
- * Set a watchpoint on variable <code>variable_name</code> in function
- * <code>function</code> to magic value <code>watch_operation</code>. The magic
- * value is a bit flag corresponding to read access (1), write access (2), or
+ * Set a watchpoint on variable <code>variable_name</code> in function
+ * <code>function</code> to magic value <code>watch_operation</code>. The magic
+ * value is a bit flag corresponding to read access (1), write access (2), or
* both (3); the magic value 0 clears the watchpoint.
- *
+ *
* <pre>
* C: watch {function}::{variable_name} {watch_operation}
* R: ok
@@ -32,11 +32,11 @@ public class PDAWatchCommand extends PDACommand {
public static final int WRITE = 2;
public static final int BOTH = READ | WRITE;
public static final int NONE = 0;
-
+
public PDAWatchCommand(String function, String variable, int operation) {
super("watch " + function+ "::" + variable + " " + operation); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
-
+
@Override
public PDACommandResult createResult(String resultText) {
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourceLookupDirector.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourceLookupDirector.java
index 83b1bc57a..a5be0f045 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourceLookupDirector.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourceLookupDirector.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -16,7 +16,7 @@ import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
/**
* PDA source lookup director. For PDA source lookup there is one source
- * lookup participant.
+ * lookup participant.
*/
public class PDASourceLookupDirector extends AbstractSourceLookupDirector {
/* (non-Javadoc)
@@ -25,7 +25,7 @@ public class PDASourceLookupDirector extends AbstractSourceLookupDirector {
@Override
public void initializeParticipants() {
//#ifdef ex4
-//# // TODO: Exercise 4 - add our participant to this director
+//# // TODO: Exercise 4 - add our participant to this director
//#else
addParticipants(new ISourceLookupParticipant[]{new PDASourceLookupParticipant()});
//#endif
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourceLookupParticipant.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourceLookupParticipant.java
index 7326ad37c..0d7aaa979 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourceLookupParticipant.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourceLookupParticipant.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -17,8 +17,8 @@ import org.eclipse.debug.examples.core.pda.model.PDAStackFrame;
/**
- * The PDA source lookup participant knows how to translate a
- * PDA stack frame into a source file name
+ * The PDA source lookup participant knows how to translate a
+ * PDA stack frame into a source file name
*/
public class PDASourceLookupParticipant extends AbstractSourceLookupParticipant {
/* (non-Javadoc)
@@ -28,7 +28,7 @@ public class PDASourceLookupParticipant extends AbstractSourceLookupParticipant
public String getSourceName(Object object) throws CoreException {
//#ifdef ex4
//# // TODO: Exercise 4 - return the name of the source file for the given stack frame
-//# return null;
+//# return null;
//#else
if (object instanceof PDAStackFrame) {
return ((PDAStackFrame)object).getSourceName();
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourcePathComputerDelegate.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourcePathComputerDelegate.java
index 208a5a4b4..5d3143936 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourcePathComputerDelegate.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/sourcelookup/PDASourcePathComputerDelegate.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -29,13 +29,13 @@ import org.eclipse.debug.examples.core.pda.DebugCorePlugin;
/**
* Computes the default source lookup path for a PDA launch configuration.
- * The default source lookup path is the folder or project containing
+ * The default source lookup path is the folder or project containing
* the PDA program being launched. If the program is not specified, the workspace
* is searched by default.
*/
public class PDASourcePathComputerDelegate implements ISourcePathComputerDelegate {
-
-
+
+
/* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.core.runtime.IProgressMonitor)
*/
diff --git a/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF b/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF
index d3cfb9825..7fc441a8c 100644
--- a/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF
+++ b/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.debug.examples.memory;singleton:=true
-Bundle-Version: 1.101.0.qualifier
+Bundle-Version: 1.101.100.qualifier
Bundle-ClassPath: bin/
Bundle-Activator: org.eclipse.debug.examples.internal.memory.MemoryViewSamplePlugin
Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.debug.examples.memory/pom.xml b/org.eclipse.debug.examples.memory/pom.xml
index ecc75cf0e..f3e0555e8 100644
--- a/org.eclipse.debug.examples.memory/pom.xml
+++ b/org.eclipse.debug.examples.memory/pom.xml
@@ -14,10 +14,10 @@
<parent>
<artifactId>eclipse.platform.debug</artifactId>
<groupId>eclipse.platform.debug</groupId>
- <version>4.7.1-SNAPSHOT</version>
+ <version>4.8.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.debug</groupId>
<artifactId>org.eclipse.debug.examples.memory</artifactId>
- <version>1.101.0-SNAPSHOT</version>
+ <version>1.101.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/MemoryViewSamplePlugin.java b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/MemoryViewSamplePlugin.java
index 180f71173..8699d376c 100644
--- a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/MemoryViewSamplePlugin.java
+++ b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/MemoryViewSamplePlugin.java
@@ -116,7 +116,7 @@ public class MemoryViewSamplePlugin extends AbstractUIPlugin {
* Declares a workbench image given the path of the image file (relative to
* the workbench plug-in). This is a helper method that creates the image
* descriptor and passes it to the main <code>declareImage</code> method.
- *
+ *
* @param symbolicName the symbolic name of the image
* @param path the path of the image file relative to the base of the
* workbench plug-ins install directory <code>false</code> if
diff --git a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleDebugTarget.java b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleDebugTarget.java
index 4470d7e7d..8b3ff934a 100644
--- a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleDebugTarget.java
+++ b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleDebugTarget.java
@@ -47,7 +47,7 @@ public class SampleDebugTarget extends DebugElement implements IDebugTarget, IMe
/**
* Creates SampleDebugTarget
- *
+ *
* @param launch the launch this debug target belongs to
*/
public SampleDebugTarget(ILaunch launch) {
@@ -259,7 +259,7 @@ public class SampleDebugTarget extends DebugElement implements IDebugTarget, IMe
/**
* Remove the memory block from this debug session.
- *
+ *
* @param memBlk
*/
public void removeMemoryBlock(IMemoryBlock memBlk) {
diff --git a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleMemoryBlock.java b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleMemoryBlock.java
index 09c9b9ef8..6a93b4dee 100644
--- a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleMemoryBlock.java
+++ b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleMemoryBlock.java
@@ -31,7 +31,7 @@ import org.eclipse.jface.viewers.IColorProvider;
/**
* Memory Block Implementation
- *
+ *
*/
public class SampleMemoryBlock extends DebugElement implements IMemoryBlockExtension {
@@ -45,7 +45,7 @@ public class SampleMemoryBlock extends DebugElement implements IMemoryBlockExten
/**
* Creates memory block
- *
+ *
* @param debugTarget
* @param expression
* @param address
@@ -338,7 +338,7 @@ public class SampleMemoryBlock extends DebugElement implements IMemoryBlockExten
}
/**
- *
+ *
*/
private void fireContentChangeEvent() {
DebugEvent evt = new DebugEvent(this, DebugEvent.CHANGE);
diff --git a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleStackFrame.java b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleStackFrame.java
index 4b23904d2..17e890be9 100644
--- a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleStackFrame.java
+++ b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleStackFrame.java
@@ -21,7 +21,7 @@ import org.eclipse.debug.core.model.IVariable;
import org.eclipse.osgi.util.NLS;
/**
- *
+ *
*
*/
public class SampleStackFrame extends DebugElement implements IStackFrame {
@@ -33,7 +33,7 @@ public class SampleStackFrame extends DebugElement implements IStackFrame {
/**
* Constructs a SampleStackFrame
- *
+ *
* @param thread
* @param name
*/
diff --git a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleThread.java b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleThread.java
index 6e72a6f68..a94f295a9 100644
--- a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleThread.java
+++ b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleThread.java
@@ -21,7 +21,7 @@ import org.eclipse.debug.core.model.IThread;
/**
* Abstract Sample Thread
- *
+ *
*/
public class SampleThread extends DebugElement implements IThread {
@@ -29,7 +29,7 @@ public class SampleThread extends DebugElement implements IThread {
/**
* Constructs SampleThread
- *
+ *
* @param target
*/
public SampleThread(SampleDebugTarget target) {
diff --git a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleEngine.java b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleEngine.java
index e96c2bcd3..7416b357f 100644
--- a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleEngine.java
+++ b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleEngine.java
@@ -41,7 +41,7 @@ public class SampleEngine {
/**
* Allow debug adapters to get memory from an address
- *
+ *
* @param address
* @param length
* @return memory byte from an address
@@ -182,7 +182,7 @@ public class SampleEngine {
/**
* Simulates evaluation of an expression. Given an expression, return ad
* address
- *
+ *
* @param expression
* @param evalContext
* @return the address the expression is evaluated to
@@ -205,7 +205,7 @@ public class SampleEngine {
/**
* Simulates checking if storage retrieval is supported
- *
+ *
* @return if the engine supports storage retrieval
*/
public boolean supportsStorageRetrieval() {
@@ -214,7 +214,7 @@ public class SampleEngine {
/**
* Simulates modifying memory using BigInteger as the address
- *
+ *
* @param address
* @param bytes
* @throws RuntimeException
@@ -319,7 +319,7 @@ public class SampleEngine {
}
/**
- *
+ *
*/
private SampleStackFrame[] createStackframes(SampleThread thread) {
SampleStackFrame[] stackframes = new SampleStackFrame[2];
@@ -339,7 +339,7 @@ public class SampleEngine {
/**
* Sets the base address of this memory block
- *
+ *
* @param mb the memory block to change base address
* @param address the new base address of the memory block
* @throws CoreException
diff --git a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleMemoryUnit.java b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleMemoryUnit.java
index 95bb97c9f..72e2c664b 100644
--- a/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleMemoryUnit.java
+++ b/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleMemoryUnit.java
@@ -15,7 +15,7 @@ import org.eclipse.debug.core.model.MemoryByte;
/**
* For testing addressable size > 1. Group each addressable unit in a MemoryByte
* array.
- *
+ *
*/
public class SampleMemoryUnit {
diff --git a/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF b/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF
index 279575ce1..f439bc76b 100755
--- a/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF
+++ b/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.debug.examples.mixedmode;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
Bundle-Activator: org.eclipse.debug.internal.examples.mixedmode.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.debug.examples.mixedmode/pom.xml b/org.eclipse.debug.examples.mixedmode/pom.xml
index 10819e59c..bef7e38c0 100644
--- a/org.eclipse.debug.examples.mixedmode/pom.xml
+++ b/org.eclipse.debug.examples.mixedmode/pom.xml
@@ -14,10 +14,10 @@
<parent>
<artifactId>eclipse.platform.debug</artifactId>
<groupId>eclipse.platform.debug</groupId>
- <version>4.7.1-SNAPSHOT</version>
+ <version>4.8.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.debug</groupId>
<artifactId>org.eclipse.debug.examples.mixedmode</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.debug.examples.mixedmode/src/org/eclipse/debug/internal/examples/mixedmode/Activator.java b/org.eclipse.debug.examples.mixedmode/src/org/eclipse/debug/internal/examples/mixedmode/Activator.java
index 1f8428f4e..225de429b 100755
--- a/org.eclipse.debug.examples.mixedmode/src/org/eclipse/debug/internal/examples/mixedmode/Activator.java
+++ b/org.eclipse.debug.examples.mixedmode/src/org/eclipse/debug/internal/examples/mixedmode/Activator.java
@@ -56,7 +56,7 @@ public class Activator extends AbstractUIPlugin {
/**
* Returns the shared instance
- *
+ *
* @return the shared instance
*/
public static Activator getDefault() {
diff --git a/org.eclipse.debug.examples.mixedmode/src/org/eclipse/debug/internal/examples/mixedmode/DoNothingLaunchConfigurationDelegate.java b/org.eclipse.debug.examples.mixedmode/src/org/eclipse/debug/internal/examples/mixedmode/DoNothingLaunchConfigurationDelegate.java
index 73dabeae5..0b41fca33 100644
--- a/org.eclipse.debug.examples.mixedmode/src/org/eclipse/debug/internal/examples/mixedmode/DoNothingLaunchConfigurationDelegate.java
+++ b/org.eclipse.debug.examples.mixedmode/src/org/eclipse/debug/internal/examples/mixedmode/DoNothingLaunchConfigurationDelegate.java
@@ -22,7 +22,7 @@ import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
public class DoNothingLaunchConfigurationDelegate implements ILaunchConfigurationDelegate {
/**
- *
+ *
*/
public DoNothingLaunchConfigurationDelegate() {
}
diff --git a/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF b/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF
index 6e77a407f..5a0224f72 100644
--- a/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.debug.examples.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.100.qualifier
Bundle-Activator: org.eclipse.debug.examples.ui.pda.DebugUIPlugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
org.eclipse.core.resources,
diff --git a/org.eclipse.debug.examples.ui/pom.xml b/org.eclipse.debug.examples.ui/pom.xml
index 2fd462af0..096c4be00 100644
--- a/org.eclipse.debug.examples.ui/pom.xml
+++ b/org.eclipse.debug.examples.ui/pom.xml
@@ -14,10 +14,10 @@
<parent>
<artifactId>eclipse.platform.debug</artifactId>
<groupId>eclipse.platform.debug</groupId>
- <version>4.7.1-SNAPSHOT</version>
+ <version>4.8.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.debug</groupId>
<artifactId>org.eclipse.debug.examples.ui</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/CheckboxModelProxyFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/CheckboxModelProxyFactory.java
index ff95f9fc1..71647c06f 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/CheckboxModelProxyFactory.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/CheckboxModelProxyFactory.java
@@ -20,7 +20,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationCont
public class CheckboxModelProxyFactory implements IModelProxyFactory {
private MidiEventModelProxy fMidiEventProxy = new MidiEventModelProxy();
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory#createModelProxy(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
*/
@@ -33,7 +33,7 @@ public class CheckboxModelProxyFactory implements IModelProxyFactory {
return fMidiEventProxy;
}
}
-
+
return null;
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlCellModifier.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlCellModifier.java
index 214aba225..0a252913e 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlCellModifier.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlCellModifier.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -17,11 +17,11 @@ import org.eclipse.jface.viewers.ICellModifier;
* A cell modifier for a sequencer control. Provides current
* values of controls and updates control values in the sequencer
* as they are changed in the UI.
- *
+ *
* @since 1.0
*/
public class ControlCellModifier implements ICellModifier {
-
+
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String)
*/
@@ -60,7 +60,7 @@ public class ControlCellModifier implements ICellModifier {
if (element instanceof SequencerControl) {
if (value instanceof String) {
SequencerControl control = (SequencerControl) element;
- control.setValue((String) value);
+ control.setValue((String) value);
}
}
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlEditor.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlEditor.java
index a76fc406e..ce57c5061 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlEditor.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlEditor.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* Provides cell editors and modifiers for sequencer controls.
- *
+ *
* @since 1.0
*/
public class ControlEditor implements IElementEditor {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlEventHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlEventHandler.java
index 0d5d262de..7f429d225 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlEventHandler.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlEventHandler.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -23,7 +23,7 @@ import org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler;
/**
* Listens to events from sequencer controls and fires corresponding
* deltas to update the viewer.
- *
+ *
* @since 1.0
*/
public class ControlEventHandler extends DebugEventHandler {
@@ -32,12 +32,12 @@ public class ControlEventHandler extends DebugEventHandler {
* Associated launch
*/
private MidiLaunch fLaunch;
-
+
/**
* Timer used to update clock
*/
private Timer fTimer;
-
+
/**
* @param proxy
*/
@@ -45,7 +45,7 @@ public class ControlEventHandler extends DebugEventHandler {
super(proxy);
fLaunch = proxy.getMidiLaunch();
}
-
+
protected void init() {
if (!fLaunch.isSuspended() && !fLaunch.isTerminated() && !fLaunch.isDisconnected()) {
startTimer();
@@ -59,7 +59,7 @@ public class ControlEventHandler extends DebugEventHandler {
protected boolean handlesEvent(DebugEvent event) {
return true;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler#dispose()
*/
@@ -115,8 +115,8 @@ public class ControlEventHandler extends DebugEventHandler {
fTimer = null;
}
}
-
-
-
-
+
+
+
+
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlLabelProvider.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlLabelProvider.java
index 7daab2a8b..404281e70 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlLabelProvider.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlLabelProvider.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.TreePath;
/**
* Label provider for a sequencer control.
- *
+ *
* @since 1.0
*/
public class ControlLabelProvider extends ElementLabelProvider {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlsMementoProvider.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlsMementoProvider.java
index 6197cda6f..76f0b1a5d 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlsMementoProvider.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlsMementoProvider.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -18,7 +18,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationCont
/**
* Provides mementos for sequencer elements.
- *
+ *
* @since 1.0
*/
public class ControlsMementoProvider extends DebugElementMementoProvider {
@@ -37,6 +37,6 @@ public class ControlsMementoProvider extends DebugElementMementoProvider {
return null;
}
-
+
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiAdapterFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiAdapterFactory.java
index db3b6ab71..8e4964aa6 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiAdapterFactory.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiAdapterFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Patrick Chuong (Texas Instruments) - Checkbox support for Flexible Hierachy view (Bug 286310)
@@ -28,27 +28,27 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactor
/**
* Adapter factory for MIDI elements.
- *
+ *
* @since 1.0
*/
public class MidiAdapterFactory implements IAdapterFactory {
private static IElementContentProvider fgSequencerContentProvider = new SequencerContentProvider();
private static IElementContentProvider fgTackContentProvider = new TrackContentProvider();
-
+
private static IElementLabelProvider fgTrackLabelProvider = new TrackLabelProvider();
private static IElementLabelProvider fgControlLabelProvider = new ControlLabelProvider();
private static IElementLabelProvider fgMidiEventLabelProvdier = new MidiEventLabelProvider();
-
+
private static IColumnPresentationFactory fgSequencerColumnFactory = new SequencerColumnFactory();
private static IColumnPresentationFactory fgTrackColumnFactory = new TrackColumnFactory();
-
+
private static IModelProxyFactory fgSequencerModelProxyFactory = new SequencerModelProxyFactory();
-
+
private static IElementMementoProvider fgMementoProvider = new ControlsMementoProvider();
-
+
private static IStepOverHandler fgStepOverHandler = new MidiStepOverHandler();
-
+
private static IModelProxyFactory fgCheckboxModelProxyFactory = new CheckboxModelProxyFactory();
@SuppressWarnings("unchecked")
@@ -73,7 +73,7 @@ public class MidiAdapterFactory implements IAdapterFactory {
return (T) fgMidiEventLabelProvdier;
}
}
-
+
if (IColumnPresentationFactory.class.equals(adapterType)) {
if (adaptableObject instanceof MidiLaunch) {
return (T) fgSequencerColumnFactory;
@@ -87,7 +87,7 @@ public class MidiAdapterFactory implements IAdapterFactory {
return (T) new ControlEditor();
}
}
-
+
if (IModelProxyFactory.class.equals(adapterType)) {
if (adaptableObject instanceof MidiLaunch) {
return (T) fgSequencerModelProxyFactory;
@@ -103,7 +103,7 @@ public class MidiAdapterFactory implements IAdapterFactory {
if (IStepOverHandler.class.equals(adapterType)) {
return (T) fgStepOverHandler;
}
-
+
return null;
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiStepOverHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiStepOverHandler.java
index 30d11b260..629ce749f 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiStepOverHandler.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiStepOverHandler.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnFactory.java
index 3fdde0f0f..52ae651ae 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnFactory.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Patrick Chuong (Texas Instruments) - Checkbox support for Flexible Hierachy view (Bug 286310)
@@ -19,7 +19,7 @@ import org.eclipse.debug.ui.IDebugUIConstants;
/**
* Column presentation factory for a sequencer.
- *
+ *
* @since 1.0
*/
public class SequencerColumnFactory implements IColumnPresentationFactory {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnPresentation.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnPresentation.java
index 3672fcb46..22f6244cf 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnPresentation.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnPresentation.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -14,7 +14,7 @@ import org.eclipse.debug.internal.ui.viewers.provisional.AbstractColumnPresentat
/**
* Columns for sequencer in the variables view.
- *
+ *
* @since 1.0
*/
public class SequencerColumnPresentation extends AbstractColumnPresentation {
@@ -34,7 +34,7 @@ public class SequencerColumnPresentation extends AbstractColumnPresentation {
* Column presentation ID.
*/
public static final String ID = "org.eclipse.debug.examples.ui.midi.columnPresentation"; //$NON-NLS-1$
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#getAvailableColumns()
*/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerContentProvider.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerContentProvider.java
index 149ec9df6..234e44fac 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerContentProvider.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerContentProvider.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -26,7 +26,7 @@ import org.eclipse.debug.ui.IDebugUIConstants;
/**
* Provides content for a MIDI sequencer element (MIDI launch).
- *
+ *
* @since 1.0
*/
public class SequencerContentProvider extends ElementContentProvider {
@@ -59,10 +59,10 @@ public class SequencerContentProvider extends ElementContentProvider {
}
return EMPTY;
}
-
+
/**
* Returns the controls for this sequencer.
- *
+ *
* @param launch midi launch
* @return controls
*/
@@ -73,10 +73,10 @@ public class SequencerContentProvider extends ElementContentProvider {
new LengthControl(launch)
};
}
-
+
/**
* Returns all tracks in the sequence.
- *
+ *
* @param launch MIDI launch
*@return tracks
*/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerControlsModelProxy.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerControlsModelProxy.java
index a6b0338a9..2c8e12d20 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerControlsModelProxy.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerControlsModelProxy.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.Viewer;
* Model proxy for a sequencer in the variables view. Listens
* to events from controls to update the viewer when the user
* changes a control's value.
- *
+ *
* @since 1.0
*/
public class SequencerControlsModelProxy extends EventHandlerModelProxy {
@@ -32,22 +32,22 @@ public class SequencerControlsModelProxy extends EventHandlerModelProxy {
* Associated launch
*/
private MidiLaunch fLaunch;
-
+
/**
* Event handler
*/
private ControlEventHandler fHandler;
-
+
/**
* Constructs a model proxy to update based on changes in controls
* for the associated sequencer.
- *
+ *
* @param launch MIDI launch
*/
public SequencerControlsModelProxy(MidiLaunch launch) {
fLaunch = launch;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#installed(org.eclipse.jface.viewers.Viewer)
*/
@@ -59,13 +59,13 @@ public class SequencerControlsModelProxy extends EventHandlerModelProxy {
/**
* Returns the launch assocaited with this proxy.
- *
+ *
* @return MIDI launch
*/
protected MidiLaunch getMidiLaunch() {
return fLaunch;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#createEventHandlers()
*/
@@ -91,9 +91,9 @@ public class SequencerControlsModelProxy extends EventHandlerModelProxy {
}
return false;
}
-
-
-
-
+
+
+
+
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerModelProxyFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerModelProxyFactory.java
index 5955b8aa6..046e327b7 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerModelProxyFactory.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerModelProxyFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -19,9 +19,9 @@ import org.eclipse.debug.internal.ui.viewers.update.LaunchProxy;
import org.eclipse.debug.ui.IDebugUIConstants;
/**
- * Factory to create a model proxy for sequencer controls in
+ * Factory to create a model proxy for sequencer controls in
* the variables view.
- *
+ *
* @since 1.0
*/
public class SequencerModelProxyFactory implements IModelProxyFactory {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnFactory.java
index cc7727735..a2b606006 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnFactory.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Patrick Chuong (Texas Instruments) - Checkbox support for Flexible Hierachy view (Bug 286310)
@@ -19,7 +19,7 @@ import org.eclipse.debug.ui.IDebugUIConstants;
/**
* Column presentation factory for a track.
- *
+ *
* @since 1.0
*/
public class TrackColumnFactory implements IColumnPresentationFactory {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnPresentation.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnPresentation.java
index bc51c663e..90e7b9eec 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnPresentation.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnPresentation.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -14,7 +14,7 @@ import org.eclipse.debug.internal.ui.viewers.provisional.AbstractColumnPresentat
/**
* Columns for sequencer in the variables view.
- *
+ *
* @since 1.0
*/
public class TrackColumnPresentation extends AbstractColumnPresentation {
@@ -31,7 +31,7 @@ public class TrackColumnPresentation extends AbstractColumnPresentation {
* All columns
*/
public static final String[] COLUMN_IDS = new String[]{COL_TICK, COL_BYTES, COL_COMMAND, COL_CHANNEL};
-
+
/**
* Initial columns
*/
@@ -41,7 +41,7 @@ public class TrackColumnPresentation extends AbstractColumnPresentation {
* Column presentation ID.
*/
public static final String ID = "org.eclipse.debug.examples.ui.midi.trackColumns"; //$NON-NLS-1$
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#getAvailableColumns()
*/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackContentProvider.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackContentProvider.java
index 04ace9c2e..96005d0b5 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackContentProvider.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackContentProvider.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Patrick Chuong (Texas Instruments) - Checkbox support for Flexible Hierachy view (Bug 286310)
@@ -24,7 +24,7 @@ import org.eclipse.debug.ui.IDebugUIConstants;
/**
* Content provider for track in the variables view. Returns MIDI events
* in the track.
- *
+ *
* @since 1.0
*/
public class TrackContentProvider extends ElementContentProvider {
@@ -50,7 +50,7 @@ public class TrackContentProvider extends ElementContentProvider {
Track track = (Track) parent;
MidiEvent[] events= new MidiEvent[length];
for (int i = 0; i < length; i++) {
- events[i] = track.get(i+index);
+ events[i] = track.get(i+index);
}
return events;
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackLabelProvider.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackLabelProvider.java
index 14c80acdf..a1b854795 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackLabelProvider.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackLabelProvider.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.TreePath;
/**
* Provides labels for MIDI tracks.
- *
+ *
* @since 1.0
*/
public class TrackLabelProvider extends ElementLabelProvider {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackModelProxy.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackModelProxy.java
index cb10aa824..0b701efad 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackModelProxy.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackModelProxy.java
@@ -20,23 +20,23 @@ import org.eclipse.jface.viewers.Viewer;
public class TrackModelProxy extends AbstractModelProxy {
protected Track fTrack;
-
+
public TrackModelProxy(Track track) {
fTrack = track;
}
-
+
@Override
public void installed(Viewer viewer) {
super.installed(viewer);
-
+
ModelDelta delta = new ModelDelta(fTrack, IModelDelta.NO_CHANGE);
for (int i = 0; i < fTrack.size(); ++i) {
delta.addNode(fTrack.get(i), IModelDelta.INSTALL);
}
-
+
fireModelChanged(delta);
}
-
+
@Override
public synchronized void dispose() {
super.dispose();
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ClockSliderDetailPane.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ClockSliderDetailPane.java
index b34c8edc1..e6c7afb3b 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ClockSliderDetailPane.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ClockSliderDetailPane.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -23,11 +23,11 @@ import org.eclipse.ui.IWorkbenchPartSite;
/**
* A slider to control the clock position.
- *
+ *
* @since 1.0
*/
public class ClockSliderDetailPane implements IDetailPane {
-
+
private Slider fSlider;
private ClockControl fControl;
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/TempoSliderDetailPane.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/TempoSliderDetailPane.java
index bf13b8b8f..9395ff62b 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/TempoSliderDetailPane.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/TempoSliderDetailPane.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -23,11 +23,11 @@ import org.eclipse.ui.IWorkbenchPartSite;
/**
* A slider to control tempo.
- *
+ *
* @since 1.0
*/
public class TempoSliderDetailPane implements IDetailPane {
-
+
private Slider fSlider;
private TempoControl fControl;
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/ExampleLaunchStatusHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/ExampleLaunchStatusHandler.java
index 03b8672cc..01ee2d3bc 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/ExampleLaunchStatusHandler.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/ExampleLaunchStatusHandler.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java
index c7f1b3448..65d31bc13 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2008, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -42,25 +42,25 @@ import org.eclipse.ui.dialogs.ResourceListSelectionDialog;
/**
* Tab to specify the MIDI file to play.
- *
+ *
* @since 1.0
*/
public class MidiMainTab extends AbstractLaunchConfigurationTab {
-
+
private Text fFileText;
private Button fFileButton;
-
+
private Button fExceptions;
private Button fHandled;
private Button fUnhandled;
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
@Override
public void createControl(Composite parent) {
Font font = parent.getFont();
-
+
Composite comp = new Composite(parent, SWT.NONE);
setControl(comp);
GridLayout topLayout = new GridLayout();
@@ -68,15 +68,15 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab {
topLayout.numColumns = 3;
comp.setLayout(topLayout);
comp.setFont(font);
-
+
createVerticalSpacer(comp, 3);
-
+
Label programLabel = new Label(comp, SWT.NONE);
programLabel.setText("&Midi File:"); //$NON-NLS-1$
GridData gd = new GridData(GridData.BEGINNING);
programLabel.setLayoutData(gd);
programLabel.setFont(font);
-
+
fFileText = new Text(comp, SWT.SINGLE | SWT.BORDER);
gd = new GridData(GridData.FILL_HORIZONTAL);
fFileText.setLayoutData(gd);
@@ -87,7 +87,7 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab {
updateLaunchConfigurationDialog();
}
});
-
+
fFileButton = createPushButton(comp, "&Browse...", null); //$NON-NLS-1$
fFileButton.addSelectionListener(new SelectionAdapter() {
@Override
@@ -95,11 +95,11 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab {
browseMidiFiles();
}
});
-
+
new Label(comp, SWT.NONE);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 3;
-
+
Group test = new Group(comp, SWT.NONE);
test.setText("Exceptions"); //$NON-NLS-1$
gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -132,7 +132,7 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab {
fUnhandled.setText("Throw an &unhandled exception during launch to open error dialog"); //$NON-NLS-1$
fUnhandled.addSelectionListener(sa);
}
-
+
/**
* Open a resource chooser to select a MIDI file
*/
@@ -145,7 +145,7 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab {
IFile file = (IFile) files[0];
fFileText.setText(file.getFullPath().toString());
}
-
+
}
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
@@ -197,7 +197,7 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab {
}
configuration.setAttribute(MidiLaunchDelegate.ATTR_MIDI_FILE, file);
configuration.setMappedResources(resources);
-
+
// exception handling
if (fExceptions.getSelection()) {
if (fHandled.getSelection()) {
@@ -209,7 +209,7 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab {
configuration.removeAttribute(MidiLaunchDelegate.ATTR_THROW_EXCEPTION);
}
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
@@ -217,7 +217,7 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab {
public String getName() {
return "Main"; //$NON-NLS-1$
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
*/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiTabGroup.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiTabGroup.java
index 6678753a0..57e7f3a0f 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiTabGroup.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiTabGroup.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -17,7 +17,7 @@ import org.eclipse.debug.ui.ILaunchConfigurationTab;
/**
* Tab group for a MIDI file.
- *
+ *
* @since 1.0
*/
public class MidiTabGroup extends AbstractLaunchConfigurationTabGroup {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/AddPDAMemoryBlockAction.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/AddPDAMemoryBlockAction.java
index 8ce7996f1..771222c8e 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/AddPDAMemoryBlockAction.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/AddPDAMemoryBlockAction.java
@@ -27,7 +27,7 @@ import org.eclipse.ui.IWorkbenchWindow;
* Action to add a memory block when a PDA debug target is selected
*/
public class AddPDAMemoryBlockAction implements IActionDelegate2{
-
+
public AddPDAMemoryBlockAction() {
}
@@ -49,12 +49,12 @@ public class AddPDAMemoryBlockAction implements IActionDelegate2{
}
}
}
-
+
}
-
+
/**
* Returns the selected debug target or <code>null</code>.
- *
+ *
* @param selection selection
* @return debug target from the selection or <code>null</code>
*/
@@ -102,5 +102,5 @@ public class AddPDAMemoryBlockAction implements IActionDelegate2{
run(action);
}
-
+
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/CommandAdapterFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/CommandAdapterFactory.java
index e3da52e57..346507e8f 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/CommandAdapterFactory.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/CommandAdapterFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
@@ -16,9 +16,9 @@ import org.eclipse.debug.core.commands.IRestartHandler;
import org.eclipse.debug.examples.core.pda.model.PDADebugTarget;
/**
- * Adapter factory that provides debug command handler adapters for the
+ * Adapter factory that provides debug command handler adapters for the
* PDA debugger.
- *
+ *
* @since 3.6
*/
public class CommandAdapterFactory implements IAdapterFactory {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/ModelProxyFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/ModelProxyFactory.java
index 4f5586ee1..d87c1460b 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/ModelProxyFactory.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/ModelProxyFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDADebugTargetContentProvider.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDADebugTargetContentProvider.java
index fad17ae43..cabfdea92 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDADebugTargetContentProvider.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDADebugTargetContentProvider.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Pawel Piech (Wind River) - ported PDA Virtual Machine to Java (Bug 261400)
@@ -37,7 +37,7 @@ public class PDADebugTargetContentProvider extends ElementContentProvider {
}
return 0;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#hasChildren(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate)
*/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDADebugTargetProxy.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDADebugTargetProxy.java
index 7aee1b507..6ffa7467d 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDADebugTargetProxy.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDADebugTargetProxy.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDARestartDebugCommand.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDARestartDebugCommand.java
index 41ff6c1de..246b14f4d 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDARestartDebugCommand.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDARestartDebugCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
@@ -43,7 +43,7 @@ public class PDARestartDebugCommand extends AbstractDebugCommand implements IRes
@Override
protected boolean isExecutable(Object[] targets, IProgressMonitor monitor, IEnabledStateRequest request)
- throws CoreException
+ throws CoreException
{
for (int i = 0; i < targets.length; i++) {
if (((PDADebugTarget)targets[i]).isTerminated()) {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java
index ed3082637..313de2c53 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -29,12 +29,12 @@ import org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler;
* @since 3.2
*/
public class PDAThreadEventHandler extends DebugEventHandler {
-
+
private IStackFrame fPrev = null;
-
+
/**
* Constructs and event handler for a threads in the given viewer.
- *
+ *
* @param viewer
*/
public PDAThreadEventHandler(AbstractModelProxy proxy) {
@@ -50,7 +50,7 @@ public class PDAThreadEventHandler extends DebugEventHandler {
}
fireDeltaUpdatingTopFrame(thread, IModelDelta.NO_CHANGE | extras);
}
-
+
private boolean isEqual(Object o1, Object o2) {
if (o1 == o2) {
return true;
@@ -93,7 +93,7 @@ public class PDAThreadEventHandler extends DebugEventHandler {
IThread thread = (IThread) event.getSource();
fireDeltaAndClearTopFrame(thread, IModelDelta.CONTENT);
}
-
+
private ModelDelta buildRootDelta() {
return new ModelDelta(getLaunchManager(), IModelDelta.NO_CHANGE);
}
@@ -101,7 +101,7 @@ public class PDAThreadEventHandler extends DebugEventHandler {
private ILaunchManager getLaunchManager() {
return DebugPlugin.getDefault().getLaunchManager();
}
-
+
protected ModelDelta addTarget(ModelDelta delta, IThread thread) {
ILaunch launch = thread.getLaunch();
Object[] children = launch.getChildren();
@@ -127,7 +127,7 @@ public class PDAThreadEventHandler extends DebugEventHandler {
}
fireDelta(delta);
}
-
+
private void fireDeltaUpdatingTopFrame(IThread thread, int flags) {
ModelDelta delta = buildRootDelta();
ModelDelta node = addTarget(delta, thread);
@@ -149,8 +149,8 @@ public class PDAThreadEventHandler extends DebugEventHandler {
fPrev = frame;
}
fireDelta(delta);
- }
-
+ }
+
@Override
protected boolean handlesEvent(DebugEvent event) {
return event.getSource() instanceof PDAThread;
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDABreakpointAdapter.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDABreakpointAdapter.java
index 1486e78ff..4b5a0cc34 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDABreakpointAdapter.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDABreakpointAdapter.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2015 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -68,11 +68,11 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
public boolean canToggleLineBreakpoints(IWorkbenchPart part, ISelection selection) {
return getEditor(part) != null;
}
-
+
/**
* Returns the editor being used to edit a PDA file, associated with the
* given part, or <code>null</code> if none.
- *
+ *
* @param part workbench part
* @return the editor being used to edit a PDA file, associated with the
* given part, or <code>null</code> if none
@@ -88,9 +88,9 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
}
}
}
- return null;
+ return null;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/
@@ -126,8 +126,8 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
public boolean canToggleWatchpoints(IWorkbenchPart part, ISelection selection) {
return getVariableAndFunctionName(part, selection) != null;
}
-
- protected void toggleWatchpoint(IResource resource, int lineNumber, String fcn, String var, boolean access,
+
+ protected void toggleWatchpoint(IResource resource, int lineNumber, String fcn, String var, boolean access,
boolean modification) throws CoreException
{
// look for existing watchpoint to delete
@@ -151,7 +151,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
/**
* Returns the variable and function names at the current line, or <code>null</code> if none.
- *
+ *
* @param part text editor
* @param selection text selection
* @return the variable and function names at the current line, or <code>null</code> if none.
@@ -168,7 +168,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
IRegion region = document.getLineInformationOfOffset(textSelection.getOffset());
String string = document.get(region.getOffset(), region.getLength()).trim();
if (string.startsWith("var ")) { //$NON-NLS-1$
- String varName = string.substring(4).trim();
+ String varName = string.substring(4).trim();
String fcnName = getFunctionName(document, varName, document.getLineOfOffset(textSelection.getOffset()));
return new String[] {varName, fcnName};
}
@@ -177,14 +177,14 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
} finally {
documentProvider.disconnect(this);
}
- }
+ }
return null;
}
-
+
/**
* Returns the name of the function containing the given variable defined at the given
* line number in the specified document.
- *
+ *
* @param document PDA source file
* @param varName variable name
* @param line line numbner at which the variable is defined
@@ -212,7 +212,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
}
return "_main_"; //$NON-NLS-1$
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#toggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/
@@ -222,9 +222,9 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
toggleWatchpoints(part, selection);
} else {
toggleLineBreakpoints(part, selection);
- }
+ }
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#canToggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAEditorAdapterFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAEditorAdapterFactory.java
index 22243aabd..e0a1de6e8 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAEditorAdapterFactory.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAEditorAdapterFactory.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2015 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -50,7 +50,7 @@ public class PDAEditorAdapterFactory implements IAdapterFactory {
}
//#endif
}
- }
+ }
}
return null;
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDARunToLineAdapter.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDARunToLineAdapter.java
index 6a9eecdd9..36136b10f 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDARunToLineAdapter.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDARunToLineAdapter.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2015 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -35,7 +35,7 @@ import org.eclipse.ui.texteditor.ITextEditor;
* Run to line target for the Java debugger
*/
public class PDARunToLineAdapter implements IRunToLineTarget {
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IRunToLineTarget#runToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume)
*/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java
index caa7fea92..928cc5415 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2008, 2015 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
@@ -41,12 +41,12 @@ public class PDAToggleWatchpointsTarget extends PDABreakpointAdapter {
final private boolean fAccessModeEnabled;
final private boolean fModificationModeEnabled;
-
+
PDAToggleWatchpointsTarget(boolean access, boolean modification) {
fAccessModeEnabled = access;
fModificationModeEnabled = modification;
}
-
+
@Override
public boolean canToggleWatchpoints(IWorkbenchPart part, ISelection selection) {
if (super.canToggleWatchpoints(part, selection)) {
@@ -59,16 +59,16 @@ public class PDAToggleWatchpointsTarget extends PDABreakpointAdapter {
}
return false;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/
@Override
public void toggleWatchpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
String[] variableAndFunctionName = getVariableAndFunctionName(part, selection);
-
+
if (variableAndFunctionName != null && part instanceof ITextEditor && selection instanceof ITextSelection) {
- // Selection inside text editor. Create a watchpoint based on
+ // Selection inside text editor. Create a watchpoint based on
// current source line.
ITextEditor editorPart = (ITextEditor)part;
int lineNumber = ((ITextSelection)selection).getStartLine();
@@ -76,34 +76,34 @@ public class PDAToggleWatchpointsTarget extends PDABreakpointAdapter {
String var = variableAndFunctionName[0];
String fcn = variableAndFunctionName[1];
toggleWatchpoint(resource, lineNumber, fcn, var, fAccessModeEnabled, fModificationModeEnabled);
- } else if (selection instanceof IStructuredSelection &&
- ((IStructuredSelection)selection).getFirstElement() instanceof PDAVariable )
+ } else if (selection instanceof IStructuredSelection &&
+ ((IStructuredSelection)selection).getFirstElement() instanceof PDAVariable )
{
- // Selection is inside a variables view. Create a watchpoint
+ // Selection is inside a variables view. Create a watchpoint
// using information from the variable. Retrieving information
- // from the model requires performing source lookup which should be
+ // from the model requires performing source lookup which should be
// done on a background thread.
final PDAVariable var = (PDAVariable)((IStructuredSelection)selection).getFirstElement();
final PDAStackFrame frame = var.getStackFrame();
- final Shell shell = part.getSite().getShell();
-
+ final Shell shell = part.getSite().getShell();
+
new Job("Toggle PDA Watchpoint") { //$NON-NLS-1$
{ setSystem(true); }
-
+
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
IFile file = getResource(var.getStackFrame());
String varName = var.getName();
int line = findLine(file, varName);
- toggleWatchpoint(file, line, frame.getName(), varName,
+ toggleWatchpoint(file, line, frame.getName(), varName,
fAccessModeEnabled, fModificationModeEnabled);
} catch (final CoreException e) {
// Need to switch back to the UI thread to show the error
// dialog.
new WorkbenchJob(shell.getDisplay(), "Toggle PDA Watchpoint") { //$NON-NLS-1$
{ setSystem(true); }
-
+
@Override
public IStatus runInUIThread(IProgressMonitor submonitor) {
ErrorDialog.openError(shell, "Failed to create PDA watchpoint", "Failed to create PDA watchpoint.\n", e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
@@ -125,7 +125,7 @@ public class PDAToggleWatchpointsTarget extends PDABreakpointAdapter {
}
return null;
}
-
+
private int findLine(IFile file, String var) throws CoreException {
int lineNum = 0;
try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getContents()))) {
@@ -145,7 +145,7 @@ public class PDAToggleWatchpointsTarget extends PDABreakpointAdapter {
}
return lineNum;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#toggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/
@@ -155,9 +155,9 @@ public class PDAToggleWatchpointsTarget extends PDABreakpointAdapter {
toggleWatchpoints(part, selection);
} else {
toggleLineBreakpoints(part, selection);
- }
+ }
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#canToggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
*/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAContentAssistant.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAContentAssistant.java
index a051aa268..d91dbbecd 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAContentAssistant.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAContentAssistant.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -19,17 +19,17 @@ import org.eclipse.jface.text.contentassist.ContentAssistant;
import org.eclipse.swt.widgets.Shell;
public class PDAContentAssistant extends ContentAssistant {
-
+
public PDAContentAssistant() {
super();
-
- PDAContentAssistProcessor processor= new PDAContentAssistProcessor();
+
+ PDAContentAssistProcessor processor= new PDAContentAssistProcessor();
setContentAssistProcessor(processor, IDocument.DEFAULT_CONTENT_TYPE);
-
+
enableAutoActivation(false);
enableAutoInsert(false);
-
- setInformationControlCreator(getInformationControlCreator());
+
+ setInformationControlCreator(getInformationControlCreator());
}
private IInformationControlCreator getInformationControlCreator() {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAEditor.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAEditor.java
index 6ab57fdc9..aafe0e0ec 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAEditor.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAEditor.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -22,7 +22,7 @@ import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
* PDA editor
*/
public class PDAEditor extends AbstractDecoratedTextEditor {
-
+
/**
* Creates a PDE editor
*/
@@ -44,6 +44,6 @@ public class PDAEditor extends AbstractDecoratedTextEditor {
action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
setAction("ContentAssistProposal", action); //$NON-NLS-1$
}
-
-
+
+
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java
index f2e864c7a..21565dc70 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -24,7 +24,7 @@ import org.eclipse.jface.text.rules.WordRule;
* PDA editor keyword scanner.
*/
public class PDAScanner extends BufferedRuleBasedScanner {
-
+
/**
* PDA keywods
*/
@@ -32,7 +32,7 @@ public class PDAScanner extends BufferedRuleBasedScanner {
"add", "branch_not_zero", "call", "dec", "dup", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
"halt", "output", "pop", "push", "return", "var" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
};
-
+
/**
* Detects potential keywords
*/
@@ -54,12 +54,12 @@ public class PDAScanner extends BufferedRuleBasedScanner {
return Character.isLetter(c) || c == '_';
}
}
-
+
/**
* Detects PDA branch labels
*/
class PDALabelDetector extends PDAWordDetector {
-
+
/* (non-Javadoc)
* @see org.eclipse.jface.text.rules.IWordDetector#isWordStart(char)
*/
@@ -67,7 +67,7 @@ public class PDAScanner extends BufferedRuleBasedScanner {
public boolean isWordStart(char c) {
return c == ':';
}
-
+
/* (non-Javadoc)
* @see org.eclipse.jface.text.rules.IWordDetector#isWordPart(char)
*/
@@ -90,7 +90,7 @@ public class PDAScanner extends BufferedRuleBasedScanner {
}
// labels
token = new Token(new TextAttribute(DebugUIPlugin.getDefault().getColor(DebugUIPlugin.LABEL)));
- WordRule labels = new WordRule(new PDALabelDetector(), token);
+ WordRule labels = new WordRule(new PDALabelDetector(), token);
setRules(new IRule[]{keywords, labels});
}
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDASourceViewerConfiguration.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDASourceViewerConfiguration.java
index 676906253..28839915b 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDASourceViewerConfiguration.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDASourceViewerConfiguration.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -41,7 +41,7 @@ public class PDASourceViewerConfiguration extends TextSourceViewerConfiguration
public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
return new AnnotationHover();
}
-
+
/* (non-Javadoc)
* @see org.eclipse.jface.text.source.SourceViewerConfiguration#getPresentationReconciler(org.eclipse.jface.text.source.ISourceViewer)
*/
@@ -62,6 +62,6 @@ public class PDASourceViewerConfiguration extends TextSourceViewerConfiguration
public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
return new PDAContentAssistant();
}
-
-
+
+
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PopFrameActionDelegate.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PopFrameActionDelegate.java
index 7fb40ed11..8383300de 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PopFrameActionDelegate.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PopFrameActionDelegate.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -25,7 +25,7 @@ import org.eclipse.ui.IWorkbenchPart;
public class PopFrameActionDelegate implements IObjectActionDelegate, IActionDelegate2 {
-
+
private PDAThread fThread = null;
/* (non-Javadoc)
@@ -41,7 +41,7 @@ public class PopFrameActionDelegate implements IObjectActionDelegate, IActionDel
@Override
public void run(IAction action) {
//#ifdef ex5
-//# // TODO: Exercise 5 - pop the top frame
+//# // TODO: Exercise 5 - pop the top frame
//#else
try {
fThread.popFrame();
@@ -61,7 +61,7 @@ public class PopFrameActionDelegate implements IObjectActionDelegate, IActionDel
if (element instanceof PDAStackFrame) {
PDAStackFrame frame = (PDAStackFrame) element;
//#ifdef ex5
-//# // TODO: Exercise 5 - enable the action if the frame's thread supports it
+//# // TODO: Exercise 5 - enable the action if the frame's thread supports it
//#else
fThread = (PDAThread) frame.getThread();
try {
@@ -71,7 +71,7 @@ public class PopFrameActionDelegate implements IObjectActionDelegate, IActionDel
return;
//#endif
}
-
+
}
action.setEnabled(false);
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/TextHover.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/TextHover.java
index cbd294fe8..a51fe8d98 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/TextHover.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/TextHover.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -44,7 +44,7 @@ public class TextHover implements ITextHover {
if (varName.startsWith("$") && varName.length() > 1) { //$NON-NLS-1$
varName = varName.substring(1);
}
-
+
PDAStackFrame frame = null;
IAdaptable debugContext = DebugUITools.getDebugContext();
if (debugContext instanceof PDAStackFrame) {
@@ -81,7 +81,7 @@ public class TextHover implements ITextHover {
}
return null;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
*/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/WordFinder.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/WordFinder.java
index e60d98203..54c451c60 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/WordFinder.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/WordFinder.java
@@ -1,17 +1,17 @@
/*******************************************************************************
* Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
*******************************************************************************/
package org.eclipse.debug.examples.ui.pda.editor;
-
+
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
@@ -21,50 +21,50 @@ import org.eclipse.jface.text.Region;
* Looks for an identifier in a source file
*/
public class WordFinder {
-
+
/**
* Returns the region in the given document that contains an identifier, or
* <code>null</code> if none.
- *
+ *
* @param document document to search
* @param offset offset at which to look for an identifier
* @return region containing an identifier, or <code>null</code>
*/
public static IRegion findWord(IDocument document, int offset) {
-
+
int start= -1;
int end= -1;
-
-
+
+
try {
-
+
int pos= offset;
char c;
-
+
while (pos >= 0) {
c= document.getChar(pos);
if (!Character.isJavaIdentifierPart(c))
break;
--pos;
}
-
+
start= pos;
-
+
pos= offset;
int length= document.getLength();
-
+
while (pos < length) {
c= document.getChar(pos);
if (!Character.isJavaIdentifierPart(c))
break;
++pos;
}
-
+
end= pos;
-
+
} catch (BadLocationException x) {
}
-
+
if (start > -1 && end > -1) {
if (start == offset && end == offset)
return new Region(offset, 0);
@@ -73,7 +73,7 @@ public class WordFinder {
else
return new Region(start + 1, end - start - 1);
}
-
+
return null;
}
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDALaunchShortcut.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDALaunchShortcut.java
index 08d4ecefa..794c7d490 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDALaunchShortcut.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDALaunchShortcut.java
@@ -41,7 +41,7 @@ public class PDALaunchShortcut implements ILaunchShortcut {
IFile file = (IFile) ((IStructuredSelection)selection).getFirstElement();
// check for an existing launch config for the pda file
- String path = file.getFullPath().toString();
+ String path = file.getFullPath().toString();
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
ILaunchConfigurationType type = launchManager.getLaunchConfigurationType(DebugCorePlugin.ID_PDA_LAUNCH_CONFIGURATION_TYPE);
try {
@@ -57,7 +57,7 @@ public class PDALaunchShortcut implements ILaunchShortcut {
} catch (CoreException e) {
return;
}
-
+
try {
// create a new configuration for the pda file
ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, file.getName());
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java
index 4fad594f8..4d8333ef6 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java
@@ -45,17 +45,17 @@ import org.eclipse.ui.dialogs.ResourceListSelectionDialog;
* Tab to specify the PDA program to run/debug.
*/
public class PDAMainTab extends AbstractLaunchConfigurationTab {
-
+
private Text fProgramText;
private Button fProgramButton;
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
@Override
public void createControl(Composite parent) {
Font font = parent.getFont();
-
+
Composite comp = new Composite(parent, SWT.NONE);
setControl(comp);
GridLayout topLayout = new GridLayout();
@@ -63,15 +63,15 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
topLayout.numColumns = 3;
comp.setLayout(topLayout);
comp.setFont(font);
-
+
createVerticalSpacer(comp, 3);
-
+
Label programLabel = new Label(comp, SWT.NONE);
programLabel.setText("&Program:"); //$NON-NLS-1$
GridData gd = new GridData(GridData.BEGINNING);
programLabel.setLayoutData(gd);
programLabel.setFont(font);
-
+
fProgramText = new Text(comp, SWT.SINGLE | SWT.BORDER);
gd = new GridData(GridData.FILL_HORIZONTAL);
fProgramText.setLayoutData(gd);
@@ -82,7 +82,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
updateLaunchConfigurationDialog();
}
});
-
+
fProgramButton = createPushButton(comp, "&Browse...", null); //$NON-NLS-1$
fProgramButton.addSelectionListener(new SelectionAdapter() {
@Override
@@ -91,9 +91,9 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
}
});
}
-
+
/**
- * Open a resource chooser to select a PDA program
+ * Open a resource chooser to select a PDA program
*/
protected void browsePDAFiles() {
ResourceListSelectionDialog dialog = new ResourceListSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), IResource.FILE);
@@ -104,7 +104,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
IFile file = (IFile) files[0];
fProgramText.setText(file.getFullPath().toString());
}
-
+
}
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
@@ -118,7 +118,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
@Override
public void initializeFrom(ILaunchConfiguration configuration) {
//#ifdef ex1
-//# // TODO: Exercise 1 - retrieve the program path attribute from the launch configuration
+//# // TODO: Exercise 1 - retrieve the program path attribute from the launch configuration
//# String program = null;
//# if (program != null) {
//# fProgramText.setText(program);
@@ -146,11 +146,11 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
}
//#ifdef ex1
//# // TODO: Exercise 1 - update the launch configuration with the path to
-//# // currently specified program
+//# // currently specified program
//#else
configuration.setAttribute(DebugCorePlugin.ATTR_PDA_PROGRAM, program);
//#endif
-
+
// perform resource mapping for contextual launch
IResource[] resources = null;
if (program!= null) {
@@ -162,7 +162,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
}
configuration.setMappedResources(resources);
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
@@ -170,7 +170,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
public String getName() {
return "Main"; //$NON-NLS-1$
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
*/
@@ -182,7 +182,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
String text = fProgramText.getText();
//#ifdef ex1
//# // TODO: Exercise 1 - validate the currently specified program exists and is not
-//# // empty, providing the user with feedback.
+//# // empty, providing the user with feedback.
//#else
if (text.length() > 0) {
IPath path = new Path(text);
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDATabGroup.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDATabGroup.java
index 38e42d4e0..c8bdf2851 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDATabGroup.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDATabGroup.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -28,7 +28,7 @@ public class PDATabGroup extends AbstractLaunchConfigurationTabGroup {
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
//#ifdef ex1
//# // TODO: Exercise 1 - add the PDA main tab, source lookup tab and common
-//# // tab to the tab group
+//# // tab to the tab group
//#else
setTabs(new ILaunchConfigurationTab[] {
new PDAMainTab(),
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/presentation/PDAModelPresentation.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/presentation/PDAModelPresentation.java
index 821446167..6e952420c 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/presentation/PDAModelPresentation.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/presentation/PDAModelPresentation.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -59,10 +59,10 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr
}
return null;
}
-
+
/**
* Returns a label for the given watchpoint.
- *
+ *
* @param watchpoint
* @return a label for the given watchpoint
*/
@@ -78,11 +78,11 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr
return label;
} catch (CoreException e) {
return null;
- }
+ }
}
/**
* Returns a label for the given debug target
- *
+ *
* @param target debug target
* @return a label for the given debug target
*/
@@ -100,14 +100,14 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr
} catch (CoreException e) {
}
return "PDA"; //$NON-NLS-1$
-
+
}
-
+
/**
* Returns a label for the given stack frame
- *
+ *
* @param frame a stack frame
- * @return a label for the given stack frame
+ * @return a label for the given stack frame
*/
private String getStackFrameText(PDAStackFrame frame) {
try {
@@ -117,10 +117,10 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr
return null;
}
-
+
/**
* Returns a label for the given thread
- *
+ *
* @param thread a thread
* @return a label for the given thread
*/
@@ -158,7 +158,7 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr
}
return label;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDebugModelPresentation#computeDetail(org.eclipse.debug.core.model.IValue, org.eclipse.debug.ui.IValueDetailListener)
*/
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/AbstractDataStackViewHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/AbstractDataStackViewHandler.java
index 73d061936..40fdec65d 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/AbstractDataStackViewHandler.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/AbstractDataStackViewHandler.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
@@ -32,22 +32,22 @@ abstract public class AbstractDataStackViewHandler extends AbstractHandler {
IWorkbenchPart part = HandlerUtil.getActivePartChecked(event);
if (part instanceof DataStackView) {
DataStackView view = (DataStackView)part;
-
+
ISelection selection = DebugUITools.getDebugContextForEventChecked(event);
if (selection instanceof IStructuredSelection) {
Object element = ((IStructuredSelection)selection).getFirstElement();
-
+
PDAThread thread = null;
if (element instanceof PDAThread) {
thread = (PDAThread)element;
} else if (element instanceof PDAStackFrame) {
thread = (PDAThread)((PDAStackFrame)element).getThread();
- }
+ }
if (element != null) {
doExecute(
- view,
- thread,
+ view,
+ thread,
HandlerUtil.getCurrentSelectionChecked(event));
}
}
@@ -56,10 +56,10 @@ abstract public class AbstractDataStackViewHandler extends AbstractHandler {
}
return null;
}
-
+
/**
- * Performs the actual handler operation.
- *
+ * Performs the actual handler operation.
+ *
* @param view The view that the handler was invoked in.
* @param target The current active debug target.
* @param selection The current selection in view.
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CheckboxView.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CheckboxView.java
index a66daf7e2..918a02cff 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CheckboxView.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CheckboxView.java
@@ -16,19 +16,19 @@ import org.eclipse.swt.SWT;
public class CheckboxView extends VariablesView {
public static String ID = "CHECKBOX_VIEW_ID"; //$NON-NLS-1$
-
+
@Override
protected int getViewerStyle() {
return SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.VIRTUAL | SWT.FULL_SELECTION | SWT.CHECK;
}
-
+
@Override
protected String getHelpContextId() {
return ID;
}
-
+
@Override
- protected String getPresentationContextId() {
+ protected String getPresentationContextId() {
return ID;
}
}
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/DataStackView.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/DataStackView.java
index 78bc82bc8..73162e43a 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/DataStackView.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/DataStackView.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2005, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Bjorn Freeman-Benson - initial API and implementation
@@ -37,12 +37,12 @@ import org.eclipse.ui.progress.UIJob;
/**
- * View of the PDA VM data stack
+ * View of the PDA VM data stack
*/
public class DataStackView extends AbstractDebugView implements IDebugContextListener {
-
+
private PDAThread fThread;
-
+
class StackViewContentProvider implements ITreeContentProvider {
/* (non-Javadoc)
@@ -100,9 +100,9 @@ public class DataStackView extends AbstractDebugView implements IDebugContextLis
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
-
+
}
-
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.AbstractDebugView#createViewer(org.eclipse.swt.widgets.Composite)
*/
@@ -149,14 +149,14 @@ public class DataStackView extends AbstractDebugView implements IDebugContextLis
DebugUITools.getDebugContextManager().getContextService(getSite().getWorkbenchWindow()).removeDebugContextListener(this);
super.dispose();
}
-
+
@Override
public void debugContextChanged(final DebugContextEvent event) {
new UIJob(getSite().getShell().getDisplay(), "DataStackView update") { //$NON-NLS-1$
{
setSystem(true);
}
-
+
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
if (getViewer() != null) { // runs asynchronously, view may be disposed
@@ -166,13 +166,13 @@ public class DataStackView extends AbstractDebugView implements IDebugContextLis
}
}.schedule();
}
-
+
/**
* Updates the view for the selected thread (if suspended)
*/
private void update(ISelection context) {
fThread = null;
-
+
if (context instanceof IStructuredSelection) {
Object element = ((IStructuredSelection)context).getFirstElement();
if (element instanceof PDAThread) {
diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PushHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PushHandler.java
index 88ef28b26..314f2e441 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PushHandler.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PushHandler.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Wind River Systems - initial API and implementation
* IBM Corporation - bug fixing
diff --git a/org.eclipse.debug.tests/.classpath b/org.eclipse.debug.tests/.classpath
index 098194ca4..eca7bdba8 100644
--- a/org.eclipse.debug.tests/.classpath
+++ b/org.eclipse.debug.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs
index 854ba028d..89f76dbc2 100644
--- a/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs
@@ -11,14 +11,17 @@ org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,14 +75,16 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=error
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
@@ -102,6 +107,9 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -123,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/org.eclipse.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.debug.tests/META-INF/MANIFEST.MF
index 5471362ea..421235395 100644
--- a/org.eclipse.debug.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.debug.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.debug.tests;singleton:=true
-Bundle-Version: 3.10.101.qualifier
+Bundle-Version: 3.11.0.qualifier
Bundle-Activator: org.eclipse.debug.tests.TestsPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.ui.console;bundle-version="[3.7.0,4.0.0)",
org.eclipse.text
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
Export-Package: org.eclipse.debug.tests,
org.eclipse.debug.tests.breakpoint,
diff --git a/org.eclipse.debug.tests/pom.xml b/org.eclipse.debug.tests/pom.xml
index 26e984884..a3f12aedd 100644
--- a/org.eclipse.debug.tests/pom.xml
+++ b/org.eclipse.debug.tests/pom.xml
@@ -5,7 +5,7 @@
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
-
+
Contributors:
Igor Fedorenko - initial implementation
-->
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.debug</artifactId>
<groupId>eclipse.platform.debug</groupId>
- <version>4.7.1-SNAPSHOT</version>
+ <version>4.8.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.debug</groupId>
<artifactId>org.eclipse.debug.tests</artifactId>
- <version>3.10.101-SNAPSHOT</version>
+ <version>3.11.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AbstractDebugTest.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AbstractDebugTest.java
new file mode 100644
index 000000000..39e3134d3
--- /dev/null
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AbstractDebugTest.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Andrey Loskutov and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Andrey Loskutov <loskutov@gmx.de> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.debug.tests;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.eclipse.ui.progress.UIJob;
+
+import junit.framework.TestCase;
+
+public class AbstractDebugTest extends TestCase {
+
+ private static boolean welcomeClosed;
+
+ public AbstractDebugTest() {
+ super();
+ }
+
+ public AbstractDebugTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ TestUtil.log(IStatus.INFO, getName(), "setUp");
+ assertWelcomeScreenClosed();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ TestUtil.log(IStatus.INFO, getName(), "tearDown");
+ TestUtil.cleanUp(getName());
+ super.tearDown();
+ }
+
+ /**
+ * Ensure the welcome screen is closed because in 4.x the debug perspective
+ * opens a giant fast-view causing issues
+ *
+ * @throws Exception
+ */
+ protected final void assertWelcomeScreenClosed() throws Exception {
+ if (!welcomeClosed && PlatformUI.isWorkbenchRunning()) {
+ final IWorkbench wb = PlatformUI.getWorkbench();
+ if (wb == null) {
+ return;
+ }
+ // In UI thread we don't need to run a job
+ if (Display.getCurrent() != null) {
+ closeIntro(wb);
+ return;
+ }
+
+ UIJob job = new UIJob("close welcome screen for debug test suite") {
+ @Override
+ public IStatus runInUIThread(IProgressMonitor monitor) {
+ closeIntro(wb);
+ return Status.OK_STATUS;
+ }
+
+ };
+ job.setPriority(Job.INTERACTIVE);
+ job.setSystem(true);
+ job.schedule();
+ }
+ }
+
+ private static void closeIntro(final IWorkbench wb) {
+ IWorkbenchWindow window = wb.getActiveWorkbenchWindow();
+ if (window != null) {
+ IIntroManager im = wb.getIntroManager();
+ IIntroPart intro = im.getIntro();
+ if (intro != null) {
+ welcomeClosed = im.closeIntro(intro);
+ }
+ }
+ }
+}
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestUtil.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestUtil.java
new file mode 100644
index 000000000..fba4831a7
--- /dev/null
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestUtil.java
@@ -0,0 +1,225 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Google, Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Stefan Xenos (Google) - Initial implementation
+ * Andrey Loskutov (loskutov@gmx.de) - many different extensions
+ *******************************************************************************/
+package org.eclipse.debug.tests;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadInfo;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+import org.junit.Assert;
+
+public class TestUtil {
+
+ /**
+ * Call this in the tearDown method of every test to clean up state that can
+ * otherwise leak through SWT between tests.
+ */
+ public static void cleanUp(String owner) {
+ // Ensure that the Thread.interrupted() flag didn't leak.
+ Assert.assertFalse("The main thread should not be interrupted at the end of a test", Thread.interrupted());
+
+ // Wait for any outstanding jobs to finish. Protect against deadlock by
+ // terminating the wait after a timeout.
+ boolean timedOut = waitForJobs(owner, 5, 5000);
+ if (timedOut) {
+ // We don't expect any extra jobs run during the test: try to cancel them
+ log(IStatus.INFO, owner, "Trying to cancel running jobs: " + getRunningOrWaitingJobs(null));
+ getRunningOrWaitingJobs(null).forEach(job -> job.cancel());
+ waitForJobs(owner, 5, 1000);
+ }
+
+ // Ensure that the Thread.interrupted() flag didn't leak.
+ Assert.assertFalse("The main thread should not be interrupted at the end of a test", Thread.interrupted());
+ }
+
+ public static void log(int severity, String owner, String message, Throwable... optionalError) {
+ message = "[" + owner + "] " + message;
+ Throwable error = null;
+ if (optionalError != null && optionalError.length > 0) {
+ error = optionalError[0];
+ }
+ Status status = new Status(severity, TestsPlugin.getDefault().getBundle().getSymbolicName(), message, error);
+ TestsPlugin.getDefault().getLog().log(status);
+ }
+
+ /**
+ * Process all queued UI events. If called from background thread, does
+ * nothing.
+ */
+ public static void runEventLoop() {
+ Display display = Display.getCurrent();
+ if (display != null && !display.isDisposed()) {
+ while (display.readAndDispatch()) {
+ // Keep pumping events until the queue is empty
+ }
+ }
+ }
+
+ /**
+ * Process all queued UI events. If called from background thread, just
+ * waits
+ */
+ public static void processUIEvents(final long millis) throws Exception {
+ long start = System.currentTimeMillis();
+ while (System.currentTimeMillis() - start < millis) {
+ Display display = Display.getCurrent();
+ if (display != null && !display.isDisposed()) {
+ while (display.readAndDispatch()) {
+ // loop until the queue is empty
+ }
+ } else {
+ Thread.sleep(10);
+ }
+ }
+ }
+
+ /**
+ * Utility for waiting until the execution of jobs of any family has
+ * finished or timeout is reached. If no jobs are running, the method waits
+ * given minimum wait time. While this method is waiting for jobs, UI events
+ * are processed.
+ *
+ * @param owner name of the caller which will be logged as prefix if the
+ * wait times out
+ * @param minTimeMs minimum wait time in milliseconds
+ * @param maxTimeMs maximum wait time in milliseconds
+ * @return true if the method timed out, false if all the jobs terminated
+ * before the timeout
+ */
+ public static boolean waitForJobs(String owner, long minTimeMs, long maxTimeMs) {
+ return waitForJobs(owner, minTimeMs, maxTimeMs, (Object[]) null);
+ }
+
+ /**
+ * Utility for waiting until the execution of jobs of any family has finished or timeout is reached. If no jobs are running, the method waits
+ * given minimum wait time. While this method is waiting for jobs, UI events are processed.
+ *
+ * @param owner
+ * name of the caller which will be logged as prefix if the wait times out
+ * @param minTimeMs
+ * minimum wait time in milliseconds
+ * @param maxTimeMs
+ * maximum wait time in milliseconds
+ * @param excludedFamilies
+ * optional list of job families to NOT wait for
+ *
+ * @return true if the method timed out, false if all the jobs terminated before the timeout
+ */
+ public static boolean waitForJobs(String owner, long minTimeMs, long maxTimeMs, Object... excludedFamilies) {
+ if (maxTimeMs < minTimeMs) {
+ throw new IllegalArgumentException("Max time is smaller as min time!");
+ }
+ final long start = System.currentTimeMillis();
+ while (System.currentTimeMillis() - start < minTimeMs) {
+ runEventLoop();
+ try {
+ Thread.sleep(Math.min(10, minTimeMs));
+ } catch (InterruptedException e) {
+ // Uninterruptable
+ }
+ }
+ while (!Job.getJobManager().isIdle()) {
+ List<Job> jobs = getRunningOrWaitingJobs(null, excludedFamilies);
+ if (jobs.isEmpty()) {
+ // only uninteresting jobs running
+ break;
+ }
+
+ if (!Collections.disjoint(runningJobs, jobs)) {
+ // There is a job which runs already quite some time, don't wait for it to avoid test timeouts
+ dumpRunningOrWaitingJobs(owner, jobs);
+ return true;
+ }
+
+ if (System.currentTimeMillis() - start >= maxTimeMs) {
+ dumpRunningOrWaitingJobs(owner, jobs);
+ return true;
+ }
+ runEventLoop();
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ // Uninterruptable
+ }
+ }
+ runningJobs.clear();
+ return false;
+ }
+
+ static Set<Job> runningJobs = new LinkedHashSet<>();
+
+ private static void dumpRunningOrWaitingJobs(String owner, List<Job> jobs) {
+ String message = "Some job is still running or waiting to run: " + dumpRunningOrWaitingJobs(jobs);
+ log(IStatus.ERROR, owner, message);
+ }
+
+ private static String dumpRunningOrWaitingJobs(List<Job> jobs) {
+ if (jobs.isEmpty()) {
+ return "";
+ }
+ // clear "old" running jobs, we only remember most recent
+ runningJobs.clear();
+ StringBuilder sb = new StringBuilder();
+ for (Job job : jobs) {
+ runningJobs.add(job);
+ sb.append("\n'").append(job.toString()).append("'/");
+ sb.append(job.getClass().getName());
+ Thread thread = job.getThread();
+ if (thread != null) {
+ ThreadInfo[] threadInfos = ManagementFactory.getThreadMXBean().getThreadInfo(new long[] { thread.getId() }, true, true);
+ if (threadInfos[0] != null) {
+ sb.append("\nthread info: ").append(threadInfos[0]);
+ }
+ }
+ sb.append(", ");
+ }
+ sb.setLength(sb.length() - 2);
+ return sb.toString();
+ }
+
+ public static List<Job> getRunningOrWaitingJobs(Object jobFamily, Object... excludedFamilies) {
+ List<Job> running = new ArrayList<>();
+ Job[] jobs = Job.getJobManager().find(jobFamily);
+ for (Job job : jobs) {
+ if (isRunningOrWaitingJob(job) && !belongsToFamilies(job, excludedFamilies)) {
+ running.add(job);
+ }
+ }
+ return running;
+ }
+
+ private static boolean isRunningOrWaitingJob(Job job) {
+ int state = job.getState();
+ return (state == Job.RUNNING || state == Job.WAITING);
+ }
+
+ private static boolean belongsToFamilies(Job job, Object... excludedFamilies) {
+ if (excludedFamilies == null || excludedFamilies.length == 0) {
+ return false;
+ }
+ for (Object family : excludedFamilies) {
+ if (job.belongsTo(family)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+}
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java
index 94b162520..66b924b3f 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java
@@ -12,8 +12,6 @@ package org.eclipse.debug.tests.breakpoint;
import java.util.List;
-import junit.framework.TestCase;
-
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRunnable;
@@ -26,6 +24,7 @@ import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.core.model.ILineBreakpoint;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsComparator;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.TestsPlugin;
import org.eclipse.debug.ui.IDebugModelPresentation;
import org.eclipse.debug.ui.IValueDetailListener;
@@ -42,7 +41,7 @@ import org.eclipse.ui.IEditorInput;
*
* Using a special Comparator which sorts breakpoint texts like file:1, file:2 and file:11 in a numerical ordering.
*/
-public class BreakpointOrderingTests extends TestCase {
+public class BreakpointOrderingTests extends AbstractDebugTest {
public BreakpointOrderingTests(String name) {
super(name);
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java
index fb0a025ec..5ae877f15 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java
@@ -16,6 +16,8 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.eclipse.debug.tests.AbstractDebugTest;
+import org.eclipse.debug.tests.TestUtil;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.swt.SWT;
@@ -24,7 +26,6 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewReference;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.console.ConsolePlugin;
@@ -34,14 +35,11 @@ import org.eclipse.ui.console.IConsoleView;
import org.eclipse.ui.part.IPageBookViewPage;
import org.eclipse.ui.part.MessagePage;
-import junit.framework.TestCase;
-
/**
* Tests console manager
*/
-public class ConsoleManagerTests extends TestCase {
+public class ConsoleManagerTests extends AbstractDebugTest {
- private static final String INTROVIEW_ID = "org.eclipse.ui.internal.introview"; //$NON-NLS-1$
private ExecutorService executorService;
private IConsoleManager manager;
private int count;
@@ -59,8 +57,7 @@ public class ConsoleManagerTests extends TestCase {
executorService = Executors.newFixedThreadPool(count);
manager = ConsolePlugin.getDefault().getConsoleManager();
IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- hideWelcomePage(activePage);
- TestHelper.processUIEvents(100);
+ TestUtil.processUIEvents(100);
consoles = new ConsoleMock[count];
for (int i = 0; i < count; i++) {
final ConsoleMock console = new ConsoleMock(i + 1);
@@ -71,7 +68,7 @@ public class ConsoleManagerTests extends TestCase {
IViewPart consoleView = activePage.showView("org.eclipse.ui.console.ConsoleView"); //$NON-NLS-1$
activePage.activate(consoleView);
- TestHelper.processUIEvents(100);
+ TestUtil.processUIEvents(100);
// The test is unstable ("show" event on the the first console seem to
// be not always sent), so make sure console view has shown at least
@@ -79,8 +76,8 @@ public class ConsoleManagerTests extends TestCase {
firstConsole = new ConsoleMock(0);
manager.addConsoles(new ConsoleMock[] { firstConsole });
manager.showConsoleView(firstConsole);
- TestHelper.waitForJobs();
- TestHelper.processUIEvents(100);
+ TestUtil.waitForJobs(getName(), 200, 5000);
+ TestUtil.processUIEvents(100);
ConsoleMock.allShownConsoles.set(0);
}
@@ -89,24 +86,10 @@ public class ConsoleManagerTests extends TestCase {
executorService.shutdownNow();
manager.removeConsoles(consoles);
manager.removeConsoles(new ConsoleMock[] { firstConsole });
- TestHelper.processUIEvents(100);
+ TestUtil.processUIEvents(100);
super.tearDown();
}
- private void hideWelcomePage(IWorkbenchPage activePage) {
- IViewReference[] refs = activePage.getViewReferences();
- IViewPart intro = null;
- for (IViewReference ref : refs) {
- if (INTROVIEW_ID.equals(ref.getId())) {
- intro = ref.getView(false);
- }
- }
- if (intro != null) {
- activePage.hideView(intro);
- TestHelper.processUIEvents(100);
- }
- }
-
/**
* The test triggers {@link #count} simultaneous calls to the
* {@link IConsoleManager#showConsoleView(IConsole)} and checks if all of
@@ -123,15 +106,15 @@ public class ConsoleManagerTests extends TestCase {
showConsole(console);
}
System.out.println("All tasks scheduled, processing UI events now..."); //$NON-NLS-1$
- TestHelper.processUIEvents(1000);
+ TestUtil.processUIEvents(1000);
// Console manager starts a job with delay, let wait for him a bit
System.out.println("Waiting on jobs now..."); //$NON-NLS-1$
- TestHelper.waitForJobs();
+ TestUtil.waitForJobs(getName(), 200, 5000);
// Give UI a chance to proceed pending console manager jobs
System.out.println("Done with jobs, processing UI events again..."); //$NON-NLS-1$
- TestHelper.processUIEvents(3000);
+ TestUtil.processUIEvents(3000);
executorService.shutdown();
@@ -139,7 +122,7 @@ public class ConsoleManagerTests extends TestCase {
boolean OK = waitForExecutorService();
if (!OK) {
System.out.println("Timed out..."); //$NON-NLS-1$
- TestHelper.processUIEvents(10000);
+ TestUtil.processUIEvents(10000);
// timeout?
assertTrue("Timeout occurred while waiting on console to be shown", //$NON-NLS-1$
@@ -151,12 +134,12 @@ public class ConsoleManagerTests extends TestCase {
assertEquals("Only " + shown + " consoles were shown from " + count, count, shown); //$NON-NLS-1$ //$NON-NLS-2$
}
- private boolean waitForExecutorService() throws InterruptedException {
+ private boolean waitForExecutorService() throws Exception {
for (int i = 0; i < 60; i++) {
if (executorService.awaitTermination(1, TimeUnit.SECONDS)) {
return true;
}
- TestHelper.processUIEvents(100);
+ TestUtil.processUIEvents(100);
}
return false;
}
@@ -172,7 +155,7 @@ public class ConsoleManagerTests extends TestCase {
latch.await(1, TimeUnit.MINUTES);
System.out.println("Requesting to show: " + console); //$NON-NLS-1$
manager.showConsoleView(console);
- TestHelper.waitForJobs();
+ TestUtil.waitForJobs(getName(), 200, 5000);
} catch (InterruptedException e) {
e.printStackTrace();
Thread.interrupted();
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java
index e63525306..98272afdb 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java
@@ -14,15 +14,27 @@ package org.eclipse.debug.tests.console;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import org.eclipse.core.commands.Command;
+import org.eclipse.debug.tests.AbstractDebugTest;
+import org.eclipse.debug.tests.TestUtil;
import org.eclipse.jface.text.IDocument;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchCommandConstants;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
import org.eclipse.ui.console.IConsoleConstants;
+import org.eclipse.ui.console.IConsoleManager;
+import org.eclipse.ui.console.IOConsole;
import org.eclipse.ui.console.IOConsoleOutputStream;
import org.eclipse.ui.console.MessageConsole;
import junit.framework.TestCase;
-public class ConsoleTests extends TestCase {
+public class ConsoleTests extends AbstractDebugTest {
public ConsoleTests() {
super("ConsoleTests"); //$NON-NLS-1$
@@ -41,21 +53,21 @@ public class ConsoleTests extends TestCase {
MessageConsole console = new MessageConsole("Test Console", //$NON-NLS-1$
IConsoleConstants.MESSAGE_CONSOLE_TYPE, null, StandardCharsets.UTF_8.name(), true);
IDocument document = console.getDocument();
- TestHelper.waitForJobs();
+ TestUtil.waitForJobs(getName(), 200, 5000);
TestCase.assertEquals("Document should be empty", "", document.get()); //$NON-NLS-1$ //$NON-NLS-2$
try (IOConsoleOutputStream outStream = console.newOutputStream()) {
outStream.write(testStringBuffer, 0, 6);
// half of ö (\u00f6) is written so we don't expect this char in
// output but all previous chars can be decoded
- TestHelper.waitForJobs();
+ TestUtil.waitForJobs(getName(), 200, 5000);
TestCase.assertEquals("First 4 chars should be written", testString.substring(0, 4), document.get()); //$NON-NLS-1$
outStream.write(testStringBuffer, 6, 6);
// all remaining bytes are written so we expect the whole string
// including the ö (\u00f6) which was at buffer boundary
- TestHelper.waitForJobs();
+ TestUtil.waitForJobs(getName(), 200, 5000);
TestCase.assertEquals("whole test string should be written", testString, document.get()); //$NON-NLS-1$
}
- TestHelper.waitForJobs();
+ TestUtil.waitForJobs(getName(), 200, 5000);
// after closing the stream, the document content should still be the
// same
TestCase.assertEquals("closing the stream should not alter the document", testString, document.get()); //$NON-NLS-1$
@@ -68,15 +80,15 @@ public class ConsoleTests extends TestCase {
MessageConsole console = new MessageConsole("Test Console 2", //$NON-NLS-1$
IConsoleConstants.MESSAGE_CONSOLE_TYPE, null, StandardCharsets.UTF_8.name(), true);
IDocument document = console.getDocument();
- TestHelper.waitForJobs();
+ TestUtil.waitForJobs(getName(), 200, 5000);
TestCase.assertEquals("Document should be empty", "", document.get()); //$NON-NLS-1$ //$NON-NLS-2$
try (IOConsoleOutputStream outStream = console.newOutputStream()) {
outStream.write(testStringBuffer);
// everything but pending \r should be written
- TestHelper.waitForJobs();
+ TestUtil.waitForJobs(getName(), 200, 5000);
TestCase.assertEquals("First char should be written", testString.substring(0, 1), document.get()); //$NON-NLS-1$
}
- TestHelper.waitForJobs();
+ TestUtil.waitForJobs(getName(), 200, 5000);
// after closing the stream, the document content should still be the
// same
TestCase.assertEquals("closing the stream should write the pending \\r", testString, document.get()); //$NON-NLS-1$
@@ -142,4 +154,34 @@ public class ConsoleTests extends TestCase {
}
}
+ /**
+ * Validate that we can use find and replace after opening a console in the
+ * Console View.
+ *
+ * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=268608">bug
+ * 268608</a>
+ */
+ public void testFindReplaceIsEnabledOnConsoleOpen() throws Exception {
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IViewPart consoleView = activePage.showView(IConsoleConstants.ID_CONSOLE_VIEW);
+
+ IOConsole console = new IOConsole("Test Console 7", IConsoleConstants.MESSAGE_CONSOLE_TYPE, null, true); //$NON-NLS-1$
+ console.getDocument().set("some text"); //$NON-NLS-1$
+
+ IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
+ IConsole[] consoles = { console };
+
+ try {
+ consoleManager.addConsoles(consoles);
+ consoleManager.showConsoleView(console);
+ TestUtil.waitForJobs(getName(), 100, 3000);
+
+ ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
+ Command command = commandService.getCommand(IWorkbenchCommandConstants.EDIT_FIND_AND_REPLACE);
+ TestCase.assertTrue("expected FindReplace command to be enabled after opening console", command.isEnabled());
+ } finally {
+ consoleManager.removeConsoles(consoles);
+ activePage.hideView(consoleView);
+ }
+ }
}
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/TestHelper.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/TestHelper.java
deleted file mode 100644
index 981459a79..000000000
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/TestHelper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Andreas Loth and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Andreas Loth - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.tests.console;
-
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-
-public final class TestHelper {
-
- private TestHelper() {
- throw new AssertionError("No instances of this utility class!"); //$NON-NLS-1$
- }
-
- public static void processUIEvents(final long millis) {
- long start = System.currentTimeMillis();
- while (System.currentTimeMillis() - start < millis) {
- while (PlatformUI.getWorkbench().getDisplay().readAndDispatch()) {
- // loop untile the queue is empty
- }
- }
- }
-
- public static void waitForJobs() throws InterruptedException {
- if (Display.getCurrent() == null) {
- Thread.sleep(200);
- } else {
- processUIEvents(200);
- }
- while (!Job.getJobManager().isIdle()) {
- if (Display.getCurrent() == null) {
- Thread.sleep(200);
- } else {
- processUIEvents(200);
- }
- }
- }
-
-}
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java
index 962c0bd68..626466eb6 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java
@@ -13,8 +13,6 @@ package org.eclipse.debug.tests.expressions;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.IExpressionListener;
import org.eclipse.debug.core.IExpressionManager;
@@ -23,11 +21,12 @@ import org.eclipse.debug.core.model.IExpression;
import org.eclipse.debug.core.model.IWatchExpression;
import org.eclipse.debug.internal.core.ExpressionManager;
import org.eclipse.debug.internal.core.IExpressionsListener2;
+import org.eclipse.debug.tests.AbstractDebugTest;
/**
* Tests expression manager and listener call backs
*/
-public class ExpressionManagerTests extends TestCase {
+public class ExpressionManagerTests extends AbstractDebugTest {
class SinlgeListener implements IExpressionListener {
@@ -154,14 +153,11 @@ public class ExpressionManagerTests extends TestCase {
return DebugPlugin.getDefault().getExpressionManager();
}
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
@Override
protected void tearDown() throws Exception {
// remove all expressions from the manager
- super.tearDown();
getManager().removeExpressions(getManager().getExpressions());
+ super.tearDown();
}
/**
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java
index 6de7f9768..74f3cc141 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java
@@ -18,13 +18,12 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationManager;
-
-import junit.framework.TestCase;
+import org.eclipse.debug.tests.AbstractDebugTest;
/**
* Common function for launch related tests.
*/
-public abstract class AbstractLaunchTest extends TestCase {
+public abstract class AbstractLaunchTest extends AbstractDebugTest {
/**
* Constructs a test with the given name.
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AcceleratorSubstitutionTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AcceleratorSubstitutionTests.java
index edb3091a9..379e836b7 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AcceleratorSubstitutionTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AcceleratorSubstitutionTests.java
@@ -10,9 +10,8 @@
*******************************************************************************/
package org.eclipse.debug.tests.launching;
-import junit.framework.TestCase;
-
import org.eclipse.debug.internal.ui.DebugUIPlugin;
+import org.eclipse.debug.tests.AbstractDebugTest;
/**
* Tests accelerator adjustments for DBCS languages.
@@ -20,7 +19,7 @@ import org.eclipse.debug.internal.ui.DebugUIPlugin;
*
* @since 3.3
*/
-public class AcceleratorSubstitutionTests extends TestCase {
+public class AcceleratorSubstitutionTests extends AbstractDebugTest {
/**
* Constructor
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentParsingTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentParsingTests.java
index d5e85e50e..a662ef3a7 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentParsingTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentParsingTests.java
@@ -25,15 +25,14 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.URIUtil;
import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.osgi.service.environment.Constants;
-import junit.framework.TestCase;
-
/**
* Tests {@link org.eclipse.debug.core.DebugPlugin#parseArguments(String)} and
* {@link org.eclipse.debug.core.DebugPlugin#renderArguments(String[], int[])}.
*/
-public class ArgumentParsingTests extends TestCase {
+public class ArgumentParsingTests extends AbstractDebugTest {
private void execute1Arg(String cmdLine) throws Exception {
execute1Arg(cmdLine, cmdLine);
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchFavoriteTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchFavoriteTests.java
index 688710202..6ddbf214e 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchFavoriteTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchFavoriteTests.java
@@ -74,12 +74,12 @@ public class LaunchFavoriteTests extends AbstractLaunchTest {
*/
@Override
protected void tearDown() throws Exception {
- super.tearDown();
// delete the configuration used during this test
ILaunchConfiguration configuration = getLaunchConfiguration();
if (configuration.exists()) {
configuration.delete();
}
+ super.tearDown();
}
/**
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java
index a15ddbdf5..14ff10660 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java
@@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
@@ -35,6 +36,7 @@ import org.eclipse.debug.internal.core.groups.GroupLaunchConfigurationDelegate;
import org.eclipse.debug.internal.core.groups.GroupLaunchElement;
import org.eclipse.debug.internal.core.groups.GroupLaunchElement.GroupElementPostLaunchAction;
import org.eclipse.debug.internal.ui.launchConfigurations.LaunchHistory;
+import org.eclipse.debug.tests.TestUtil;
import org.eclipse.debug.ui.IDebugUIConstants;
public class LaunchGroupTests extends AbstractLaunchTest {
@@ -77,7 +79,20 @@ public class LaunchGroupTests extends AbstractLaunchTest {
protected void tearDown() throws Exception {
// make sure listener is removed
getLaunchManager().removeLaunchListener(lcListener);
-
+ ILaunch[] launches = getLaunchManager().getLaunches();
+ for (ILaunch launch : launches) {
+ try {
+ if (!launch.isTerminated()) {
+ IProcess[] processes = launch.getProcesses();
+ for (IProcess process : processes) {
+ process.terminate();
+ }
+ launch.terminate();
+ }
+ } catch (Exception e) {
+ TestUtil.log(IStatus.ERROR, getName(), "Error terminating launch: " + launch, e);
+ }
+ }
super.tearDown();
}
@@ -170,8 +185,7 @@ public class LaunchGroupTests extends AbstractLaunchTest {
}
}
} catch (Exception e) {
- // uh oh
- e.printStackTrace();
+ TestUtil.log(IStatus.ERROR, getName(), e.getMessage(), e);
}
}
@@ -193,7 +207,6 @@ public class LaunchGroupTests extends AbstractLaunchTest {
assertTrue("history[2] should be Test1", history[2].contentsEqual(t1)); //$NON-NLS-1$
}
-
public void testAdopt() throws Exception {
final ILaunchConfiguration t1 = getLaunchConfiguration("Test1"); //$NON-NLS-1$
final ILaunchConfiguration grp = createLaunchGroup(DEF_GRP_NAME, createLaunchGroupElement(t1, GroupElementPostLaunchAction.NONE, null, false), createLaunchGroupElement(t1, GroupElementPostLaunchAction.NONE, null, true));
@@ -221,16 +234,19 @@ public class LaunchGroupTests extends AbstractLaunchTest {
final ILaunchConfiguration grp = createLaunchGroup(DEF_GRP_NAME, createLaunchGroupElement(t1, GroupElementPostLaunchAction.NONE, null, false));
final ILaunchConfiguration grp2 = createLaunchGroup("Group 2", createLaunchGroupElement(grp, GroupElementPostLaunchAction.NONE, null, false)); //$NON-NLS-1$
- final ILaunchConfiguration grp3 = createLaunchGroup("Group 3", createLaunchGroupElement(grp2, GroupElementPostLaunchAction.NONE, null, false), createLaunchGroupElement(t1, GroupElementPostLaunchAction.NONE, null, true)); //$NON-NLS-1$
+ final ILaunchConfiguration grp3 = createLaunchGroup("Group 3", createLaunchGroupElement(grp2, GroupElementPostLaunchAction.NONE, null, false), createLaunchGroupElement(t1, GroupElementPostLaunchAction.DELAY, 10, true)); //$NON-NLS-1$
// attention: need to do this before launching!
LaunchHistory runHistory = getRunLaunchHistory();
lcToCount = t1;
getLaunchManager().addLaunchListener(lcListener);
+
+ long startTime = System.currentTimeMillis();
grp3.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
ILaunchConfiguration[] history = runHistory.getHistory();
+ assertTrue("post launch should not be run", (System.currentTimeMillis() - startTime) < 9_000); //$NON-NLS-1$
assertEquals(4, history.length);
assertTrue("history[0] should be Group 3", history[0].contentsEqual(grp3)); //$NON-NLS-1$
assertTrue("history[1] should be Group 2", history[1].contentsEqual(grp2)); //$NON-NLS-1$
@@ -260,8 +276,10 @@ public class LaunchGroupTests extends AbstractLaunchTest {
try {
// wait some time before causing the group to continue
Thread.sleep(2000);
- attachListener.getStream().write("TestOutput"); //$NON-NLS-1$
- finished.set(true);
+ synchronized (finished) {
+ attachListener.getStream().write("TestOutput"); //$NON-NLS-1$
+ finished.set(true);
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -273,7 +291,12 @@ public class LaunchGroupTests extends AbstractLaunchTest {
// launching the group must block until the output is produced
grp.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
- getLaunchManager().removeLaunchListener(attachListener);
+
+ synchronized (finished) {
+ // if the output appeared we have to wait for the thread to finish
+ // setting state.
+ getLaunchManager().removeLaunchListener(attachListener);
+ }
assertTrue("thread did not finish", finished.get()); //$NON-NLS-1$
assertTrue("output was not awaited", (System.currentTimeMillis() - start) >= 2000); //$NON-NLS-1$
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/sourcelookup/SourceLookupFacilityTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/sourcelookup/SourceLookupFacilityTests.java
index f644e1bd8..48e9a4c4f 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/sourcelookup/SourceLookupFacilityTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/sourcelookup/SourceLookupFacilityTests.java
@@ -17,16 +17,15 @@ import java.util.LinkedHashMap;
import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupFacility;
import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupResult;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.ui.sourcelookup.ISourceLookupResult;
-import junit.framework.TestCase;
-
/**
* Tests {@link SourceLookupFacility}
*
* @since 3.9.200
*/
-public class SourceLookupFacilityTests extends TestCase {
+public class SourceLookupFacilityTests extends AbstractDebugTest {
/**
* {@link IStackFrame} to be reused
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/statushandlers/StatusHandlerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/statushandlers/StatusHandlerTests.java
index c425ac0c0..0b3d339f0 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/statushandlers/StatusHandlerTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/statushandlers/StatusHandlerTests.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.debug.tests.statushandlers;
-import junit.framework.TestCase;
-
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -19,12 +17,13 @@ import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.IStatusHandler;
import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
import org.eclipse.debug.internal.core.Preferences;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.TestsPlugin;
/**
* Tests status handlers
*/
-public class StatusHandlerTests extends TestCase {
+public class StatusHandlerTests extends AbstractDebugTest {
/**
* Status for which a handler is registered.
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/stepfilters/StepFiltersTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/stepfilters/StepFiltersTests.java
index d93ec822a..b5ef0bd49 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/stepfilters/StepFiltersTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/stepfilters/StepFiltersTests.java
@@ -7,15 +7,14 @@
*******************************************************************************/
package org.eclipse.debug.tests.stepfilters;
-import junit.framework.TestCase;
-
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.model.IStepFilter;
+import org.eclipse.debug.tests.AbstractDebugTest;
/**
* Tests step filters
*/
-public class StepFiltersTests extends TestCase {
+public class StepFiltersTests extends AbstractDebugTest {
public void testStepFitlersExtension_01() {
IStepFilter[] stepFilters = DebugPlugin.getStepFilters("com.example.lalala.model"); //$NON-NLS-1$
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/MemoryRenderingTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/MemoryRenderingTests.java
index 9db3804da..f7fc4e354 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/MemoryRenderingTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/MemoryRenderingTests.java
@@ -10,9 +10,8 @@
*******************************************************************************/
package org.eclipse.debug.tests.view.memory;
-import junit.framework.TestCase;
-
import org.eclipse.debug.core.model.IMemoryBlock;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.memory.IMemoryRenderingBindingsListener;
import org.eclipse.debug.ui.memory.IMemoryRenderingManager;
@@ -21,7 +20,7 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingType;
/**
* Tests memory rendering manager
*/
-public class MemoryRenderingTests extends TestCase {
+public class MemoryRenderingTests extends AbstractDebugTest {
public MemoryRenderingTests(String name) {
super(name);
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/CheckTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/CheckTests.java
index a4a3df63e..c4e66873a 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/CheckTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/CheckTests.java
@@ -11,12 +11,11 @@
*******************************************************************************/
package org.eclipse.debug.tests.viewer.model;
-import junit.framework.TestCase;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.swt.layout.FillLayout;
@@ -32,7 +31,7 @@ import org.eclipse.ui.PlatformUI;
*
* @since 3.6
*/
-abstract public class CheckTests extends TestCase {
+abstract public class CheckTests extends AbstractDebugTest {
Display fDisplay;
Shell fShell;
ITreeModelViewer fViewer;
@@ -47,6 +46,7 @@ abstract public class CheckTests extends TestCase {
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
fShell.setMaximized(true);
@@ -76,6 +76,7 @@ abstract public class CheckTests extends TestCase {
Thread.sleep(0);
}
}
+ super.tearDown();
}
@Override
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ChildrenUpdateTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ChildrenUpdateTests.java
index 300cbe8bf..3608d6bd8 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ChildrenUpdateTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ChildrenUpdateTests.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.debug.tests.viewer.model;
-import junit.framework.TestCase;
-
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.debug.internal.ui.viewers.model.ChildrenUpdate;
import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
@@ -23,6 +21,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationCont
import org.eclipse.debug.internal.ui.viewers.model.provisional.IStateUpdateListener;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdateListener;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -38,13 +37,10 @@ import org.eclipse.swt.widgets.Display;
*
* @since 3.3
*/
-public class ChildrenUpdateTests extends TestCase {
+public class ChildrenUpdateTests extends AbstractDebugTest {
class BogusModelContentProvider extends TreeModelContentProvider {
- /* (non-Javadoc)
- * @see org.eclipse.debug.internal.ui.viewers.model.ModelContentProvider#getViewer()
- */
@Override
protected IInternalTreeModelViewer getViewer() {
return new IInternalTreeModelViewer(){
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ColumnPresentationTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ColumnPresentationTests.java
index 9fed7b530..672fa36f5 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ColumnPresentationTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ColumnPresentationTests.java
@@ -13,14 +13,13 @@ package org.eclipse.debug.tests.viewer.model;
import java.util.Arrays;
-import junit.framework.TestCase;
-
import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation2;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
import org.eclipse.debug.internal.ui.viewers.model.provisional.PresentationContext;
import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.TreePath;
@@ -38,7 +37,7 @@ import org.eclipse.ui.XMLMemento;
/**
* Tests to verify that the viewer properly handles initial columns width.
*/
-public class ColumnPresentationTests extends TestCase implements ITestModelUpdatesListenerConstants {
+public class ColumnPresentationTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
private Display fDisplay;
private Shell fShell;
private TreeModelViewer fViewer;
@@ -49,20 +48,16 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat
super(name);
}
- /**
- * @throws java.lang.Exception
- */
@Override
protected void setUp() throws Exception {
+ super.setUp();
createViewer();
}
- /**
- * @throws java.lang.Exception
- */
@Override
protected void tearDown() throws Exception {
destroyViewer();
+ super.tearDown();
}
void createViewer() {
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java
index 7275130a1..016df79fe 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java
@@ -15,8 +15,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import junit.framework.TestCase;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ICheckUpdate;
@@ -26,6 +24,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.swt.layout.FillLayout;
@@ -39,7 +38,7 @@ import org.eclipse.ui.PlatformUI;
*
* @since 3.6
*/
-abstract public class ContentTests extends TestCase implements ITestModelUpdatesListenerConstants {
+abstract public class ContentTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
Display fDisplay;
Shell fShell;
@@ -55,6 +54,7 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
fShell.setMaximized(true);
@@ -84,6 +84,7 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates
Thread.sleep(0);
}
}
+ super.tearDown();
}
@Override
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/DeltaTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/DeltaTests.java
index 97a577af1..43b150bf2 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/DeltaTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/DeltaTests.java
@@ -14,13 +14,12 @@ package org.eclipse.debug.tests.viewer.model;
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ITreeSelection;
@@ -34,7 +33,7 @@ import org.eclipse.ui.PlatformUI;
* Tests to verify that the viewer property retrieves and processes the
* model deltas generated by the test model.
*/
-abstract public class DeltaTests extends TestCase implements ITestModelUpdatesListenerConstants {
+abstract public class DeltaTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
Display fDisplay;
Shell fShell;
ITreeModelViewer fViewer;
@@ -49,6 +48,7 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
fShell.setMaximized(true);
@@ -79,6 +79,7 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi
Thread.sleep(0);
}
}
+ super.tearDown();
}
@Override
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java
index 4659ec17a..bd4a39efe 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java
@@ -13,14 +13,13 @@ package org.eclipse.debug.tests.viewer.model;
import java.util.regex.Pattern;
-import junit.framework.TestCase;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewerFilter;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.viewers.TreePath;
@@ -38,7 +37,7 @@ import org.eclipse.ui.PlatformUI;
*
* @since 3.8
*/
-abstract public class FilterTests extends TestCase implements ITestModelUpdatesListenerConstants {
+abstract public class FilterTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
Display fDisplay;
Shell fShell;
@@ -54,6 +53,7 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
fShell.setMaximized(true);
@@ -83,6 +83,7 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL
Thread.sleep(0);
}
}
+ super.tearDown();
}
@Override
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTransformTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTransformTests.java
index dc52f8b2f..a70173c62 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTransformTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTransformTests.java
@@ -10,16 +10,15 @@
*******************************************************************************/
package org.eclipse.debug.tests.viewer.model;
-import junit.framework.TestCase;
-
import org.eclipse.debug.internal.ui.viewers.model.FilterTransform;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.jface.viewers.TreePath;
/**
* Tests the virtual viewer's filter transform
* @since 3.3
*/
-public class FilterTransformTests extends TestCase {
+public class FilterTransformTests extends AbstractDebugTest {
public Object root;
public Object element0;
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/JFaceViewerTopIndexTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/JFaceViewerTopIndexTests.java
index cc557cb60..1f14448eb 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/JFaceViewerTopIndexTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/JFaceViewerTopIndexTests.java
@@ -13,8 +13,6 @@
*******************************************************************************/
package org.eclipse.debug.tests.viewer.model;
-import junit.framework.TestCase;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
@@ -23,6 +21,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDeltaVisito
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.PresentationContext;
import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.swt.SWT;
@@ -34,7 +33,7 @@ import org.eclipse.ui.PlatformUI;
/**
* @since 3.6
*/
-public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpdatesListenerConstants {
+public class JFaceViewerTopIndexTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
Display fDisplay;
Shell fShell;
@@ -50,6 +49,7 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
fShell.setSize(300, 80);
@@ -77,6 +77,7 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda
Thread.sleep(0);
}
}
+ super.tearDown();
}
@Override
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/LazyTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/LazyTests.java
index a19ae733a..97c7c7e23 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/LazyTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/LazyTests.java
@@ -11,12 +11,11 @@
*******************************************************************************/
package org.eclipse.debug.tests.viewer.model;
-import junit.framework.TestCase;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreePath;
@@ -32,7 +31,7 @@ import org.eclipse.ui.PlatformUI;
*
* @since 3.6
*/
-abstract public class LazyTests extends TestCase implements ITestModelUpdatesListenerConstants {
+abstract public class LazyTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
Display fDisplay;
Shell fShell;
@@ -48,6 +47,7 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
fShell.setMaximized(true);
@@ -76,6 +76,7 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis
Thread.sleep(0);
}
}
+ super.tearDown();
}
@Override
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PerformanceTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PerformanceTests.java
index 6193f56ae..d38581ffd 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PerformanceTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PerformanceTests.java
@@ -11,13 +11,12 @@
*******************************************************************************/
package org.eclipse.debug.tests.viewer.model;
-import junit.framework.TestCase;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.viewers.TreeSelection;
@@ -33,7 +32,7 @@ import org.eclipse.ui.PlatformUI;
/**
* Tests to measure the performance of the viewer updates.
*/
-abstract public class PerformanceTests extends TestCase implements ITestModelUpdatesListenerConstants {
+abstract public class PerformanceTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
Display fDisplay;
Shell fShell;
ITreeModelViewer fViewer;
@@ -48,6 +47,7 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
fShell.setMaximized(true);
@@ -78,6 +78,7 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd
Thread.sleep(0);
}
}
+ super.tearDown();
}
@Override
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PopupTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PopupTests.java
index 973a5a883..08503024e 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PopupTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PopupTests.java
@@ -16,12 +16,11 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ITreeSelection;
@@ -39,7 +38,7 @@ import org.eclipse.ui.PlatformUI;
*
* @since 3.6
*/
-abstract public class PopupTests extends TestCase implements ITestModelUpdatesListenerConstants {
+abstract public class PopupTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
Display fDisplay;
Shell fShell;
ITreeModelViewer fViewer;
@@ -54,6 +53,7 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
fShell.setMaximized(true);
@@ -88,6 +88,7 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi
Thread.sleep(0);
}
}
+ super.tearDown();
}
/**
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PresentationContextTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PresentationContextTests.java
index d89a54f03..6c47190ba 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PresentationContextTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PresentationContextTests.java
@@ -11,10 +11,9 @@
*******************************************************************************/
package org.eclipse.debug.tests.viewer.model;
-import junit.framework.TestCase;
-
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.debug.internal.ui.viewers.model.provisional.PresentationContext;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.ui.IPersistableElement;
import org.eclipse.ui.XMLMemento;
@@ -23,7 +22,7 @@ import org.eclipse.ui.XMLMemento;
*
* @since 3.4
*/
-public class PresentationContextTests extends TestCase {
+public class PresentationContextTests extends AbstractDebugTest {
public PresentationContextTests(String name) {
super(name);
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/SelectionTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/SelectionTests.java
index f41b285c9..8cdc499c6 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/SelectionTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/SelectionTests.java
@@ -14,13 +14,12 @@ package org.eclipse.debug.tests.viewer.model;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicy;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -34,7 +33,7 @@ import org.eclipse.ui.PlatformUI;
/**
* Tests to verify that the viewer properly handles selection changes.
*/
-abstract public class SelectionTests extends TestCase implements ITestModelUpdatesListenerConstants {
+abstract public class SelectionTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
Display fDisplay;
Shell fShell;
ITreeModelViewer fViewer;
@@ -49,6 +48,7 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
fShell.setMaximized(true);
@@ -78,6 +78,7 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat
Thread.sleep(0);
}
}
+ super.tearDown();
}
private static class SelectionListener implements ISelectionChangedListener {
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/StateTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/StateTests.java
index 0e60a1d25..19a7dff88 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/StateTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/StateTests.java
@@ -15,13 +15,12 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.viewers.TreePath;
@@ -37,7 +36,7 @@ import org.eclipse.ui.PlatformUI;
*
* @since 3.6
*/
-abstract public class StateTests extends TestCase implements ITestModelUpdatesListenerConstants {
+abstract public class StateTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
Display fDisplay;
Shell fShell;
ITreeModelViewer fViewer;
@@ -52,6 +51,7 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
@@ -82,6 +82,7 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi
Thread.sleep(0);
}
}
+ super.tearDown();
}
@Override
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/UpdateTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/UpdateTests.java
index 5aa42493b..48e3c71f4 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/UpdateTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/UpdateTests.java
@@ -16,8 +16,6 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdate;
@@ -26,6 +24,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDeltaVisito
import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.swt.layout.FillLayout;
@@ -40,7 +39,7 @@ import org.junit.Assert;
*
* @since 3.6
*/
-abstract public class UpdateTests extends TestCase implements ITestModelUpdatesListenerConstants {
+abstract public class UpdateTests extends AbstractDebugTest implements ITestModelUpdatesListenerConstants {
Display fDisplay;
Shell fShell;
ITreeModelViewer fViewer;
@@ -55,6 +54,7 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay);
fShell.setMaximized(true);
@@ -84,6 +84,7 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL
Thread.sleep(0);
}
}
+ super.tearDown();
}
@Override
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/VirtualViewerLazyModeTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/VirtualViewerLazyModeTests.java
index a695acf5d..ac85112e6 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/VirtualViewerLazyModeTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/VirtualViewerLazyModeTests.java
@@ -11,11 +11,10 @@
*******************************************************************************/
package org.eclipse.debug.tests.viewer.model;
-import junit.framework.TestCase;
-
import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
import org.eclipse.debug.internal.ui.viewers.model.provisional.PresentationContext;
import org.eclipse.debug.internal.ui.viewers.model.provisional.VirtualTreeModelViewer;
+import org.eclipse.debug.tests.AbstractDebugTest;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Display;
@@ -29,7 +28,7 @@ import org.eclipse.ui.PlatformUI;
*
* @since 3.6
*/
-public class VirtualViewerLazyModeTests extends TestCase {
+public class VirtualViewerLazyModeTests extends AbstractDebugTest {
Display fDisplay;
Shell fShell;
ITreeModelViewer fViewer;
@@ -44,6 +43,7 @@ public class VirtualViewerLazyModeTests extends TestCase {
*/
@Override
protected void setUp() throws Exception {
+ super.setUp();
fDisplay = PlatformUI.getWorkbench().getDisplay();
fShell = new Shell(fDisplay/*, SWT.ON_TOP | SWT.SHELL_TRIM*/);
fShell.setMaximized(true);
@@ -80,6 +80,7 @@ public class VirtualViewerLazyModeTests extends TestCase {
Thread.sleep(0);
}
}
+ super.tearDown();
}
public void test() {
diff --git a/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs
index 1d1c1c0e3..ab2cbd1a8 100644
--- a/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs
@@ -91,7 +91,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
@@ -107,6 +107,9 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
diff --git a/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.debug.ui/META-INF/MANIFEST.MF
index a55ecbdba..96a9a5ea2 100644
--- a/org.eclipse.debug.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.debug.ui; singleton:=true
-Bundle-Version: 3.12.0.qualifier
+Bundle-Version: 3.12.100.qualifier
Bundle-Activator: org.eclipse.debug.internal.ui.DebugUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.debug.ui/pom.xml b/org.eclipse.debug.ui/pom.xml
index fd2fa7047..789f8620e 100644
--- a/org.eclipse.debug.ui/pom.xml
+++ b/org.eclipse.debug.ui/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2016 Eclipse Foundation and others.
+ Copyright (c) 2012, 2017 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.debug</artifactId>
<groupId>eclipse.platform.debug</groupId>
- <version>4.7.1-SNAPSHOT</version>
+ <version>4.8.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.debug</groupId>
<artifactId>org.eclipse.debug.ui</artifactId>
- <version>3.12.0-SNAPSHOT</version>
+ <version>3.12.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<code.ignoredWarnings>-warn:+resource,-deprecation,unavoidableGenericProblems</code.ignoredWarnings>
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ColorManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ColorManager.java
index c0ab0687c..330000891 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ColorManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ColorManager.java
@@ -35,7 +35,7 @@ public class ColorManager {
return fgColorManager;
}
- protected Map<RGB, Color> fColorTable = new HashMap<RGB, Color>(10);
+ protected Map<RGB, Color> fColorTable = new HashMap<>(10);
public Color getColor(RGB rgb) {
Color color= fColorTable.get(rgb);
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 a8ae9ca77..62affedc8 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
@@ -215,7 +215,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
*
* @since 3.3
*/
- private Set<ISaveParticipant> fSaveParticipants = new HashSet<ISaveParticipant>();
+ private Set<ISaveParticipant> fSaveParticipants = new HashSet<>();
/**
* Theme listener.
@@ -507,7 +507,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
- Hashtable<String, String> props = new Hashtable<String, String>(2);
+ Hashtable<String, String> props = new Hashtable<>(2);
props.put(org.eclipse.osgi.service.debug.DebugOptions.LISTENER_SYMBOLICNAME, getUniqueIdentifier());
context.registerService(DebugOptionsListener.class.getName(), this, props);
ResourcesPlugin.getWorkspace().addSaveParticipant(getUniqueIdentifier(),
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 c25826f35..67b7d592b 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
@@ -61,7 +61,7 @@ public class DefaultLabelProvider implements ILabelProvider {
/**
* Maps image descriptors to images.
*/
- private Map<ImageDescriptor, Image> fImages = new HashMap<ImageDescriptor, Image>();
+ private Map<ImageDescriptor, Image> fImages = new HashMap<>();
/**
* @see ILabelProvider#getImage(Object)
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 e80176e86..beb7193f2 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
@@ -59,11 +59,11 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
* A mapping of attribute ids to their values
* @see IDebugModelPresentation#setAttribute
*/
- private HashMap<String, Object> fAttributes = new HashMap<String, Object>(3);
+ private HashMap<String, Object> fAttributes = new HashMap<>(3);
/**
* A table of label providers keyed by debug model identifiers.
*/
- private HashMap<String, IDebugModelPresentation> fLabelProviders = new HashMap<String, IDebugModelPresentation>(5);
+ private HashMap<String, IDebugModelPresentation> fLabelProviders = new HashMap<>(5);
/* (non-Javadoc)
* @see org.eclipse.debug.ui.IDebugEditorPresentation#removeAnnotations(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IThread)
@@ -328,7 +328,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
* @since 3.0
*/
public Map<String, Object> getAttributeMap() {
- return new HashMap<String, Object>(fAttributes);
+ return new HashMap<>(fAttributes);
}
/**
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 fb3cfeda1..580b284f4 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
@@ -50,12 +50,12 @@ public class InstructionPointerManager{
/**
* Set containing all instruction pointer contexts this class manages
*/
- private Set<InstructionPointerContext> fIPCSet = new HashSet<InstructionPointerContext>();
+ private Set<InstructionPointerContext> fIPCSet = new HashSet<>();
/**
* Maps ITextEditors to the set of instruction pointer contexts that are displayed in the editor
*/
- private Map<ITextEditor, Set<InstructionPointerContext>> fEditorMap = new HashMap<ITextEditor, Set<InstructionPointerContext>>();
+ private Map<ITextEditor, Set<InstructionPointerContext>> fEditorMap = new HashMap<>();
/**
* Part listener added to editors that contain annotations. Allows instruction pointer contexts to
@@ -144,7 +144,7 @@ public class InstructionPointerManager{
// Add the IPC to the set and map
Set<InstructionPointerContext> editorIPCs = fEditorMap.get(textEditor);
if (editorIPCs == null){
- editorIPCs = new HashSet<InstructionPointerContext>();
+ editorIPCs = new HashSet<>();
fEditorMap.put(textEditor, editorIPCs);
} else {
editorIPCs.remove(ipc);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchConfigurationTabExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchConfigurationTabExtension.java
index f951538ef..f6290f533 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchConfigurationTabExtension.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchConfigurationTabExtension.java
@@ -104,7 +104,7 @@ public final class LaunchConfigurationTabExtension {
*/
public Set<String> getDelegateSet() {
if(fDelegates == null) {
- fDelegates = new HashSet<String>();
+ fDelegates = new HashSet<>();
IConfigurationElement[] children = fElement.getChildren(IConfigurationElementConstants.ASSOCIATED_DELEGATE);
String id = null;
for(int i = 0; i < children.length; i++) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java
index 355fdf203..0cbd81106 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
@@ -57,7 +57,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
* A temporary mapping of attribute ids to their values
* @see IDebugModelPresentation#setAttribute
*/
- protected HashMap<String, Object> fAttributes = new HashMap<String, Object>(3);
+ protected HashMap<String, Object> fAttributes = new HashMap<>(3);
/**
* The config element that defines the extension
@@ -385,7 +385,7 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
* @since 3.0
*/
public Map<String, Object> getAttributeMap() {
- return new HashMap<String, Object>(fAttributes);
+ return new HashMap<>(fAttributes);
}
/**
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 871301813..4cbc8648d 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
@@ -47,10 +47,10 @@ public class MultipleInputDialog extends Dialog {
protected Composite panel;
- protected List<FieldSummary> fieldList = new ArrayList<FieldSummary>();
- protected List<Text> controlList = new ArrayList<Text>();
- protected List<Validator> validators = new ArrayList<Validator>();
- protected Map<Object, String> valueMap = new HashMap<Object, String>();
+ protected List<FieldSummary> fieldList = new ArrayList<>();
+ protected List<Text> controlList = new ArrayList<>();
+ protected List<Validator> validators = new ArrayList<>();
+ protected Map<Object, String> valueMap = new HashMap<>();
private String title;
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 26bf56f98..8a921aed9 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
@@ -37,7 +37,7 @@ public class VariableValueEditorManager {
* which are replaced by IVariableValueEditors as the editors
* are instantiated (editors are loaded lazily, then cached).
*/
- private Map<String, Object> fEditorMap = new HashMap<String, Object>();
+ private Map<String, Object> fEditorMap = new HashMap<>();
/**
* The singleton instance of this manager.
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 5c896783e..94dc038dd 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
@@ -175,7 +175,7 @@ public class AddToFavoritesAction extends SelectionListenerAction {
try {
List<String> list = getLaunchConfiguration().getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List<String>) null);
if (list == null) {
- list = new ArrayList<String>();
+ list = new ArrayList<>();
}
list.add(getGroup().getIdentifier());
ILaunchConfigurationWorkingCopy copy = getLaunchConfiguration().getWorkingCopy();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java
index 3359d8888..10ab2e5d4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java
@@ -67,7 +67,7 @@ public class ConfigureColumnsAction extends Action implements IUpdate {
class ColumnLabelProvider extends LabelProvider {
- private Map<ImageDescriptor, Image> fImages = new HashMap<ImageDescriptor, Image>();
+ private Map<ImageDescriptor, Image> fImages = new HashMap<>();
@Override
public Image getImage(Object element) {
@@ -129,7 +129,7 @@ public class ConfigureColumnsAction extends Action implements IUpdate {
ActionMessages.ConfigureColumnsAction_1);
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONFIGURE_COLUMNS_DIALOG);
String[] visibleColumns = fViewer.getVisibleColumns();
- List<String> initialSelection = new ArrayList<String>(visibleColumns.length);
+ List<String> initialSelection = new ArrayList<>(visibleColumns.length);
for (int i = 0; i < visibleColumns.length; i++) {
initialSelection.add(visibleColumns[i]);
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchShortcutAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchShortcutAction.java
index 58c975542..1f2d34370 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchShortcutAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/LaunchShortcutAction.java
@@ -97,7 +97,7 @@ public class LaunchShortcutAction extends Action {
if(!types.isEmpty()) {
LaunchingResourceManager lrm = DebugUIPlugin.getDefault().getLaunchingResourceManager();
IStructuredSelection selection = SelectedResourceManager.getDefault().getCurrentSelection();
- ArrayList<LaunchShortcutExtension> shortcuts = new ArrayList<LaunchShortcutExtension>();
+ ArrayList<LaunchShortcutExtension> shortcuts = new ArrayList<>();
shortcuts.add(fShortcut);
IResource resource = SelectedResourceManager.getDefault().getSelectedResource();
if(resource == null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java
index 7580f42c1..befa450fc 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java
@@ -72,7 +72,7 @@ public class RelaunchActionDelegate extends AbstractDebugActionDelegate {
if (s.isEmpty()) {
return s;
}
- Set<ILaunch> dups = new LinkedHashSet<ILaunch>();
+ Set<ILaunch> dups = new LinkedHashSet<>();
Iterator<?> iterator = s.iterator();
while (iterator.hasNext()) {
Object object = iterator.next();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllTerminatedAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllTerminatedAction.java
index 67b35642f..d77d2f8c2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllTerminatedAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllTerminatedAction.java
@@ -43,7 +43,7 @@ public class RemoveAllTerminatedAction extends AbstractRemoveAllActionDelegate i
}
public static void removeTerminatedLaunches(ILaunch[] elements) {
- List<ILaunch> removed = new ArrayList<ILaunch>();
+ List<ILaunch> removed = new ArrayList<>();
for (int i = 0; i < elements.length; i++) {
ILaunch launch = elements[i];
if (launch.isTerminated()) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SelectAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SelectAllAction.java
index f1b6c19e7..44f87c6d0 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SelectAllAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SelectAllAction.java
@@ -65,7 +65,7 @@ public abstract class SelectAllAction extends AbstractRemoveAllActionDelegate {
}
Viewer viewer = ((IDebugView) getView()).getViewer();
if (viewer instanceof TreeViewer) {
- ArrayList<TreeItem> allVisible= new ArrayList<TreeItem>();
+ ArrayList<TreeItem> allVisible= new ArrayList<>();
Tree tree= ((TreeViewer) viewer).getTree();
collectExpandedAndVisible(tree.getItems(), allVisible);
tree.setSelection(allVisible.toArray(new TreeItem[allVisible.size()]));
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 ec665cd6a..c422d04df 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
@@ -80,7 +80,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM
*/
public static String DEFAULT_TOGGLE_TARGET_ID = "default"; //$NON-NLS-1$
- private static Set<String> DEFAULT_TOGGLE_TARGET_ID_SET = new TreeSet<String>();
+ private static Set<String> DEFAULT_TOGGLE_TARGET_ID_SET = new TreeSet<>();
static {
DEFAULT_TOGGLE_TARGET_ID_SET.add(DEFAULT_TOGGLE_TARGET_ID);
}
@@ -442,7 +442,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM
* 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<String, IToggleBreakpointsTargetFactory>();
+ private Map<String, IToggleBreakpointsTargetFactory> fFactoriesByTargetID = new HashMap<>();
/**
* List of listeners to changes in the preferred toggle targets list.
@@ -453,7 +453,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM
* Initializes the collection of known factories from extension point contributions.
*/
private void initializeFactories() {
- fKnownFactories = new LinkedHashMap<String, IToggleBreakpointsTargetFactory>();
+ 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();
@@ -492,7 +492,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM
if (fKnownFactories == null) {
initializeFactories();
}
- Set<IToggleBreakpointsTargetFactory> set = new HashSet<IToggleBreakpointsTargetFactory>();
+ Set<IToggleBreakpointsTargetFactory> set = new HashSet<>();
for (Entry<String, IToggleBreakpointsTargetFactory> entry : fKnownFactories.entrySet()) {
IToggleBreakpointsTargetFactory factory = entry.getValue();
if (factory instanceof ToggleTargetFactory &&
@@ -516,7 +516,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM
* @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<String>();
+ Set<String> idsForSelection = new TreeSet<>();
for (IToggleBreakpointsTargetFactory factory : factoriesToQuery) {
for(String targetID : factory.getToggleTargets(part, selection)) {
fFactoriesByTargetID.put(targetID, factory);
@@ -618,7 +618,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM
* @see #storePreferredTargets()
*/
private void loadPreferredTargets() {
- fPreferredTargets = new HashMap<Set<String>, String>();
+ fPreferredTargets = new HashMap<>();
String preferenceValue = Platform.getPreferencesService().getString(
DebugUIPlugin.getUniqueIdentifier(),
PREF_TARGETS,
@@ -632,7 +632,7 @@ public class ToggleBreakpointsTargetManager implements IToggleBreakpointsTargetM
String token = entryTokenizer.nextToken();
int valueStart = token.indexOf(':');
StringTokenizer keyTokenizer = new StringTokenizer(token.substring(0,valueStart),","); //$NON-NLS-1$
- Set<String> keys = new TreeSet<String>();
+ Set<String> keys = new TreeSet<>();
while (keyTokenizer.hasMoreTokens()){
keys.add(keyTokenizer.nextToken());
}
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 975c9880d..c2133acc8 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
@@ -92,12 +92,12 @@ public class CopyBreakpointsActionDelegate extends VirtualCopyToClipboardActionD
if (fStamp == LocalSelectionTransfer.getTransfer().getSelectionSetTime()) {
ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
if (selection instanceof IStructuredSelection) {
- Set<IBreakpoint> removed = new HashSet<IBreakpoint>();
+ Set<IBreakpoint> removed = new HashSet<>();
for (int i = 0; i < breakpoints.length; i++) {
removed.add(breakpoints[i]);
}
boolean modified = false;
- List<Object> remain = new ArrayList<Object>();
+ List<Object> remain = new ArrayList<>();
IStructuredSelection ss = (IStructuredSelection) selection;
Iterator<?> iterator = ss.iterator();
while (iterator.hasNext()) {
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 681249d75..44876edb6 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
@@ -132,7 +132,7 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl
}
public List<IAction> getActions(int accel) {
- List<IAction> actions = new ArrayList<IAction>();
+ List<IAction> actions = new ArrayList<>();
IBreakpointOrganizer[] organizers = BreakpointOrganizerManager.getDefault().getOrganizers();
for (int i = 0; i < organizers.length; i++) {
IBreakpointOrganizer organizer = organizers[i];
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 acc4754b7..f3b604566 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
@@ -68,7 +68,7 @@ public class GroupBreakpointsByDialog extends TrayDialog {
private TreeViewer fSelectedViewer;
private SelectedOrganizerProvider fSelectedOrganizersProvider= new SelectedOrganizerProvider();
- private List<Object> fResult = new ArrayList<Object>();
+ private List<Object> fResult = new ArrayList<>();
private Button fAddButton;
private Button fRemoveButton;
@@ -411,7 +411,7 @@ public class GroupBreakpointsByDialog extends TrayDialog {
* that are available but not currently selected.
*/
private class AvailableOrganizersProvider implements IStructuredContentProvider {
- protected List<IBreakpointOrganizer> availableOrganziers = new ArrayList<IBreakpointOrganizer>();
+ protected List<IBreakpointOrganizer> availableOrganziers = new ArrayList<>();
public void addAvailable(IBreakpointOrganizer organizer) {
availableOrganziers.add(organizer);
@@ -437,7 +437,7 @@ public class GroupBreakpointsByDialog extends TrayDialog {
* appear in the breakpoints view.
*/
private class SelectedOrganizerProvider implements ITreeContentProvider {
- protected List<Object> selectedOrganizers = new ArrayList<Object>();
+ protected List<Object> selectedOrganizers = new ArrayList<>();
public void addSelected(IBreakpointOrganizer organizer) {
selectedOrganizers.add(organizer);
@@ -501,7 +501,7 @@ public class GroupBreakpointsByDialog extends TrayDialog {
* Label provider which provides text and images for breakpoint container factories
*/
private class BreakpointOrganzierLabelProvider extends LabelProvider {
- private HashMap<ImageDescriptor, Image> fImageCache = new HashMap<ImageDescriptor, Image>();
+ private HashMap<ImageDescriptor, Image> fImageCache = new HashMap<>();
@Override
public String getText(Object element) {
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 6a3bfa55b..81cafc354 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
@@ -69,7 +69,7 @@ public class RemoveFromWorkingSetAction extends BreakpointSelectionAction {
* @return
*/
protected BreakpointSetElement[] getRemovableBreakpoints(IStructuredSelection selection) {
- List<BreakpointSetElement> res = new ArrayList<BreakpointSetElement>();
+ List<BreakpointSetElement> res = new ArrayList<>();
if (selection instanceof ITreeSelection) {
ITreeSelection tSel = (ITreeSelection)selection;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SelectBreakpointWorkingsetDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SelectBreakpointWorkingsetDialog.java
index 6680193d7..c857d3fc9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SelectBreakpointWorkingsetDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/SelectBreakpointWorkingsetDialog.java
@@ -68,7 +68,7 @@ public class SelectBreakpointWorkingsetDialog extends AbstractDebugCheckboxSelec
*/
private IWorkingSet[] getBreakpointWorkingSets() {
IWorkingSet[] ws = PlatformUI.getWorkbench().getWorkingSetManager().getAllWorkingSets();
- ArrayList<IWorkingSet> list = new ArrayList<IWorkingSet>();
+ ArrayList<IWorkingSet> list = new ArrayList<>();
for(int i = 0; i < ws.length; i++) {
if(IDebugUIConstants.BREAKPOINT_WORKINGSET_ID.equals(ws[i].getId())) {
list.add(ws[i]);
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 70b7fa67f..167077731 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
@@ -60,8 +60,8 @@ public class RemoveBreakpointAction extends AbstractSelectionActionDelegate {
IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) {
- ArrayList<IBreakpoint> breakpointsToDelete = new ArrayList<IBreakpoint>();
- ArrayList<IWorkingSet> groupsToDelete = new ArrayList<IWorkingSet>();
+ ArrayList<IBreakpoint> breakpointsToDelete = new ArrayList<>();
+ ArrayList<IWorkingSet> groupsToDelete = new ArrayList<>();
boolean deleteAll = false;
boolean deleteContainer = false;
boolean prompted = false;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowSupportedBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowSupportedBreakpointsAction.java
index d4ba34a0e..a981d0df4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowSupportedBreakpointsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowSupportedBreakpointsAction.java
@@ -58,7 +58,7 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement
/**
* The list of identifiers for the current state
*/
- private List<IDebugTarget> fDebugTargets= new ArrayList<IDebugTarget>(2);
+ private List<IDebugTarget> fDebugTargets= new ArrayList<>(2);
/**
* A viewer filter that selects breakpoints that have
@@ -146,7 +146,7 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement
}
if (debugTargets.size() == fDebugTargets.size()) {
- List<IDebugTarget> copy= new ArrayList<IDebugTarget>(debugTargets.size());
+ List<IDebugTarget> copy= new ArrayList<>(debugTargets.size());
for (IDebugTarget target : fDebugTargets) {
Iterator<IDebugTarget> newDebugTargets= debugTargets.iterator();
while (newDebugTargets.hasNext()) {
@@ -186,7 +186,7 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement
}
protected List<IDebugTarget> getDebugTargets(IStructuredSelection ss) {
- List<IDebugTarget> debugTargets= new ArrayList<IDebugTarget>(2);
+ List<IDebugTarget> debugTargets= new ArrayList<>(2);
Iterator<?> i= ss.iterator();
while (i.hasNext()) {
Object next= i.next();
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 25c40ec5c..1b2e92367 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
@@ -33,7 +33,7 @@ public class RemoveExpressionAction extends AbstractSelectionActionDelegate {
protected IExpression[] getExpressions() {
TreeSelection selection = (TreeSelection) getSelection();
TreePath[] paths = selection.getPaths();
- List<IExpression> expressions = new ArrayList<IExpression>();
+ List<IExpression> expressions = new ArrayList<>();
for (int i = paths.length-1; i >=0; i--) {
TreePath path = paths[i];
Object segment = path.getFirstSegment();
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 0f61d579a..bf50966bd 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
@@ -61,7 +61,7 @@ public abstract class WatchExpressionAction implements IViewActionDelegate {
}
protected IWatchExpression[] getSelectedExpressions() {
- List<Object> list = new LinkedList<Object>();
+ List<Object> list = new LinkedList<>();
IStructuredSelection currentSelection = getCurrentSelection();
if (currentSelection == null) {
return EMPTY_EXPRESSION_ARRAY;
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 58d1d7b2d..95da0c7f4 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
@@ -33,7 +33,7 @@ import org.eclipse.ui.model.IWorkbenchAdapter;
*/
public class OtherBreakpointCategory extends PlatformObject implements IWorkbenchAdapter {
- private static Map<IBreakpointOrganizer, IAdaptable[]> fOthers = new HashMap<IBreakpointOrganizer, IAdaptable[]>();
+ private static Map<IBreakpointOrganizer, IAdaptable[]> fOthers = new HashMap<>();
private IBreakpointOrganizer fOrganizer;
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 f2799ff61..3ac0ecd2b 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
@@ -39,7 +39,7 @@ public class DebugCommandService implements IDebugContextListener {
/**
* Maps command types to actions to update
*/
- private Map<Class<?>, List<IEnabledTarget>> fCommandUpdates = new HashMap<Class<?>, List<IEnabledTarget>>();
+ private Map<Class<?>, List<IEnabledTarget>> fCommandUpdates = new HashMap<>();
/**
* Window this service is for.
@@ -54,7 +54,7 @@ public class DebugCommandService implements IDebugContextListener {
/**
* Service per window
*/
- private static Map<IWorkbenchWindow, DebugCommandService> fgServices = new HashMap<IWorkbenchWindow, DebugCommandService>();
+ private static Map<IWorkbenchWindow, DebugCommandService> fgServices = new HashMap<>();
/**
* Returns the service for a window.
@@ -117,7 +117,7 @@ public class DebugCommandService implements IDebugContextListener {
Job.getJobManager().cancel(commandType);
List<IEnabledTarget> actions = fCommandUpdates.get(commandType);
if (actions == null) {
- actions = new ArrayList<IEnabledTarget>();
+ actions = new ArrayList<>();
fCommandUpdates.put(commandType, actions);
}
actions.add(action);
@@ -144,7 +144,7 @@ public class DebugCommandService implements IDebugContextListener {
Map<Class<?>, List<IEnabledTarget>> commands = null;
synchronized (fCommandUpdates) {
commands = fCommandUpdates;
- fCommandUpdates = new HashMap<Class<?>, List<IEnabledTarget>>(commands.size());
+ fCommandUpdates = new HashMap<>(commands.size());
}
if (context instanceof IStructuredSelection && !context.isEmpty()) {
Object[] elements = ((IStructuredSelection)context).toArray();
@@ -243,7 +243,7 @@ public class DebugCommandService implements IDebugContextListener {
* @return map of command handlers to associated elements or <code>null</code>
*/
private Map<IDebugCommandHandler, List<Object>> collate(Object[] elements, Class<?> handlerType) {
- Map<IDebugCommandHandler, List<Object>> map = new HashMap<IDebugCommandHandler, List<Object>>();
+ Map<IDebugCommandHandler, List<Object>> map = new HashMap<>();
for (int i = 0; i < elements.length; i++) {
Object element = elements[i];
IDebugCommandHandler handler = getHandler(element, handlerType);
@@ -252,7 +252,7 @@ public class DebugCommandService implements IDebugContextListener {
} else {
List<Object> list = map.get(handler);
if (list == null) {
- list = new ArrayList<Object>();
+ list = new ArrayList<>();
map.put(handler, list);
}
list.add(element);
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 b0d0713bf..488c31653 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
@@ -61,7 +61,7 @@ public class TerminateAndRelaunchAction extends DebugCommandAction {
ISelection context = super.getContext();
if (context instanceof IStructuredSelection && !context.isEmpty()) {
IStructuredSelection ss = (IStructuredSelection)context;
- Set<ILaunch> launches = new HashSet<ILaunch>(ss.size());
+ Set<ILaunch> launches = new HashSet<>(ss.size());
for (Iterator<Object> itr = ss.iterator(); itr.hasNext();) {
ILaunch launch = DebugUIPlugin.getLaunch(itr.next());
if (launch != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java
index b56924351..0758f9b28 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java
@@ -93,12 +93,12 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo
* The map of ToolBars that have mouse tracker listeners associated with them:
* stored as Map<IWorkbenchWindow, ToolBar>
*/
- private HashMap<IWorkbenchWindow, ToolBar> fToolbars = new HashMap<IWorkbenchWindow, ToolBar>();
+ private HashMap<IWorkbenchWindow, ToolBar> fToolbars = new HashMap<>();
/**
* the map of current labels
*/
- private HashMap<ILaunchGroup, String> fCurrentLabels = new HashMap<ILaunchGroup, String>();
+ private HashMap<ILaunchGroup, String> fCurrentLabels = new HashMap<>();
/**
* The selection has changed and we need to update the labels
@@ -108,19 +108,19 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo
/**
* Set of windows that have been opened and that we have registered selection listeners with
*/
- private HashSet<IWorkbenchWindow> fWindows = new HashSet<IWorkbenchWindow>();
+ private HashSet<IWorkbenchWindow> fWindows = new HashSet<>();
/**
* Cache of IResource -> ILaunchConfiguration[] used during a tooltip update job.
* The cache is cleared after each tooltip update job is complete.
*/
- private HashMap<IResource, ILaunchConfiguration[]> fConfigCache = new HashMap<IResource, ILaunchConfiguration[]>();
+ private HashMap<IResource, ILaunchConfiguration[]> fConfigCache = new HashMap<>();
/**
* Cache of IResource -> LaunchShortcutExtension used during a tooltip update job.
* The cache is cleared after each tooltip update job is complete.
*/
- private HashMap<IResource, List<LaunchShortcutExtension>> fExtCache = new HashMap<IResource, List<LaunchShortcutExtension>>();
+ private HashMap<IResource, List<LaunchShortcutExtension>> fExtCache = new HashMap<>();
/**
* Constant denoting the empty string;
@@ -379,7 +379,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo
* @since 3.4
*/
protected List<LaunchShortcutExtension> pruneShortcuts(List<LaunchShortcutExtension> shortcuts, IResource resource, String mode) {
- List<LaunchShortcutExtension> list = new ArrayList<LaunchShortcutExtension>(shortcuts);
+ List<LaunchShortcutExtension> list = new ArrayList<>(shortcuts);
if(resource == null) {
LaunchShortcutExtension ext = null;
for (ListIterator<LaunchShortcutExtension> iter = list.listIterator(); iter.hasNext();) {
@@ -406,7 +406,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo
*/
public IResource getLaunchableResource(List<LaunchShortcutExtension> shortcuts, IStructuredSelection selection) {
if(selection != null && !selection.isEmpty()) {
- ArrayList<IResource> resources = new ArrayList<IResource>();
+ ArrayList<IResource> resources = new ArrayList<>();
IResource resource = null;
Object o = selection.getFirstElement();
for (LaunchShortcutExtension ext : shortcuts) {
@@ -437,9 +437,9 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo
* @since 3.4
*/
public List<LaunchShortcutExtension> getShortcutsForSelection(IStructuredSelection selection, String mode) {
- ArrayList<LaunchShortcutExtension> list = new ArrayList<LaunchShortcutExtension>();
+ ArrayList<LaunchShortcutExtension> list = new ArrayList<>();
List<LaunchShortcutExtension> sc = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchShortcuts();
- List<IEditorInput> ctxt = new ArrayList<IEditorInput>();
+ List<IEditorInput> ctxt = new ArrayList<>();
// work around to bug in Structured Selection that returns actual underlying array in selection
// @see bug 211646
ctxt.addAll(selection.toList());
@@ -475,7 +475,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo
* @since 3.4
*/
public List<ILaunchConfiguration> getParticipatingLaunchConfigurations(IStructuredSelection selection, IResource resource, List<LaunchShortcutExtension> shortcuts, String mode) {
- List<ILaunchConfiguration> configs = new ArrayList<ILaunchConfiguration>();
+ List<ILaunchConfiguration> configs = new ArrayList<>();
int voteDefault = 0;
if(selection != null) {
Object o = selection.getFirstElement();
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 61c2e9a7c..0ba312b73 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
@@ -34,7 +34,7 @@ import org.eclipse.ui.services.IEvaluationService;
public class DebugContextManager implements IDebugContextManager {
private static DebugContextManager fgDefault;
- private Map<IWorkbenchWindow, DebugWindowContextService> fServices = new HashMap<IWorkbenchWindow, DebugWindowContextService>();
+ private Map<IWorkbenchWindow, DebugWindowContextService> fServices = new HashMap<>();
private ListenerList<IDebugContextListener> fGlobalListeners = new ListenerList<>();
/**
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 57f07a8e7..0b990b4f3 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
@@ -55,7 +55,7 @@ public class DebugContextSourceProvider extends AbstractSourceProvider implement
@Override
public void debugContextChanged(DebugContextEvent event) {
- final Map<String, ISelection> values = new HashMap<String, ISelection>(1);
+ final Map<String, ISelection> values = new HashMap<>(1);
values.put(IDebugUIConstants.DEBUG_CONTEXT_SOURCE_NAME, event.getContext());
// make sure fireSourceChanged is called on the UI thread
if (Display.getCurrent() == null) {
@@ -83,7 +83,7 @@ public class DebugContextSourceProvider extends AbstractSourceProvider implement
@Override
public Map getCurrentState() {
- Map<String, ISelection> currentState = new HashMap<String, ISelection>(1);
+ Map<String, ISelection> currentState = new HashMap<>(1);
currentState.put(IDebugUIConstants.DEBUG_CONTEXT_SOURCE_NAME, fDebugContextService.getActiveContext());
return currentState;
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugModelContextBindingManager.java
index 264bad35e..abf7ce7f1 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
@@ -68,33 +68,33 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
* Map of debug model identifier to associated contexts as defined
* by <code>debugModelContextBindings</code> extensions.
*/
- private Map<String, List<String>> fModelToContextIds = new HashMap<String, List<String>>();
+ private Map<String, List<String>> fModelToContextIds = new HashMap<>();
/**
* Map of launch objects to enabled model ids
*/
- private Map<ILaunch, Set<String>> fLaunchToModelIds = new HashMap<ILaunch, Set<String>>();
+ private Map<ILaunch, Set<String>> fLaunchToModelIds = new HashMap<>();
/**
* Map of launch objects to context activations
*/
- private Map<ILaunch, List<IContextActivation>> fLanuchToContextActivations = new HashMap<ILaunch, List<IContextActivation>>();
+ private Map<ILaunch, List<IContextActivation>> fLanuchToContextActivations = new HashMap<>();
/**
* A list of activity pattern bindings for debug models.
*/
- private List<IActivityPatternBinding> fModelPatternBindings = new ArrayList<IActivityPatternBinding>();
+ private List<IActivityPatternBinding> fModelPatternBindings = new ArrayList<>();
/**
* Map of debug model ids to associated activity ids.
*/
- private Map<String, Set<String>> fModelToActivities = new HashMap<String, Set<String>>();
+ private Map<String, Set<String>> fModelToActivities = new HashMap<>();
/**
* A set of debug model ids for which activities have been enabled.
* Cleared when enabled activities change.
*/
- private Set<String> fModelsEnabledForActivities = new HashSet<String>();
+ private Set<String> fModelsEnabledForActivities = new HashSet<>();
// extension point
public static final String ID_DEBUG_MODEL_CONTEXT_BINDINGS= "debugModelContextBindings"; //$NON-NLS-1$
@@ -145,7 +145,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
if (modelIdentifier != null && contextId != null) {
List<String> contextIds = fModelToContextIds.get(modelIdentifier);
if (contextIds == null) {
- contextIds = new ArrayList<String>();
+ contextIds = new ArrayList<>();
fModelToContextIds.put(modelIdentifier, contextIds);
}
contextIds.add(contextId);
@@ -205,11 +205,11 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
if (launch == null || launch.isTerminated()) {
return;
}
- List<String> toEnable = new ArrayList<String>(modelIds.length);
+ List<String> toEnable = new ArrayList<>(modelIds.length);
synchronized (this) {
Set<String> alreadyEnabled = fLaunchToModelIds.get(launch);
if (alreadyEnabled == null) {
- alreadyEnabled = new HashSet<String>();
+ alreadyEnabled = new HashSet<>();
fLaunchToModelIds.put(launch, alreadyEnabled);
}
for (int i = 0; i < modelIds.length; i++) {
@@ -242,7 +242,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
// 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<String>();
+ contextIds = new ArrayList<>();
contextIds.add(DEBUG_CONTEXT);
fModelToContextIds.put(modelId, contextIds);
}
@@ -285,7 +285,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
private synchronized void addActivation(ILaunch launch, IContextActivation activation) {
List<IContextActivation> activations = fLanuchToContextActivations.get(launch);
if (activations == null) {
- activations = new ArrayList<IContextActivation>();
+ activations = new ArrayList<>();
fLanuchToContextActivations.put(launch, activations);
}
activations.add(activation);
@@ -391,7 +391,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
* @return associated workbench contexts
*/
public List<String> getWorkbenchContextsForDebugContext(Object target) {
- List<String> workbenchContexts = new ArrayList<String>();
+ List<String> workbenchContexts = new ArrayList<>();
String[] modelIds = getDebugModelIds(target);
if (modelIds != null) {
for (int i = 0; i < modelIds.length; i++) {
@@ -425,7 +425,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
Set<String> ids = fModelToActivities.get(id);
if (ids == null) {
// first time the model has been seen, perform pattern matching
- ids = new HashSet<String>();
+ ids = new HashSet<>();
fModelToActivities.put(id, ids);
for (IActivityPatternBinding binding : fModelPatternBindings) {
String regex = binding.getPattern().pattern();
@@ -437,7 +437,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
}
if (!ids.isEmpty()) {
if (activities == null) {
- activities = new HashSet<String>();
+ activities = new HashSet<>();
}
activities.addAll(ids);
}
@@ -448,7 +448,7 @@ public class DebugModelContextBindingManager implements IDebugContextListener, I
IWorkbenchActivitySupport activitySupport = PlatformUI.getWorkbench().getActivitySupport();
Set<String> enabledActivityIds = activitySupport.getActivityManager().getEnabledActivityIds();
if (!enabledActivityIds.containsAll(activities)) {
- enabledActivityIds = new HashSet<String>(enabledActivityIds);
+ enabledActivityIds = new HashSet<>(enabledActivityIds);
enabledActivityIds.addAll(activities);
activitySupport.setEnabledActivityIds(activities);
}
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 c02a87ede..501e59c3b 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
@@ -46,11 +46,11 @@ import org.eclipse.ui.services.IEvaluationService;
public class DebugWindowContextService implements IDebugContextService, IPartListener2, IDebugContextListener {
private Map<String, ListenerList<IDebugContextListener>> fListenersByPartId = new HashMap<>();
- private Map<String, IDebugContextProvider> fProvidersByPartId = new HashMap<String, IDebugContextProvider>();
+ private Map<String, IDebugContextProvider> fProvidersByPartId = new HashMap<>();
private Map<String, ListenerList<IDebugContextListener>> fPostListenersByPartId = new HashMap<>();
private IWorkbenchWindow fWindow;
- private List<IDebugContextProvider> fProviders = new ArrayList<IDebugContextProvider>();
+ private List<IDebugContextProvider> fProviders = new ArrayList<>();
private DebugContextSourceProvider fSourceProvider;
@@ -243,7 +243,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
if (part != null) {
id = getCombinedPartId(part);
ListenerList<IDebugContextListener> listenerList = fListenersByPartId.get(id);
- return listenerList != null ? listenerList : new ListenerList<IDebugContextListener>();
+ return listenerList != null ? listenerList : new ListenerList<>();
} else {
ListenerList<IDebugContextListener> listenerList = fListenersByPartId.get(null);
ListenerList<IDebugContextListener> retVal = new ListenerList<>();
@@ -280,11 +280,11 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
if (part != null) {
id = getCombinedPartId(part);
ListenerList<IDebugContextListener> listenerList = fPostListenersByPartId.get(id);
- return listenerList != null ? listenerList : new ListenerList<IDebugContextListener>();
+ return listenerList != null ? listenerList : new ListenerList<>();
} else {
ListenerList<IDebugContextListener> retVal = fPostListenersByPartId.get(null);
if (retVal == null) {
- retVal = new ListenerList<IDebugContextListener>();
+ retVal = new ListenerList<>();
}
outer: for (Iterator<String> itr = fPostListenersByPartId.keySet().iterator(); itr.hasNext();) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/SuspendTriggerAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/SuspendTriggerAdapterFactory.java
index d7dde2afc..b7d85cff6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/SuspendTriggerAdapterFactory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/SuspendTriggerAdapterFactory.java
@@ -24,7 +24,7 @@ import org.eclipse.debug.ui.contexts.ISuspendTrigger;
*/
public class SuspendTriggerAdapterFactory implements IAdapterFactory {
- private Map<Object, LaunchSuspendTrigger> fSuspendTriggers = new HashMap<Object, LaunchSuspendTrigger>();
+ private Map<Object, LaunchSuspendTrigger> fSuspendTriggers = new HashMap<>();
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockContentAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockContentAdapter.java
index 47b0ed4db..0c347426d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockContentAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemoryBlockContentAdapter.java
@@ -354,7 +354,7 @@ public class MemoryBlockContentAdapter extends AsynchronousContentAdapter {
// if debug adapter did not return enough memory, create dummy memory
if (memoryBuffer.length < reqNumBytes) {
- ArrayList<MemoryByte> newBuffer = new ArrayList<MemoryByte>();
+ ArrayList<MemoryByte> newBuffer = new ArrayList<>();
for (int i = 0; i < memoryBuffer.length; i++) {
newBuffer.add(memoryBuffer[i]);
@@ -391,7 +391,7 @@ public class MemoryBlockContentAdapter extends AsynchronousContentAdapter {
}
private Object[] organizeLines(long numberOfLines, MemoryByte[] memoryBuffer, BigInteger address, boolean manageDelta, MemoryViewPresentationContext context) {
- Vector<MemorySegment> lineCache = new Vector<MemorySegment>();
+ Vector<MemorySegment> lineCache = new Vector<>();
IMemoryRendering rendering = context.getRendering();
if (!(rendering instanceof AbstractAsyncTableRendering)) {
return lineCache.toArray();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/RegisterGroupProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/RegisterGroupProxy.java
index f70f5bfdb..ae5f9109b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/RegisterGroupProxy.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/RegisterGroupProxy.java
@@ -402,7 +402,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati
public void compareElements(IElementCompareRequest[] requests) {
IElementMementoProvider provider = ViewerAdapterService.getMementoProvider(fFrame);
if (provider != null) {
- List<IElementCompareRequest> others = new ArrayList<IElementCompareRequest>(requests.length);
+ List<IElementCompareRequest> others = new ArrayList<>(requests.length);
for (int i = 0; i < requests.length; i++) {
IElementCompareRequest request = requests[i];
if (request.getElement().equals(this)) {
@@ -432,7 +432,7 @@ public class RegisterGroupProxy implements IModelProxyFactory, IColumnPresentati
public void encodeElements(IElementMementoRequest[] requests) {
IElementMementoProvider provider = ViewerAdapterService.getMementoProvider(fFrame);
if (provider != null) {
- List<IElementMementoRequest> others = new ArrayList<IElementMementoRequest>(requests.length);
+ List<IElementMementoRequest> others = new ArrayList<>(requests.length);
for (int i = 0; i < requests.length; i++) {
IElementMementoRequest request = requests[i];
if (request.getElement().equals(this)) {
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 a0f0f37bd..3d0b75ac7 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
@@ -318,7 +318,7 @@ class CommonTabLite extends AbstractLaunchConfigurationTab {
}
}
if (!groups.isEmpty()) {
- List<LaunchGroupExtension> list = new ArrayList<LaunchGroupExtension>();
+ List<LaunchGroupExtension> list = new ArrayList<>();
Iterator<String> iterator = groups.iterator();
while (iterator.hasNext()) {
String id = iterator.next();
@@ -375,7 +375,7 @@ class CommonTabLite extends AbstractLaunchConfigurationTab {
boolean run = config.getAttribute(IDebugUIConstants.ATTR_RUN_FAVORITE, false);
if (debug || run) {
// old attributes
- List<LaunchGroupExtension> groups = new ArrayList<LaunchGroupExtension>();
+ List<LaunchGroupExtension> groups = new ArrayList<>();
int num = 0;
if (debug) {
groups.add(getLaunchConfigurationManager().getLaunchGroup(IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP));
@@ -405,7 +405,7 @@ class CommonTabLite extends AbstractLaunchConfigurationTab {
for (int i = 0; i < checked.length; i++) {
LaunchGroupExtension group = (LaunchGroupExtension)checked[i];
if (groups == null) {
- groups = new ArrayList<String>();
+ groups = new ArrayList<>();
}
groups.add(group.getIdentifier());
}
@@ -524,7 +524,7 @@ class CommonTabLite extends AbstractLaunchConfigurationTab {
@Override
public Object[] getElements(Object inputElement) {
ILaunchGroup[] groups = DebugUITools.getLaunchGroups();
- List<ILaunchGroup> possibleGroups = new ArrayList<ILaunchGroup>();
+ List<ILaunchGroup> possibleGroups = new ArrayList<>();
ILaunchConfiguration configuration = (ILaunchConfiguration)inputElement;
for (int i = 0; i < groups.length; i++) {
ILaunchGroup extension = groups[i];
@@ -550,7 +550,7 @@ class CommonTabLite extends AbstractLaunchConfigurationTab {
*/
class FavoritesLabelProvider implements ITableLabelProvider {
- private Map<Object, Image> fImages = new HashMap<Object, Image>();
+ private Map<Object, Image> fImages = new HashMap<>();
@Override
public Image getColumnImage(Object element, int columnIndex) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java
index 34fbfca6a..3b951a736 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java
@@ -317,7 +317,7 @@ class GroupLaunchConfigurationSelectionDialog extends TitleAreaDialog implements
}
public ILaunchConfiguration[] getSelectedLaunchConfigurations() {
- List<ILaunchConfiguration> configs = new ArrayList<ILaunchConfiguration>();
+ List<ILaunchConfiguration> configs = new ArrayList<>();
if (fSelection != null && !fSelection.isEmpty()) {
for (Iterator<?> iter = ((IStructuredSelection) fSelection).iterator(); iter.hasNext();) {
Object selection = iter.next();
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 285909910..074ee4441 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
@@ -261,7 +261,7 @@ public class GroupLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio
}
static class GroupLaunchTab extends AbstractLaunchConfigurationTab {
protected CheckboxTreeViewer treeViewer;
- protected List<GroupLaunchElement> input = new ArrayList<GroupLaunchElement>();
+ protected List<GroupLaunchElement> input = new ArrayList<>();
/**
* copy of the initial state of the configuration used for cycle
@@ -400,7 +400,7 @@ public class GroupLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio
*/
private int[] getMultiSelectionIndices() {
StructuredSelection sel = (StructuredSelection) treeViewer.getSelection();
- List<Integer> indices = new ArrayList<Integer>();
+ List<Integer> indices = new ArrayList<>();
for (Iterator<?> iter = sel.iterator(); iter.hasNext(); ) {
GroupLaunchElement el = (GroupLaunchElement) iter.next();
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 506d73f44..5429f3f6c 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
@@ -146,7 +146,7 @@ public class EmbeddedBreakpointsViewer {
Object[] items = fSelection.toArray();
fViewer.setGrayedElements(new Object[] {});
fViewer.setCheckedElements(new Object[] {});
- ArrayList<IBreakpoint> list = new ArrayList<IBreakpoint>();
+ ArrayList<IBreakpoint> list = new ArrayList<>();
for(int i = 0; i < items.length; i++) {
Object item = items[i];
IBreakpoint breakpoint = (IBreakpoint)DebugPlugin.getAdapter(item, IBreakpoint.class);
@@ -181,7 +181,7 @@ public class EmbeddedBreakpointsViewer {
*/
public IStructuredSelection getCheckedElements() {
Object[] list = fViewer.getCheckedElements();
- Vector<Object> selected = new Vector<Object>();
+ Vector<Object> selected = new Vector<>();
for(int i = 0; i < list.length; i++) {
if(!selected.contains(list[i])) {
selected.addElement(list[i]);
@@ -204,7 +204,7 @@ public class EmbeddedBreakpointsViewer {
* @return a list of widget occurrences to update or an empty list
*/
private Widget[] searchItems(Object element) {
- ArrayList<TreeItem> list = new ArrayList<TreeItem>();
+ ArrayList<TreeItem> list = new ArrayList<>();
TreeItem[] items = fTree.getItems();
for (int i = 0; i < items.length; i++) {
findAllOccurrences(items[i], element, list);
@@ -246,7 +246,7 @@ public class EmbeddedBreakpointsViewer {
}
}
else if (obj instanceof BreakpointContainer) {
- ArrayList<IBreakpoint> bps = new ArrayList<IBreakpoint>();
+ ArrayList<IBreakpoint> bps = new ArrayList<>();
getBreakpointsFromContainers((BreakpointContainer)obj, bps);
for(int j = 0; j < bps.size(); j++) {
updateCheckedState(bps.get(j), enable);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
index 7044a3c65..5a595d853 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
@@ -315,7 +315,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
}
// collect breakpoints
Object[] elements = fTView.getCheckedElements().toArray();
- List<IBreakpoint> breakpoints = new ArrayList<IBreakpoint>();
+ List<IBreakpoint> breakpoints = new ArrayList<>();
for (int i = 0; i < elements.length; i++) {
Object object = elements[i];
if (object instanceof IBreakpoint) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsSelectionPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsSelectionPage.java
index 9374cea50..1a2381b0a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsSelectionPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsSelectionPage.java
@@ -68,7 +68,7 @@ public class WizardImportBreakpointsSelectionPage extends WizardPage {
if(!fIsVisible) {
return null;
}
- List<IMarker> markers = new ArrayList<IMarker>();
+ List<IMarker> markers = new ArrayList<>();
List<IBreakpoint> breakpoints = fTView.getCheckedElements().toList();
for(int i = 0; i < breakpoints.size(); i++) {
markers.add(breakpoints.get(i).getMarker());
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 6af48f78d..ecd53cdb3 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
@@ -340,7 +340,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage {
file = launchConfig.getFileStore();
if (file == null) {
if (errors == null) {
- errors = new ArrayList<IStatus>(configs.length);
+ errors = new ArrayList<>(configs.length);
}
errors.add(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), MessageFormat.format(WizardMessages.ExportLaunchConfigurationsWizardPage_19, new Object[] { launchConfig.getName() }), null));
} else {
@@ -390,14 +390,14 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage {
}
catch (IOException e ) {
if (errors == null) {
- errors = new ArrayList<IStatus>(configs.length);
+ errors = new ArrayList<>(configs.length);
}
errors.add(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(),
e.getMessage(), e));
}
catch (CoreException e) {
if (errors == null) {
- errors = new ArrayList<IStatus>(configs.length);
+ errors = new ArrayList<>(configs.length);
}
errors.add(e.getStatus());
}
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 5e4b35728..4cd723ce9 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
@@ -172,7 +172,7 @@ public class ImportLaunchConfigurationsWizardPage extends WizardResourceImportPa
File config, newconfig = null;
boolean owall = false, nowall = false;
MessageDialog dialog = null;
- final List<File> filesToImport = new ArrayList<File>();
+ final List<File> filesToImport = new ArrayList<>();
for (Iterator<?> iter = items.iterator(); iter.hasNext();) {
config = (File) ((DebugFileSystemElement) iter.next()).getFileSystemObject();
newconfig = new File(new Path(LaunchManager.LOCAL_LAUNCH_CONFIGURATION_CONTAINER_PATH.toOSString()).append(config.getName()).toOSString());
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 af014e1ed..eae89d3d4 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
@@ -39,7 +39,7 @@ public class CompileErrorProjectPromptStatusHandler implements IStatusHandler {
@Override
public Object handleStatus(IStatus status, Object source) throws CoreException {
ILaunchConfiguration config = null;
- List<Object> projects = new ArrayList<Object>();
+ List<Object> projects = new ArrayList<>();
if (source instanceof List) {
List<?> args = (List<?>) source;
Iterator<?> iterator = args.iterator();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java
index 5897781f6..0c1eebba3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java
@@ -18,10 +18,13 @@ import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
/**
* Deletes the selected launch configuration(s).
@@ -49,7 +52,7 @@ public class DeleteLaunchConfigurationAction extends AbstractLaunchConfiguration
IStructuredSelection selection = getStructuredSelection();
// Make the user confirm the deletion
String dialogMessage = selection.size() > 1 ? LaunchConfigurationsMessages.LaunchConfigurationDialog_Do_you_wish_to_delete_the_selected_launch_configurations__1 : LaunchConfigurationsMessages.LaunchConfigurationDialog_Do_you_wish_to_delete_the_selected_launch_configuration__2; //
- return MessageDialog.openQuestion(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Confirm_Launch_Configuration_Deletion_3, dialogMessage);
+ return MessageDialog.open(MessageDialog.QUESTION, getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Confirm_Launch_Configuration_Deletion_3, dialogMessage, SWT.NONE, LaunchConfigurationsMessages.LaunchConfigurationSelectionDialog_deleteButtonLabel, IDialogConstants.CANCEL_LABEL) == Window.OK;
}
/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchDelegatesStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchDelegatesStatusHandler.java
index d93229262..946804f88 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchDelegatesStatusHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchDelegatesStatusHandler.java
@@ -44,7 +44,7 @@ public class DuplicateLaunchDelegatesStatusHandler implements IStatusHandler {
ILaunchConfiguration config = (ILaunchConfiguration) infos[0];
String mode = (String) infos[1];
Shell shell = DebugUIPlugin.getShell();
- HashSet<String> modes = new HashSet<String>();
+ HashSet<String> modes = new HashSet<>();
modes.add(mode);
modes.addAll(config.getModes());
SelectLaunchersDialog sldd = new SelectLaunchersDialog(shell,
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java
index 5b6487a35..1f226d786 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
@@ -304,7 +304,7 @@ public class FavoritesDialog extends TrayDialog {
protected List<ILaunchConfiguration> getFavorites() {
if (fFavorites == null) {
ILaunchConfiguration[] favs = getInitialFavorites();
- fFavorites = new ArrayList<ILaunchConfiguration>(favs.length);
+ fFavorites = new ArrayList<>(favs.length);
addAll(favs, fFavorites);
}
return fFavorites;
@@ -421,7 +421,7 @@ public class FavoritesDialog extends TrayDialog {
try {
List<String> groups = configuration.getAttribute(IDebugUIConstants.ATTR_FAVORITE_GROUPS, (List<String>) null);
if (groups == null) {
- groups = new ArrayList<String>();
+ groups = new ArrayList<>();
}
if (!groups.contains(groupId)) {
groups.add(groupId);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java
index 3f90d858c..e49911c38 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java
@@ -61,7 +61,7 @@ public class LaunchConfigurationComparator extends WorkbenchViewerComparator {
*/
private Map<ILaunchConfigurationType, Integer> getCategories() {
if (fgCategories == null) {
- fgCategories = new HashMap<ILaunchConfigurationType, Integer>();
+ fgCategories = new HashMap<>();
List<ILaunchConfigurationType> types = Arrays.asList(DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationTypes());
Collections.sort(types, new Comparator<ILaunchConfigurationType>() {
@Override
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 9db8d18b8..dcf018cc0 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
@@ -158,7 +158,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
/**
* The list of registered implementors of <code>ILaunchHistoryChangedListener</code>
*/
- protected List<ILaunchHistoryChangedListener> fLaunchHistoryChangedListeners = new ArrayList<ILaunchHistoryChangedListener>(3);
+ protected List<ILaunchHistoryChangedListener> fLaunchHistoryChangedListeners = new ArrayList<>(3);
/**
* Launch shortcuts
@@ -238,7 +238,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
if (activitySupport == null) {
return configurations;
}
- List<ILaunchConfiguration> filteredConfigs = new ArrayList<ILaunchConfiguration>();
+ List<ILaunchConfiguration> filteredConfigs = new ArrayList<>();
ILaunchConfigurationType type = null;
LaunchConfigurationTypeContribution contribution = null;
ILaunchConfiguration configuration = null;
@@ -270,7 +270,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
if(as == null) {
return delegates;
}
- HashSet<ILaunchDelegate> set = new HashSet<ILaunchDelegate>();
+ HashSet<ILaunchDelegate> set = new HashSet<>();
for(int i = 0; i < delegates.length; i++) {
//filter by capabilities
if(!WorkbenchActivityHelper.filterItem(new LaunchDelegateContribution(delegates[i]))) {
@@ -581,7 +581,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
* @return list of configurations under the element
*/
private ILaunchConfiguration[] getLaunchConfigurations(Element root) {
- List<ILaunchConfiguration> configs = new ArrayList<ILaunchConfiguration>();
+ List<ILaunchConfiguration> configs = new ArrayList<>();
NodeList nodes = root.getChildNodes();
int length = nodes.getLength();
for (int i = 0; i < length; i++) {
@@ -646,7 +646,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
IConfigurationElement[] infos = extensionPoint.getConfigurationElements();
// Load the configuration elements into a Map
- fLaunchShortcuts = new ArrayList<LaunchShortcutExtension>(infos.length);
+ fLaunchShortcuts = new ArrayList<>(infos.length);
for (int i = 0; i < infos.length; i++) {
fLaunchShortcuts.add(new LaunchShortcutExtension(infos[i]));
}
@@ -664,7 +664,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
IConfigurationElement[] infos= extensionPoint.getConfigurationElements();
// Load the configuration elements into a Map
- fLaunchGroups = new HashMap<String, LaunchGroupExtension>(infos.length);
+ fLaunchGroups = new HashMap<>(infos.length);
LaunchGroupExtension ext = null;
for (int i = 0; i < infos.length; i++) {
ext = new LaunchGroupExtension(infos[i]);
@@ -692,9 +692,9 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
* @since 3.3
*/
public List<LaunchShortcutExtension> getLaunchShortcuts(IResource resource) {
- List<LaunchShortcutExtension> list = new ArrayList<LaunchShortcutExtension>();
+ List<LaunchShortcutExtension> list = new ArrayList<>();
List<LaunchShortcutExtension> sc = getLaunchShortcuts();
- List<IResource> ctxt = new ArrayList<IResource>();
+ List<IResource> ctxt = new ArrayList<>();
if(resource != null) {
ctxt.add(resource);
}
@@ -723,12 +723,12 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
*/
public String[] getApplicableConfigurationTypes(IResource resource) {
List<LaunchShortcutExtension> exts = getLaunchShortcuts();
- List<IResource> list = new ArrayList<IResource>();
+ List<IResource> list = new ArrayList<>();
list.add(resource);
IEvaluationContext context = DebugUIPlugin.createEvaluationContext(list);
context.setAllowPluginActivation(true);
context.addVariable("selection", list); //$NON-NLS-1$
- HashSet<String> contributedTypeIds = new HashSet<String>();
+ HashSet<String> contributedTypeIds = new HashSet<>();
for (Iterator<LaunchShortcutExtension> iter = exts.listIterator(); iter.hasNext();) {
LaunchShortcutExtension ext = iter.next();
try {
@@ -742,7 +742,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
iter.remove();
}
}
- List<String> typeIds = new ArrayList<String>();
+ List<String> typeIds = new ArrayList<>();
LaunchManager lm = (LaunchManager) DebugPlugin.getDefault().getLaunchManager();
for (String id : contributedTypeIds) {
ILaunchConfigurationType type = lm.getLaunchConfigurationType(id);
@@ -765,7 +765,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
* @since 3.3
*/
public ILaunchConfiguration[] getApplicableLaunchConfigurations(String[] types, IResource resource) {
- ArrayList<ILaunchConfiguration> list = new ArrayList<ILaunchConfiguration>();
+ ArrayList<ILaunchConfiguration> list = new ArrayList<>();
try {
if(resource != null) {
String[] ctypes = types;
@@ -773,7 +773,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
ctypes = getApplicableConfigurationTypes(resource);
}
//copy into collection for hashcode matching
- HashSet<String> typeset = new HashSet<String>(ctypes.length);
+ HashSet<String> typeset = new HashSet<>(ctypes.length);
for(int i = 0; i < ctypes.length; i++) {
typeset.add(ctypes[i]);
}
@@ -845,7 +845,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
* @return List
*/
protected List<LaunchShortcutExtension> filterShortcuts(List<LaunchShortcutExtension> unfiltered, String category) {
- List<LaunchShortcutExtension> filtered = new ArrayList<LaunchShortcutExtension>(unfiltered.size());
+ List<LaunchShortcutExtension> filtered = new ArrayList<>(unfiltered.size());
for (LaunchShortcutExtension extension : unfiltered) {
if (category == null) {
if (extension.getCategory() == null) {
@@ -872,13 +872,13 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
@Deprecated
public List<LaunchShortcutExtension> getLaunchShortcuts(String perpsective, String category) {
if (fLaunchShortcutsByPerspective == null) {
- fLaunchShortcutsByPerspective = new HashMap<String, List<LaunchShortcutExtension>>(10);
+ fLaunchShortcutsByPerspective = new HashMap<>(10);
}
for (LaunchShortcutExtension ext : getLaunchShortcuts()) {
for (String id : ext.getPerspectives()) {
List<LaunchShortcutExtension> list = fLaunchShortcutsByPerspective.get(id);
if (list == null) {
- list = new ArrayList<LaunchShortcutExtension>(4);
+ list = new ArrayList<>(4);
fLaunchShortcutsByPerspective.put(id, list);
}
list.add(ext);
@@ -902,7 +902,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
*/
public ILaunchConfiguration getMRUConfiguration(List<ILaunchConfiguration> configurations, ILaunchGroup group, IResource resource) {
if(group != null) {
- ArrayList<ILaunchConfiguration> candidates = new ArrayList<ILaunchConfiguration>();
+ ArrayList<ILaunchConfiguration> candidates = new ArrayList<>();
LaunchHistory history = getLaunchHistory(group.getIdentifier());
if(history != null) {
ILaunchConfiguration[] configs = history.getCompleteLaunchHistory();
@@ -1055,7 +1055,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici
if (fLaunchHistories == null) {
fRestoring = true;
ILaunchGroup[] groups = getLaunchGroups();
- fLaunchHistories = new HashMap<String, LaunchHistory>(groups.length);
+ fLaunchHistories = new HashMap<>(groups.length);
ILaunchGroup extension = null;
for (int i = 0; i < groups.length; i++) {
extension = groups[i];
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
index 5741f17d7..fbb86f71d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
@@ -75,7 +75,7 @@ public class LaunchConfigurationPresentationManager {
*/
private Hashtable<String, Hashtable<String, LaunchConfigurationTabExtension>> fContributedTabs;
- private static Set<String> ALL_MODES = new HashSet<String>(1);
+ private static Set<String> ALL_MODES = new HashSet<>(1);
static {
ALL_MODES.add("*"); //$NON-NLS-1$
@@ -105,7 +105,7 @@ public class LaunchConfigurationPresentationManager {
*/
private void initializeTabGroupExtensions() {
if(fTabGroupExtensions == null) {
- fTabGroupExtensions = new Hashtable<String, Map<Set<String>, LaunchConfigurationTabGroupExtension>>();
+ fTabGroupExtensions = new Hashtable<>();
IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_LAUNCH_CONFIGURATION_TAB_GROUPS);
IConfigurationElement[] groups = extensionPoint.getConfigurationElements();
LaunchConfigurationTabGroupExtension group = null;
@@ -117,7 +117,7 @@ public class LaunchConfigurationPresentationManager {
typeId = group.getTypeIdentifier();
map = fTabGroupExtensions.get(typeId);
if (map == null) {
- map = new Hashtable<Set<String>, LaunchConfigurationTabGroupExtension>();
+ map = new Hashtable<>();
fTabGroupExtensions.put(typeId, map);
}
modes = group.getModes();
@@ -156,7 +156,7 @@ public class LaunchConfigurationPresentationManager {
* @since 3.3
*/
private void initializeContributedTabExtensions() {
- fContributedTabs = new Hashtable<String, Hashtable<String, LaunchConfigurationTabExtension>>();
+ fContributedTabs = new Hashtable<>();
IExtensionPoint epoint = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_LAUNCH_TABS);
IConfigurationElement[] elements = epoint.getConfigurationElements();
LaunchConfigurationTabExtension tab = null;
@@ -165,7 +165,7 @@ public class LaunchConfigurationPresentationManager {
tab = new LaunchConfigurationTabExtension(elements[i]);
element = fContributedTabs.get(tab.getTabGroupId());
if(element == null) {
- element = new Hashtable<String, LaunchConfigurationTabExtension>();
+ element = new Hashtable<>();
element.put(tab.getIdentifier(), tab);
fContributedTabs.put(tab.getTabGroupId(), element);
}
@@ -182,7 +182,7 @@ public class LaunchConfigurationPresentationManager {
* @exception CoreException if an exception occurs creating the group
*/
public ILaunchConfigurationTabGroup getTabGroup(ILaunchConfigurationType type, String mode) throws CoreException {
- HashSet<String> modes = new HashSet<String>();
+ HashSet<String> modes = new HashSet<>();
modes.add(mode);
LaunchConfigurationTabGroupExtension ext = getExtension(type.getIdentifier(), modes);
if (ext == null) {
@@ -201,7 +201,7 @@ public class LaunchConfigurationPresentationManager {
* @throws CoreException
*/
public ILaunchConfigurationTabGroup getTabGroup(ILaunchConfiguration config, String mode) throws CoreException {
- HashSet<String> modes = new HashSet<String>();
+ HashSet<String> modes = new HashSet<>();
modes.add(mode);
LaunchConfigurationTabGroupExtension ext = getExtension(config.getType().getIdentifier(), modes);
if (ext == null) {
@@ -250,7 +250,7 @@ public class LaunchConfigurationPresentationManager {
if(as == null || config == null) {
return tabs;
}
- HashSet<LaunchConfigurationTabExtension> set = new HashSet<LaunchConfigurationTabExtension>();
+ HashSet<LaunchConfigurationTabExtension> set = new HashSet<>();
for(int i = 0; i < tabs.length; i ++) {
//filter capabilities
if(!WorkbenchActivityHelper.filterItem(new LaunchTabContribution(tabs[i]))) {
@@ -316,7 +316,7 @@ public class LaunchConfigurationPresentationManager {
* @since 2.1
*/
public String getHelpContext(ILaunchConfigurationType type, String mode) throws CoreException {
- HashSet<String> modes = new HashSet<String>();
+ HashSet<String> modes = new HashSet<>();
modes.add(mode);
LaunchConfigurationTabGroupExtension ext = getExtension(type.getIdentifier(), modes);
if (ext == null) {
@@ -335,7 +335,7 @@ public class LaunchConfigurationPresentationManager {
* @return the description of the given configuration type, possible <code>null</code>
*/
public String getDescription(ILaunchConfigurationType configType, String mode) {
- HashSet<String> modes = new HashSet<String>();
+ HashSet<String> modes = new HashSet<>();
modes.add(mode);
LaunchConfigurationTabGroupExtension extension = getExtension(configType.getAttribute(IConfigurationElementConstants.ID), modes);
return (extension != null ? extension.getDescription(modes) : null);
@@ -348,7 +348,7 @@ public class LaunchConfigurationPresentationManager {
* @return sorted list of launch mode names
*/
public List<String> getLaunchModeNames(Set<String> modes) {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
for (String id : modes) {
ILaunchMode mode = manager.getLaunchMode(id);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java
index e761b30f4..b315b9c00 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java
@@ -95,8 +95,8 @@ public class LaunchConfigurationTabGroupExtension {
*/
protected List<Set<String>> getModes() {
if (fModes == null) {
- fModes = new ArrayList<Set<String>>();
- fPerspectives = new Hashtable<Set<String>, String>();
+ fModes = new ArrayList<>();
+ fPerspectives = new Hashtable<>();
IConfigurationElement[] modes = fConfig.getChildren(IConfigurationElementConstants.LAUNCH_MODE);
if (modes.length > 0) {
IConfigurationElement element = null;
@@ -105,7 +105,7 @@ public class LaunchConfigurationTabGroupExtension {
for (int i = 0; i < modes.length; i++) {
element = modes[i];
mode = element.getAttribute(IConfigurationElementConstants.MODE);
- mset = new HashSet<String>();
+ mset = new HashSet<>();
mset.add(mode);
fModes.add(mset);
perspective = element.getAttribute(IConfigurationElementConstants.PERSPECTIVE);
@@ -184,7 +184,7 @@ public class LaunchConfigurationTabGroupExtension {
public String getDescription(Set<String> modes) {
String description = null;
if(fDescriptions == null) {
- fDescriptions = new HashMap<Set<String>, String>();
+ fDescriptions = new HashMap<>();
IConfigurationElement[] children = fConfig.getChildren(IConfigurationElementConstants.LAUNCH_MODE);
IConfigurationElement child = null;
String mode = null;
@@ -193,7 +193,7 @@ public class LaunchConfigurationTabGroupExtension {
child = children[i];
mode = child.getAttribute(IConfigurationElementConstants.MODE);
if(mode != null) {
- set = new HashSet<String>();
+ set = new HashSet<>();
set.add(mode);
}
description = child.getAttribute(IConfigurationElementConstants.DESCRIPTION);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
index 2bb34429e..04a53eb57 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
@@ -599,7 +599,7 @@ public class LaunchConfigurationTabGroupViewer {
* @since 3.3
*/
private Set<String> getCurrentModeSet() {
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
ILaunchConfigurationWorkingCopy config = getWorkingCopy();
if(config != null) {
try {
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 36917839b..5c9be7d4d 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
@@ -48,9 +48,9 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT
private ArrayList<LaunchConfigurationTabExtension> extList = null;
public TabCollector(List<ILaunchConfigurationTab> tabs, List<LaunchConfigurationTabExtension> exts) {
- tabList = new ArrayList<ILaunchConfigurationTab>(tabs);
- extList = new ArrayList<LaunchConfigurationTabExtension>(exts);
- idSet = new HashSet<String>(tabList.size() + extList.size());
+ tabList = new ArrayList<>(tabs);
+ extList = new ArrayList<>(exts);
+ idSet = new HashSet<>(tabList.size() + extList.size());
}
/**
@@ -169,7 +169,7 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT
public ILaunchConfigurationTab[] getTabs() {
if(fTabs == null) {
try {
- fTabs = new ArrayList<ILaunchConfigurationTab>();
+ fTabs = new ArrayList<>();
LaunchConfigurationTabExtension[] ext = LaunchConfigurationPresentationManager.getDefault().getTabExtensions(fGroupId, fConfig, fMode);
//if there are no extensions bypass and do a raw copy into
if(ext.length > 0) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java
index 9285425c9..14a06251d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java
@@ -141,7 +141,7 @@ public class LaunchConfigurationTreeContentProvider implements ITreeContentProvi
* @return the given types minus any types that should not be visible.
*/
private List<ILaunchConfigurationType> filterTypes(ILaunchConfigurationType[] allTypes) {
- List<ILaunchConfigurationType> filteredTypes = new ArrayList<ILaunchConfigurationType>();
+ List<ILaunchConfigurationType> filteredTypes = new ArrayList<>();
String mode = getMode();
LaunchConfigurationTypeContribution contribution;
for (int i = 0; i < allTypes.length; i++) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationViewer.java
index 856fd6214..b6bcae62b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationViewer.java
@@ -59,7 +59,7 @@ public class LaunchConfigurationViewer extends TreeViewer {
if(!selection.isEmpty()) {
int[] indices = collectIndices(selection.getFirstElement());
updateCode.run();
- ArrayList<Object> set = new ArrayList<Object>();
+ ArrayList<Object> set = new ArrayList<>();
Object o = null;
for (Iterator<?> iter = selection.iterator(); iter.hasNext();) {
o = iter.next();
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 5c6d458fb..22d5bef2d 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
@@ -634,7 +634,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
* @since 3.2
*/
private ViewerFilter[] createViewerFilters() {
- ArrayList<ViewerFilter> filters = new ArrayList<ViewerFilter>();
+ ArrayList<ViewerFilter> filters = new ArrayList<>();
fClosedProjectFilter = new ClosedProjectFilter();
if(DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IInternalDebugUIConstants.PREF_FILTER_LAUNCH_CLOSED)) {
filters.add(fClosedProjectFilter);
@@ -1215,7 +1215,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
if(value == null) {
value = IInternalDebugCoreConstants.EMPTY_STRING;
}
- ArrayList<String> list = new ArrayList<String>();
+ ArrayList<String> list = new ArrayList<>();
String[] persisted = value.split(DELIMITER);
for(int i = 0; i < persisted.length; i++) {
list.add(persisted[i]);
@@ -1252,7 +1252,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
if(value != null) {
String[] nodes = value.split(DELIMITER);
TreeItem[] items = fLaunchConfigurationView.getTreeViewer().getTree().getItems();
- HashSet<Object> toexpand = new HashSet<Object>();
+ HashSet<Object> toexpand = new HashSet<>();
// if we have a selection make sure it is expanded
if(fInitialSelection != null && !fInitialSelection.isEmpty()) {
Object obj = fInitialSelection.getFirstElement();
@@ -1512,8 +1512,9 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
null,
buffer.toString(),
MessageDialog.QUESTION,
- new String[] {LaunchConfigurationsMessages.LaunchConfigurationDialog_Yes_32,
- LaunchConfigurationsMessages.LaunchConfigurationDialog_No_33},
+ new String[] {
+ LaunchConfigurationsMessages.LaunchConfigurationDialog_Discard_Button,
+ LaunchConfigurationsMessages.LaunchConfigurationDialog_Dont_Discard_Button },
1);
int val = IDialogConstants.NO_ID;
if (dialog.open() == 0) {
@@ -1547,9 +1548,10 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
null,
message,
MessageDialog.QUESTION,
- new String[] {LaunchConfigurationsMessages.LaunchConfigurationDialog_Yes_32,
- LaunchConfigurationsMessages.LaunchConfigurationDialog_No_33,
- LaunchConfigurationsMessages.LaunchConfigurationsDialog_c_ancel},
+ new String[] {
+ LaunchConfigurationsMessages.LaunchConfigurationDialog_Save_Button,
+ LaunchConfigurationsMessages.LaunchConfigurationDialog_Dont_Save_Button,
+ LaunchConfigurationsMessages.LaunchConfigurationsDialog_c_ancel },
0);
int ret = dialog.open();
int val = IDialogConstants.CANCEL_ID;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
index e0fef6ca0..7e7b5dddd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -77,12 +77,14 @@ public class LaunchConfigurationsMessages extends NLS {
public static String LaunchConfigurationDialog_Launch_Configuration_Error_46;
public static String LaunchConfigurationDialog_Launch_Configurations_18;
public static String LaunchConfigurationDialog_Name_required_for_launch_configuration_11;
- public static String LaunchConfigurationDialog_No_33;
public static String LaunchConfigurationDialog_Ready_to_launch_2;
public static String LaunchConfigurationDialog_The_configuration___29;
public static String LaunchConfigurationDialog_The_configuration___35;
public static String LaunchConfigurationDialog_unspecified_28;
- public static String LaunchConfigurationDialog_Yes_32;
+ public static String LaunchConfigurationDialog_Save_Button;
+ public static String LaunchConfigurationDialog_Dont_Save_Button;
+ public static String LaunchConfigurationDialog_Discard_Button;
+ public static String LaunchConfigurationDialog_Dont_Discard_Button;
public static String LaunchConfigurationDialog_Do_you_wish_to_delete_the_selected_launch_configurations__1;
public static String LaunchConfigurationDialog_Do_you_wish_to_delete_the_selected_launch_configuration__2;
public static String LaunchConfigurationDialog_Confirm_Launch_Configuration_Deletion_3;
@@ -93,6 +95,7 @@ public class LaunchConfigurationsMessages extends NLS {
public static String LaunchConfigurationsDialog_Information_3;
public static String LaunchConfigurationSelectionDialog_0;
public static String LaunchConfigurationSelectionDialog_1;
+ public static String LaunchConfigurationSelectionDialog_deleteButtonLabel;
public static String LaunchConfigurationTabGroupViewer_14;
@@ -169,6 +172,7 @@ public class LaunchConfigurationsMessages extends NLS {
public static String PerspectiveManager_15;
public static String PerspectiveManager_suspend_description;
public static String PerspectiveManager_launch_description;
+ public static String PerspectiveManager_switch;
public static String DebugModePromptStatusHandler_0;
public static String DebugModePromptStatusHandler_1;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
index 8c5151b19..fff4d4cca 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2016 IBM Corporation and others.
+# Copyright (c) 2000, 2017 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -81,7 +81,6 @@ LaunchConfigurationFilteredTree_save_changes=Save Changes
LaunchConfigurationFilteredTree_search_with_changes=You cannot perform a text search when the current configuration has pending changes.\n\nDo you want to save the changes and continue searching?
LaunchConfigurationFilteredTree_search_with_errors=You cannot perform a text search when the current configuration has errors.\n\nDo you want to discard the changes and continue searching?
LaunchConfigurationDialog_Name_required_for_launch_configuration_11=A name is required for the configuration
-LaunchConfigurationDialog_No_33=No
LaunchConfigurationEditDialog_0=Modify configuration and continue.
LaunchConfigurationEditDialog_1=Con&tinue
LaunchConfigurationDialog_Ready_to_launch_2=Ready to launch
@@ -89,7 +88,10 @@ LaunchConfigurationDialog_The_configuration___29=The configuration "{0}" has uns
LaunchConfigurationDialog_The_configuration___35=The configuration "{0}" has unsaved changes that CANNOT be saved because of the following error:\n\n
LaunchConfigurationFilteredTree_discard_changes=Discard Changes
LaunchConfigurationDialog_unspecified_28=unspecified
-LaunchConfigurationDialog_Yes_32=Yes
+LaunchConfigurationDialog_Save_Button=&Save
+LaunchConfigurationDialog_Dont_Save_Button=Do&n't Save
+LaunchConfigurationDialog_Discard_Button=&Discard
+LaunchConfigurationDialog_Dont_Discard_Button=Do&n't Discard
LaunchConfigurationDialog_Do_you_wish_to_delete_the_selected_launch_configurations__1=Do you wish to delete the selected launch configurations?
LaunchConfigurationDialog_Do_you_wish_to_delete_the_selected_launch_configuration__2=Do you wish to delete the selected launch configuration?
LaunchConfigurationDialog_Confirm_Launch_Configuration_Deletion_3=Confirm Launch Configuration Deletion
@@ -106,6 +108,7 @@ LaunchConfigurationSelectionDialog_0=Select Configuration
LaunchConfigurationSelectionDialog_1=&Select a configuration to launch:
LaunchConfigurationView_0=Filter matched {0} of {1} items
LaunchConfigurationsDialog_c_ancel=Cancel
+LaunchConfigurationSelectionDialog_deleteButtonLabel=&Delete
# {0} is substituted with a launch mode - possible values include run, debug, profile, or
# any label of a contributed ILaunchMode.
@@ -183,10 +186,11 @@ FavoritesDialog_8=Updating Favorites...
OrganizeFavoritesAction_0=Organize Fa&vorites...
PerspectiveManager_12=Confirm Perspective Switch
-PerspectiveManager_13=This kind of launch is configured to open the {0} perspective when it suspends. Do you want to open this perspective now?
-PerspectiveManager_15=This kind of launch is associated with the {0} perspective. Do you want to open this perspective now?
-PerspectiveManager_suspend_description=This kind of launch is configured to open the {0} perspective when it suspends.\n\n{1}\n\nDo you want to open this perspective now?
-PerspectiveManager_launch_description=This kind of launch is associat