diff options
author | eutarass | 2008-02-21 23:25:18 +0000 |
---|---|---|
committer | eutarass | 2008-02-21 23:25:18 +0000 |
commit | 521178c66ba2989ab837a9d7bb1c4a75216cfde2 (patch) | |
tree | 712d92bd8ef1fd4860d8f56f8a9b905bb2f216c8 /plugins | |
parent | 39964814a5c76b9c259bb2f670cb84e4d299abef (diff) | |
download | org.eclipse.tcf-521178c66ba2989ab837a9d7bb1c4a75216cfde2.tar.gz org.eclipse.tcf-521178c66ba2989ab837a9d7bb1c4a75216cfde2.tar.xz org.eclipse.tcf-521178c66ba2989ab837a9d7bb1c4a75216cfde2.zip |
In order to comply with naming conventions at Eclipse, plugins, packages, etc. are renamed from com.windriver.* to org.eclipse.tm.*
Copyright notices are updated to include year 2008.
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/com.windriver.debug.tcf.core/.project | 28 | ||||
-rw-r--r-- | plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/ITCFFileService.java | 21 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/.classpath (renamed from plugins/com.windriver.debug.tcf.ui/.classpath) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/.cvsignore (renamed from plugins/com.windriver.debug.tcf.ui/.cvsignore) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/.project (renamed from plugins/com.windriver.tcf.dsf.core/.project) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/com.windriver.debug.tcf.core/.settings/org.eclipse.jdt.core.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/.settings/org.eclipse.jdt.ui.prefs (renamed from plugins/com.windriver.debug.tcf.ui/.settings/org.eclipse.jdt.ui.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/META-INF/MANIFEST.MF (renamed from plugins/com.windriver.debug.tcf.ui/META-INF/MANIFEST.MF) | 12 | ||||
-rw-r--r--[-rwxr-xr-x] | plugins/org.eclipse.tm.tcf.debug.ui/about.html (renamed from plugins/com.windriver.debug.tcf.core/about.html) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/build.properties (renamed from plugins/com.windriver.debug.tcf.ui/build.properties) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/icons/arguments_tab.gif (renamed from plugins/com.windriver.debug.tcf.ui/icons/arguments_tab.gif) | bin | 95 -> 95 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/icons/tcf.gif (renamed from plugins/com.windriver.debug.tcf.ui/icons/tcf.gif) | bin | 165 -> 165 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties (renamed from plugins/com.windriver.debug.tcf.ui/plugin.properties) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/plugin.xml (renamed from plugins/com.windriver.debug.tcf.ui/plugin.xml) | 34 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/Activator.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/TCFUI.java) | 16 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFBreakpointAdapterFactory.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/adapters/TCFBreakpointAdapterFactory.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchAdapterFactory.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/adapters/TCFLaunchAdapterFactory.java) | 14 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFModelSelectionPolicyFactoryAdapter.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/adapters/TCFModelSelectionPolicyFactoryAdapter.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/BreakpointCommand.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/BreakpointCommand.java) | 12 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/DisconnectCommand.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/DisconnectCommand.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/ResumeCommand.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/ResumeCommand.java) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/StepIntoCommand.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/StepIntoCommand.java) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/StepOverCommand.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/StepOverCommand.java) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/StepReturnCommand.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/StepReturnCommand.java) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/SuspendCommand.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/SuspendCommand.java) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/TerminateCommand.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/TerminateCommand.java) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFArgumentsTab.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFArgumentsTab.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFMainTab.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFMainTab.java) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFSelfTest.java) | 51 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTabGroup.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFTabGroup.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TestErrorsDialog.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TestErrorsDialog.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildren.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildren.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenExecContext.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildrenExecContext.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenRegisters.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildrenRegisters.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenStackTrace.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildrenStackTrace.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFColumnPresentationRegister.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFColumnPresentationRegister.java) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModel.java) | 28 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelManager.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelManager.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelPresentation.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelPresentation.java) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelProxy.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelProxy.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelSelectionPolicy.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelSelectionPolicy.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNode.java) | 12 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeExecContext.java) | 12 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeLaunch.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeLaunch.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeRegister.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeRegister.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeStackFrame.java) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFRunnable.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFRunnable.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/trace/TraceView.java (renamed from plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/trace/TraceView.java) | 12 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/.classpath (renamed from plugins/com.windriver.debug.tcf.core/.classpath) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/.cvsignore (renamed from plugins/com.windriver.debug.tcf.core/.cvsignore) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/.project (renamed from plugins/com.windriver.tcf.rse.ui/.project) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/com.windriver.debug.tcf.ui/.settings/org.eclipse.jdt.core.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/.settings/org.eclipse.jdt.ui.prefs (renamed from plugins/com.windriver.debug.tcf.core/.settings/org.eclipse.jdt.ui.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/.settings/org.eclipse.ltk.core.refactoring.prefs (renamed from plugins/com.windriver.debug.tcf.core/.settings/org.eclipse.ltk.core.refactoring.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF (renamed from plugins/com.windriver.debug.tcf.core/META-INF/MANIFEST.MF) | 11 | ||||
-rw-r--r--[-rwxr-xr-x] | plugins/org.eclipse.tm.tcf.debug/about.html (renamed from plugins/com.windriver.debug.tcf.ui/about.html) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/build.properties (renamed from plugins/com.windriver.debug.tcf.core/build.properties) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/plugin.properties (renamed from plugins/com.windriver.debug.tcf.core/plugin.properties) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/plugin.xml (renamed from plugins/com.windriver.debug.tcf.core/plugin.xml) | 24 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/Activator.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/TCFCore.java) | 16 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFLaunchDelegate.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFLaunchDelegate.java) | 12 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupDirector.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFSourceLookupDirector.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupParticipant.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFSourceLookupParticipant.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourcePathComputerDelegate.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFSourcePathComputerDelegate.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/ITCFBreakpointListener.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/ITCFBreakpointListener.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/ITCFConstants.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/ITCFConstants.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFBreakpoint.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFBreakpoint.java) | 14 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFBreakpointsModel.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFBreakpointsModel.java) | 26 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFBreakpointsStatus.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFBreakpointsStatus.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFError.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFError.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java (renamed from plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFLaunch.java) | 24 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/.classpath (renamed from plugins/com.windriver.tcf.api/.classpath) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/.project (renamed from plugins/com.windriver.debug.tcf.ui/.project) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/com.windriver.tcf.api/.settings/org.eclipse.jdt.core.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/.settings/org.eclipse.jdt.ui.prefs (renamed from plugins/com.windriver.tcf.dsf.ui/.settings/org.eclipse.jdt.ui.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF (renamed from plugins/com.windriver.tcf.dsf.ui/META-INF/MANIFEST.MF) | 12 | ||||
-rw-r--r--[-rwxr-xr-x] | plugins/org.eclipse.tm.tcf.dsf.ui/about.html (renamed from plugins/com.windriver.tcf.api/about.html) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/build.properties (renamed from plugins/com.windriver.tcf.dsf.ui/build.properties) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/icons/tcf.gif (renamed from plugins/com.windriver.tcf.dsf.ui/icons/tcf.gif) | bin | 165 -> 165 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/plugin.properties (renamed from plugins/com.windriver.tcf.dsf.ui/plugin.properties) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/plugin.xml (renamed from plugins/com.windriver.tcf.dsf.ui/plugin.xml) | 14 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/Activator.java (renamed from plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/Activator.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/AdapterFactory.java (renamed from plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/AdapterFactory.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/ContainerLayoutNode.java (renamed from plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/ContainerLayoutNode.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/LaunchDialogTabGroup.java (renamed from plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/LaunchDialogTabGroup.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/LaunchVMProvider.java (renamed from plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/LaunchVMProvider.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/ThreadLayoutNode.java (renamed from plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/ThreadLayoutNode.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/ViewModelAdapter.java (renamed from plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/ViewModelAdapter.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/.classpath (renamed from plugins/com.windriver.tcf.dsf.core/.classpath) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/.project (renamed from plugins/com.windriver.tcf.dsf.ui/.project) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/com.windriver.tcf.dsf.core/.settings/org.eclipse.jdt.core.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/.settings/org.eclipse.jdt.ui.prefs (renamed from plugins/com.windriver.tcf.dsf.core/.settings/org.eclipse.jdt.ui.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/META-INF/MANIFEST.MF (renamed from plugins/com.windriver.tcf.dsf.core/META-INF/MANIFEST.MF) | 12 | ||||
-rw-r--r--[-rwxr-xr-x] | plugins/org.eclipse.tm.tcf.dsf/about.html (renamed from plugins/com.windriver.tcf.dsf.core/about.html) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/build.properties (renamed from plugins/com.windriver.tcf.dsf.core/build.properties) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/plugin.properties (renamed from plugins/com.windriver.tcf.dsf.core/plugin.properties) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/plugin.xml (renamed from plugins/com.windriver.tcf.dsf.core/plugin.xml) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/Activator.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/Activator.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFExecuter.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFExecuter.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunch.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFLaunch.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchDelegate.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFLaunchDelegate.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchSequence.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFLaunchSequence.java) | 166 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/IDataRequest.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/IDataRequest.java) | 34 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFAddress.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFAddress.java) | 170 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFBreakpoints.java) | 613 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFExecutionDMC.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFExecutionDMC.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFMemory.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFMemory.java) | 614 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFNativeProcesses.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFNativeProcesses.java) | 26 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFProcessDMC.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFProcessDMC.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFRegisters.java) | 2120 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRunControl.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFRunControl.java) | 80 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFStack.java) | 1032 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStepQueueManager.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFStepQueueManager.java) | 466 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFThreadDMC.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFThreadDMC.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDataCache.java (renamed from plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDataCache.java) | 211 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/.classpath (renamed from plugins/com.windriver.tcf.dsf.ui/.classpath) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/.project | 28 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/com.windriver.tcf.dsf.ui/.settings/org.eclipse.jdt.core.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/.settings/org.eclipse.jdt.ui.prefs (renamed from plugins/com.windriver.tcf.rse.ui/.settings/org.eclipse.jdt.ui.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/META-INF/MANIFEST.MF (renamed from plugins/com.windriver.tcf.rse.ui/META-INF/MANIFEST.MF) | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | plugins/org.eclipse.tm.tcf.rse/about.html (renamed from plugins/com.windriver.tcf.dsf.ui/about.html) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/build.properties (renamed from plugins/com.windriver.tcf.rse.ui/build.properties) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/icons/process-r.gif (renamed from plugins/com.windriver.tcf.rse.ui/icons/process-r.gif) | bin | 582 -> 582 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/icons/process-s.gif (renamed from plugins/com.windriver.tcf.rse.ui/icons/process-s.gif) | bin | 344 -> 344 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/icons/system-files-live.gif (renamed from plugins/com.windriver.tcf.rse.ui/icons/system-files-live.gif) | bin | 224 -> 224 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/icons/system-files.gif (renamed from plugins/com.windriver.tcf.rse.ui/icons/system-files.gif) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/icons/system-processes-live.gif (renamed from plugins/com.windriver.tcf.rse.ui/icons/system-processes-live.gif) | bin | 594 -> 594 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/icons/system-processes.gif (renamed from plugins/com.windriver.tcf.rse.ui/icons/system-processes.gif) | bin | 574 -> 574 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/icons/tcf.gif (renamed from plugins/com.windriver.tcf.rse.ui/icons/tcf.gif) | bin | 165 -> 165 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/icons/thread-r.gif (renamed from plugins/com.windriver.tcf.rse.ui/icons/thread-r.gif) | bin | 925 -> 925 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/icons/thread-s.gif (renamed from plugins/com.windriver.tcf.rse.ui/icons/thread-s.gif) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/plugin.properties (renamed from plugins/com.windriver.tcf.rse.ui/plugin.properties) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/plugin.xml (renamed from plugins/com.windriver.tcf.rse.ui/plugin.xml) | 18 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/Activator.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/Activator.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/ITCFSubSystem.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/ITCFSubSystem.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/Messages.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/Messages.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorService.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFConnectorService.java) | 22 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorServiceManager.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFConnectorServiceManager.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFRSETask.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFRSETask.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileAdapter.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileAdapter.java) | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileResource.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileResource.java) | 10 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileService.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileService.java) | 32 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileSubSystemConfiguration.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFRemoteFile.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFRemoteFile.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/messages.properties (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/messages.properties) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessAdapter.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessAdapter.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessResource.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessResource.java) | 12 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessService.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessService.java) | 12 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessSubSystemConfiguration.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFRemoteProcess.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFRemoteProcess.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewProcessAdapterFactory.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFSystemViewProcessAdapterFactory.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewRemoteProcessAdapter.java (renamed from plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFSystemViewRemoteProcessAdapter.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/.classpath (renamed from plugins/com.windriver.tcf.rse.ui/.classpath) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/.cvsignore (renamed from plugins/com.windriver.tcf.api/.cvsignore) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/.project (renamed from plugins/com.windriver.tcf.api/.project) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/com.windriver.tcf.rse.ui/.settings/org.eclipse.jdt.core.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.ui.prefs (renamed from plugins/com.windriver.tcf.api/.settings/org.eclipse.jdt.ui.prefs) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/META-INF/MANIFEST.MF (renamed from plugins/com.windriver.tcf.api/META-INF/MANIFEST.MF) | 12 | ||||
-rw-r--r--[-rwxr-xr-x] | plugins/org.eclipse.tm.tcf/about.html (renamed from plugins/com.windriver.tcf.rse.ui/about.html) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/build.properties (renamed from plugins/com.windriver.tcf.api/build.properties) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/plugin.properties (renamed from plugins/com.windriver.tcf.api/plugin.properties) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/plugin.xml (renamed from plugins/com.windriver.tcf.api/plugin.xml) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/schema/startup.exsd (renamed from plugins/com.windriver.tcf.api/schema/startup.exsd) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/ChannelLoop.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/ChannelLoop.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/LocalPeer.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/LocalPeer.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/ReadOnlyCollection.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/ReadOnlyCollection.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/ReadOnlyMap.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/ReadOnlyMap.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/RemotePeer.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/RemotePeer.java) | 11 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/Token.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/Token.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/Transport.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/Transport.java) | 25 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/local/DiagnosticsService.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/local/DiagnosticsService.java) | 17 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/local/LocatorService.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/local/LocatorService.java) | 37 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/BreakpointsProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/BreakpointsProxy.java) | 15 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/DiagnosticsProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/DiagnosticsProxy.java) | 13 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/FileSystemProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/FileSystemProxy.java) | 15 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/GenericProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/GenericProxy.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/LineNumbersProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/LineNumbersProxy.java) | 11 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/LocatorProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/LocatorProxy.java) | 19 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/MemoryProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/MemoryProxy.java) | 19 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/ProcessesProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/ProcessesProxy.java) | 13 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/RegistersProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/RegistersProxy.java) | 15 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/RunControlProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/RunControlProxy.java) | 17 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/StackTraceProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/StackTraceProxy.java) | 13 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/SysMonitorProxy.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/SysMonitorProxy.java) | 15 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/Activator.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/Activator.java) | 12 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/ErrorCodes.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/ErrorCodes.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/EventQueue.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/EventQueue.java) | 11 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/AbstractChannel.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/AbstractChannel.java) | 33 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/AbstractPeer.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/AbstractPeer.java) | 15 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/Base64.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/Base64.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/ChannelTCP.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/ChannelTCP.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/Command.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/Command.java) | 17 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/StreamChannel.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/StreamChannel.java) | 7 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IChannel.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IChannel.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IEventQueue.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IEventQueue.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IPeer.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IPeer.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IService.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IService.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IToken.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IToken.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/JSON.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/JSON.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/Protocol.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/Protocol.java) | 13 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IBreakpoints.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IBreakpoints.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IDiagnostics.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IDiagnostics.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IFileSystem.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IFileSystem.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/ILineNumbers.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/ILineNumbers.java) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/ILocator.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/ILocator.java) | 13 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IMemory.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IMemory.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IProcesses.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IProcesses.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IRegisters.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IRegisters.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IRunControl.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IRunControl.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IStackTrace.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IStackTrace.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/ISysMonitor.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/ISysMonitor.java) | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/util/TCFFileInputStream.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/util/TCFFileInputStream.java) | 15 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/util/TCFFileOutputStream.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/util/TCFFileOutputStream.java) | 13 | ||||
-rw-r--r-- | plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/util/TCFTask.java (renamed from plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/util/TCFTask.java) | 7 |
214 files changed, 3615 insertions, 3575 deletions
diff --git a/plugins/com.windriver.debug.tcf.core/.project b/plugins/com.windriver.debug.tcf.core/.project deleted file mode 100644 index 8a5b1f874..000000000 --- a/plugins/com.windriver.debug.tcf.core/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>com.windriver.debug.tcf.core</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/ITCFFileService.java b/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/ITCFFileService.java deleted file mode 100644 index c0a981cb6..000000000 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/ITCFFileService.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Wind River Systems, 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: - * Wind River Systems - initial API and implementation - *******************************************************************************/ -package com.windriver.tcf.rse.ui; - -import com.windriver.tcf.api.services.IFileSystem; - -public interface ITCFFileService { - - public boolean canRead(IFileSystem.FileAttrs attrs); - - public boolean canWrite(IFileSystem.FileAttrs attrs); - -} diff --git a/plugins/com.windriver.debug.tcf.ui/.classpath b/plugins/org.eclipse.tm.tcf.debug.ui/.classpath index 34c64f6b9..34c64f6b9 100644 --- a/plugins/com.windriver.debug.tcf.ui/.classpath +++ b/plugins/org.eclipse.tm.tcf.debug.ui/.classpath diff --git a/plugins/com.windriver.debug.tcf.ui/.cvsignore b/plugins/org.eclipse.tm.tcf.debug.ui/.cvsignore index 092357e47..092357e47 100644 --- a/plugins/com.windriver.debug.tcf.ui/.cvsignore +++ b/plugins/org.eclipse.tm.tcf.debug.ui/.cvsignore diff --git a/plugins/com.windriver.tcf.dsf.core/.project b/plugins/org.eclipse.tm.tcf.debug.ui/.project index afac03b39..5195fd147 100644 --- a/plugins/com.windriver.tcf.dsf.core/.project +++ b/plugins/org.eclipse.tm.tcf.debug.ui/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>com.windriver.tcf.dsf.core</name> + <name>org.eclipse.tm.tcf.debug.ui</name> <comment></comment> <projects> </projects> diff --git a/plugins/com.windriver.debug.tcf.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.tcf.debug.ui/.settings/org.eclipse.jdt.core.prefs index 0bf81e2f5..0bf81e2f5 100644 --- a/plugins/com.windriver.debug.tcf.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.tm.tcf.debug.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/com.windriver.debug.tcf.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.tcf.debug.ui/.settings/org.eclipse.jdt.ui.prefs index 12735e141..12735e141 100644 --- a/plugins/com.windriver.debug.tcf.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.tm.tcf.debug.ui/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/com.windriver.debug.tcf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf.debug.ui/META-INF/MANIFEST.MF index 5f3d130f8..6380463c6 100644 --- a/plugins/com.windriver.debug.tcf.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.tcf.debug.ui/META-INF/MANIFEST.MF @@ -1,19 +1,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: com.windriver.debug.tcf.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.tcf.debug.ui;singleton:=true Bundle-Version: 0.2.0 -Bundle-Activator: com.windriver.debug.tcf.ui.TCFUI +Bundle-Activator: org.eclipse.tm.internal.tcf.debug.ui.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.debug.core, org.eclipse.debug.ui, - com.windriver.debug.tcf.core, - com.windriver.tcf.api + org.eclipse.tm.tcf.debug, + org.eclipse.tm.tcf Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true -Export-Package: com.windriver.debug.tcf.ui.adapters, - com.windriver.debug.tcf.ui.launch +Export-Package: org.eclipse.tm.internal.tcf.debug.ui.adapters, + org.eclipse.tm.internal.tcf.debug.ui.launch diff --git a/plugins/com.windriver.debug.tcf.core/about.html b/plugins/org.eclipse.tm.tcf.debug.ui/about.html index 6c5b3615b..6c5b3615b 100755..100644 --- a/plugins/com.windriver.debug.tcf.core/about.html +++ b/plugins/org.eclipse.tm.tcf.debug.ui/about.html diff --git a/plugins/com.windriver.debug.tcf.ui/build.properties b/plugins/org.eclipse.tm.tcf.debug.ui/build.properties index bd51a9b0f..bd51a9b0f 100644 --- a/plugins/com.windriver.debug.tcf.ui/build.properties +++ b/plugins/org.eclipse.tm.tcf.debug.ui/build.properties diff --git a/plugins/com.windriver.debug.tcf.ui/icons/arguments_tab.gif b/plugins/org.eclipse.tm.tcf.debug.ui/icons/arguments_tab.gif Binary files differindex 44660b5f0..44660b5f0 100644 --- a/plugins/com.windriver.debug.tcf.ui/icons/arguments_tab.gif +++ b/plugins/org.eclipse.tm.tcf.debug.ui/icons/arguments_tab.gif diff --git a/plugins/com.windriver.debug.tcf.ui/icons/tcf.gif b/plugins/org.eclipse.tm.tcf.debug.ui/icons/tcf.gif Binary files differindex 3198679ae..3198679ae 100644 --- a/plugins/com.windriver.debug.tcf.ui/icons/tcf.gif +++ b/plugins/org.eclipse.tm.tcf.debug.ui/icons/tcf.gif diff --git a/plugins/com.windriver.debug.tcf.ui/plugin.properties b/plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties index c791ca4f7..0c99bf9d4 100644 --- a/plugins/com.windriver.debug.tcf.ui/plugin.properties +++ b/plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007 Wind River Systems, Inc. and others. +# Copyright (c) 2007, 2008 Wind River Systems, 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 diff --git a/plugins/com.windriver.debug.tcf.ui/plugin.xml b/plugins/org.eclipse.tm.tcf.debug.ui/plugin.xml index 1b9952180..57d19127c 100644 --- a/plugins/com.windriver.debug.tcf.ui/plugin.xml +++ b/plugins/org.eclipse.tm.tcf.debug.ui/plugin.xml @@ -2,22 +2,22 @@ <?eclipse version="3.2"?> <plugin> - <extension point="com.windriver.tcf.api.startup"/> + <extension point="org.eclipse.tm.tcf.startup"/> <extension - id="com.windriver.debug.tcf.ui.adapters" + id="org.eclipse.tm.tcf.debug.ui.adapters" point="org.eclipse.core.runtime.adapters"> <factory - class="com.windriver.debug.tcf.ui.adapters.TCFLaunchAdapterFactory" - adaptableType="com.windriver.debug.tcf.core.model.TCFLaunch"> + class="org.eclipse.tm.internal.tcf.debug.ui.adapters.TCFLaunchAdapterFactory" + adaptableType="org.eclipse.tm.internal.tcf.debug.model.TCFLaunch"> <adapter type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider"/> <adapter type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider"/> <adapter type="org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory"/> <adapter type="org.eclipse.debug.core.commands.ITerminateHandler"/> </factory> <factory - class="com.windriver.debug.tcf.ui.adapters.TCFBreakpointAdapterFactory" - adaptableType="com.windriver.debug.tcf.ui.model.TCFNode"> + class="org.eclipse.tm.internal.tcf.debug.ui.adapters.TCFBreakpointAdapterFactory" + adaptableType="org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode"> <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/> <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension"/> </factory> @@ -26,8 +26,8 @@ <extension point="org.eclipse.debug.ui.debugModelPresentations"> <debugModelPresentation - class = "com.windriver.debug.tcf.ui.model.TCFModelPresentation" - id = "com.windriver.debug.tcf"> + class = "org.eclipse.tm.internal.tcf.debug.ui.model.TCFModelPresentation" + id = "org.eclipse.tm.tcf.debug"> </debugModelPresentation> </extension> @@ -35,18 +35,18 @@ point="org.eclipse.debug.ui.launchConfigurationTypeImages"> <launchConfigurationTypeImage icon="icons/tcf.gif" - configTypeID="com.windriver.debug.tcf.LaunchConfigurationType" - id="com.windriver.debug.tcf.LaunchConfigurationTypeImage"> + configTypeID="org.eclipse.tm.tcf.debug.LaunchConfigurationType" + id="org.eclipse.tm.tcf.debug.LaunchConfigurationTypeImage"> </launchConfigurationTypeImage> </extension> <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups"> <launchConfigurationTabGroup - type="com.windriver.debug.tcf.LaunchConfigurationType" + type="org.eclipse.tm.tcf.debug.LaunchConfigurationType" description="Run or debug a program using Target Communication Framework" - class="com.windriver.debug.tcf.ui.launch.TCFTabGroup" - id="com.windriver.debug.tcf.LaunchConfigurationTabGroup"> + class="org.eclipse.tm.internal.tcf.debug.ui.launch.TCFTabGroup" + id="org.eclipse.tm.tcf.debug.LaunchConfigurationTabGroup"> </launchConfigurationTabGroup> </extension> @@ -55,7 +55,7 @@ <context name="Debugging using Target Communication Framework" description="Debugging using Target Communication Framework" - id="com.windriver.debug.tcf.ui.debugging" + id="org.eclipse.tm.tcf.debug.ui.debugging" parentId="org.eclipse.debug.ui.debugging"> </context> </extension> @@ -66,8 +66,8 @@ name="TCF Trace" icon="icons/tcf.gif" category="org.eclipse.debug.ui" - class="com.windriver.debug.tcf.ui.trace.TraceView" - id="com.windriver.tcf.TraceView"> + class="org.eclipse.tm.internal.tcf.debug.ui.trace.TraceView" + id="org.eclipse.tm.tcf.TraceView"> </view> </extension> @@ -78,7 +78,7 @@ <view relative="org.eclipse.ui.console.ConsoleView" relationship="stack" - id="com.windriver.tcf.TraceView"> + id="org.eclipse.tm.tcf.TraceView"> </view> </perspectiveExtension> </extension> diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/TCFUI.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/Activator.java index 5ce3dbb2b..ff1ae2792 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/TCFUI.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,26 +8,26 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui; +package org.eclipse.tm.internal.tcf.debug.ui; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModelManager; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; import org.osgi.framework.BundleListener; -import com.windriver.debug.tcf.ui.model.TCFModelManager; /** * The activator class controls the plug-in life cycle */ -public class TCFUI extends AbstractUIPlugin { +public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "com.windriver.debug.tcf.ui"; + public static final String PLUGIN_ID = "org.eclipse.tm.tcf.debug.ui"; // The shared instance - private static TCFUI plugin; + private static Activator plugin; private static TCFModelManager model_manager; private static final BundleListener bundle_listener = new BundleListener() { @@ -43,7 +43,7 @@ public class TCFUI extends AbstractUIPlugin { /** * The constructor */ - public TCFUI() { + public Activator() { plugin = this; } @@ -70,7 +70,7 @@ public class TCFUI extends AbstractUIPlugin { * * @return the shared instance */ - public static TCFUI getDefault() { + public static Activator getDefault() { return plugin; } diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/adapters/TCFBreakpointAdapterFactory.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFBreakpointAdapterFactory.java index c5f428dac..8bd8e49e9 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/adapters/TCFBreakpointAdapterFactory.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFBreakpointAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,14 +8,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.adapters; +package org.eclipse.tm.internal.tcf.debug.ui.adapters; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget; import org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension; +import org.eclipse.tm.internal.tcf.debug.ui.commands.BreakpointCommand; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode; -import com.windriver.debug.tcf.ui.commands.BreakpointCommand; -import com.windriver.debug.tcf.ui.model.TCFNode; public class TCFBreakpointAdapterFactory implements IAdapterFactory { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/adapters/TCFLaunchAdapterFactory.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchAdapterFactory.java index 4159fcea4..616297dee 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/adapters/TCFLaunchAdapterFactory.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,18 +8,18 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.adapters; +package org.eclipse.tm.internal.tcf.debug.ui.adapters; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.debug.core.commands.ITerminateHandler; import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory; +import org.eclipse.tm.internal.tcf.debug.model.TCFLaunch; +import org.eclipse.tm.internal.tcf.debug.ui.Activator; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel; +import org.eclipse.tm.tcf.protocol.Protocol; -import com.windriver.debug.tcf.core.model.TCFLaunch; -import com.windriver.debug.tcf.ui.TCFUI; -import com.windriver.debug.tcf.ui.model.TCFModel; -import com.windriver.tcf.api.protocol.Protocol; public class TCFLaunchAdapterFactory implements IAdapterFactory { @@ -38,7 +38,7 @@ public class TCFLaunchAdapterFactory implements IAdapterFactory { Protocol.invokeAndWait(new Runnable() { public void run() { TCFLaunch launch = (TCFLaunch)from; - TCFModel model = TCFUI.getModelManager().getModel(launch); + TCFModel model = Activator.getModelManager().getModel(launch); if (model != null) { if (to.isInstance(model)) { res[0] = model; diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/adapters/TCFModelSelectionPolicyFactoryAdapter.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFModelSelectionPolicyFactoryAdapter.java index d8ad27b10..dd2ba0ab4 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/adapters/TCFModelSelectionPolicyFactoryAdapter.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFModelSelectionPolicyFactoryAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.adapters; +package org.eclipse.tm.internal.tcf.debug.ui.adapters; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicy; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicyFactory; diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/BreakpointCommand.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/BreakpointCommand.java index 12ec02760..fe914489b 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/BreakpointCommand.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/BreakpointCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.commands; +package org.eclipse.tm.internal.tcf.debug.ui.commands; import java.util.HashMap; import java.util.Map; @@ -18,12 +18,12 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.tm.internal.tcf.debug.model.TCFBreakpoint; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IBreakpoints; import org.eclipse.ui.IWorkbenchPart; -import com.windriver.debug.tcf.core.model.TCFBreakpoint; -import com.windriver.debug.tcf.ui.model.TCFNode; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IBreakpoints; public class BreakpointCommand implements IToggleBreakpointsTargetExtension { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/DisconnectCommand.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/DisconnectCommand.java index 3ef011689..854b173b0 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/DisconnectCommand.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/DisconnectCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,16 +8,16 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.commands; +package org.eclipse.tm.internal.tcf.debug.ui.commands; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.commands.IDebugCommandRequest; import org.eclipse.debug.core.commands.IDisconnectHandler; import org.eclipse.debug.core.commands.IEnabledStateRequest; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFRunnable; -import com.windriver.debug.tcf.ui.model.TCFModel; -import com.windriver.debug.tcf.ui.model.TCFRunnable; public class DisconnectCommand implements IDisconnectHandler { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/ResumeCommand.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/ResumeCommand.java index f4ecd5049..9e2db6f55 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/ResumeCommand.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/ResumeCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.commands; +package org.eclipse.tm.internal.tcf.debug.ui.commands; import java.util.HashSet; import java.util.Iterator; @@ -19,13 +19,13 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.commands.IDebugCommandRequest; import org.eclipse.debug.core.commands.IEnabledStateRequest; import org.eclipse.debug.core.commands.IResumeHandler; +import org.eclipse.tm.internal.tcf.debug.ui.Activator; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFRunnable; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IRunControl; -import com.windriver.debug.tcf.ui.TCFUI; -import com.windriver.debug.tcf.ui.model.TCFModel; -import com.windriver.debug.tcf.ui.model.TCFNode; -import com.windriver.debug.tcf.ui.model.TCFRunnable; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IRunControl; public class ResumeCommand implements IResumeHandler { @@ -97,7 +97,7 @@ public class ResumeCommand implements IResumeHandler { cmds.remove(token); if (error != null) { monitor.setStatus(new Status(IStatus.ERROR, - TCFUI.PLUGIN_ID, IStatus.OK, "Cannot resume", error)); + Activator.PLUGIN_ID, IStatus.OK, "Cannot resume", error)); } if (cmds.isEmpty()) done(); } diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/StepIntoCommand.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/StepIntoCommand.java index 76e09d274..279dac6dc 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/StepIntoCommand.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/StepIntoCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.commands; +package org.eclipse.tm.internal.tcf.debug.ui.commands; import java.util.HashSet; import java.util.Iterator; @@ -19,13 +19,13 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.commands.IDebugCommandRequest; import org.eclipse.debug.core.commands.IEnabledStateRequest; import org.eclipse.debug.core.commands.IStepIntoHandler; +import org.eclipse.tm.internal.tcf.debug.ui.Activator; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFRunnable; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IRunControl; -import com.windriver.debug.tcf.ui.TCFUI; -import com.windriver.debug.tcf.ui.model.TCFModel; -import com.windriver.debug.tcf.ui.model.TCFNode; -import com.windriver.debug.tcf.ui.model.TCFRunnable; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IRunControl; public class StepIntoCommand implements IStepIntoHandler { @@ -93,7 +93,7 @@ public class StepIntoCommand implements IStepIntoHandler { cmds.remove(token); if (error != null) { monitor.setStatus(new Status(IStatus.ERROR, - TCFUI.PLUGIN_ID, IStatus.OK, "Cannot step into", error)); + Activator.PLUGIN_ID, IStatus.OK, "Cannot step into", error)); } if (cmds.isEmpty()) done(); } diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/StepOverCommand.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/StepOverCommand.java index 3a8170fbb..7c22553e9 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/StepOverCommand.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/StepOverCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.commands; +package org.eclipse.tm.internal.tcf.debug.ui.commands; import java.util.HashSet; import java.util.Iterator; @@ -19,13 +19,13 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.commands.IDebugCommandRequest; import org.eclipse.debug.core.commands.IEnabledStateRequest; import org.eclipse.debug.core.commands.IStepOverHandler; +import org.eclipse.tm.internal.tcf.debug.ui.Activator; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFRunnable; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IRunControl; -import com.windriver.debug.tcf.ui.TCFUI; -import com.windriver.debug.tcf.ui.model.TCFModel; -import com.windriver.debug.tcf.ui.model.TCFNode; -import com.windriver.debug.tcf.ui.model.TCFRunnable; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IRunControl; public class StepOverCommand implements IStepOverHandler { @@ -93,7 +93,7 @@ public class StepOverCommand implements IStepOverHandler { cmds.remove(token); if (error != null) { monitor.setStatus(new Status(IStatus.ERROR, - TCFUI.PLUGIN_ID, IStatus.OK, "Cannot step into", error)); + Activator.PLUGIN_ID, IStatus.OK, "Cannot step into", error)); } if (cmds.isEmpty()) done(); } diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/StepReturnCommand.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/StepReturnCommand.java index 8975a8155..e01a4d26a 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/StepReturnCommand.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/StepReturnCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.commands; +package org.eclipse.tm.internal.tcf.debug.ui.commands; import java.util.HashSet; import java.util.Iterator; @@ -19,13 +19,13 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.commands.IDebugCommandRequest; import org.eclipse.debug.core.commands.IEnabledStateRequest; import org.eclipse.debug.core.commands.IStepReturnHandler; +import org.eclipse.tm.internal.tcf.debug.ui.Activator; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFRunnable; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IRunControl; -import com.windriver.debug.tcf.ui.TCFUI; -import com.windriver.debug.tcf.ui.model.TCFModel; -import com.windriver.debug.tcf.ui.model.TCFNode; -import com.windriver.debug.tcf.ui.model.TCFRunnable; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IRunControl; public class StepReturnCommand implements IStepReturnHandler { @@ -93,7 +93,7 @@ public class StepReturnCommand implements IStepReturnHandler { cmds.remove(token); if (error != null) { monitor.setStatus(new Status(IStatus.ERROR, - TCFUI.PLUGIN_ID, IStatus.OK, "Cannot step into", error)); + Activator.PLUGIN_ID, IStatus.OK, "Cannot step into", error)); } if (cmds.isEmpty()) done(); } diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/SuspendCommand.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/SuspendCommand.java index 45419650e..1c354cf0c 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/SuspendCommand.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/SuspendCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.commands; +package org.eclipse.tm.internal.tcf.debug.ui.commands; import java.util.HashSet; import java.util.Iterator; @@ -19,13 +19,13 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.commands.IDebugCommandRequest; import org.eclipse.debug.core.commands.IEnabledStateRequest; import org.eclipse.debug.core.commands.ISuspendHandler; +import org.eclipse.tm.internal.tcf.debug.ui.Activator; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFRunnable; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IRunControl; -import com.windriver.debug.tcf.ui.TCFUI; -import com.windriver.debug.tcf.ui.model.TCFModel; -import com.windriver.debug.tcf.ui.model.TCFNode; -import com.windriver.debug.tcf.ui.model.TCFRunnable; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IRunControl; public class SuspendCommand implements ISuspendHandler { @@ -97,7 +97,7 @@ public class SuspendCommand implements ISuspendHandler { cmds.remove(token); if (error != null) { monitor.setStatus(new Status(IStatus.ERROR, - TCFUI.PLUGIN_ID, IStatus.OK, "Cannot suspend", error)); + Activator.PLUGIN_ID, IStatus.OK, "Cannot suspend", error)); } if (cmds.isEmpty()) done(); } diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/TerminateCommand.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/TerminateCommand.java index 81f16e12a..31bea2198 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/commands/TerminateCommand.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/TerminateCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.commands; +package org.eclipse.tm.internal.tcf.debug.ui.commands; import java.util.HashSet; import java.util.Iterator; @@ -19,13 +19,13 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.commands.IDebugCommandRequest; import org.eclipse.debug.core.commands.IEnabledStateRequest; import org.eclipse.debug.core.commands.ITerminateHandler; +import org.eclipse.tm.internal.tcf.debug.ui.Activator; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode; +import org.eclipse.tm.internal.tcf.debug.ui.model.TCFRunnable; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IRunControl; -import com.windriver.debug.tcf.ui.TCFUI; -import com.windriver.debug.tcf.ui.model.TCFModel; -import com.windriver.debug.tcf.ui.model.TCFNode; -import com.windriver.debug.tcf.ui.model.TCFRunnable; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IRunControl; public class TerminateCommand implements ITerminateHandler { @@ -106,7 +106,7 @@ public class TerminateCommand implements ITerminateHandler { cmds.remove(token); if (error != null) { monitor.setStatus(new Status(IStatus.ERROR, - TCFUI.PLUGIN_ID, IStatus.OK, "Cannot resume", error)); + Activator.PLUGIN_ID, IStatus.OK, "Cannot resume", error)); } if (cmds.isEmpty()) done(); } diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFArgumentsTab.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFArgumentsTab.java index 082d741bc..84d16915b 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFArgumentsTab.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFArgumentsTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.launch; +package org.eclipse.tm.internal.tcf.debug.ui.launch; import java.net.URL; @@ -33,9 +33,9 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Text; +import org.eclipse.tm.internal.tcf.debug.launch.TCFLaunchDelegate; +import org.eclipse.tm.internal.tcf.debug.ui.Activator; -import com.windriver.debug.tcf.core.launch.TCFLaunchDelegate; -import com.windriver.debug.tcf.ui.TCFUI; public class TCFArgumentsTab extends AbstractLaunchConfigurationTab { @@ -59,7 +59,7 @@ public class TCFArgumentsTab extends AbstractLaunchConfigurationTab { createArgumentsGroup(comp); createWorkingDirGroup(comp); - URL url = FileLocator.find(TCFUI.getDefault().getBundle(), + URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path("icons/arguments_tab.gif"), null); ImageDescriptor descriptor = null; if (url == null) { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFMainTab.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFMainTab.java index fb5892060..0d0361a05 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFMainTab.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFMainTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.launch; +package org.eclipse.tm.internal.tcf.debug.ui.launch; import java.net.URL; import java.util.ArrayList; @@ -49,13 +49,13 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.tm.internal.tcf.debug.launch.TCFLaunchDelegate; +import org.eclipse.tm.internal.tcf.debug.ui.Activator; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.ILocator; -import com.windriver.debug.tcf.core.launch.TCFLaunchDelegate; -import com.windriver.debug.tcf.ui.TCFUI; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.ILocator; /** * Launch configuration dialog tab to specify the Target Communication Framework @@ -703,7 +703,7 @@ public class TCFMainTab extends AbstractLaunchConfigurationTab { if (display == null) return null; Image image = image_cache.get(name); if (image == null) { - URL url = FileLocator.find(TCFUI.getDefault().getBundle(), new Path(name), null); + URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(name), null); ImageDescriptor descriptor = null; if (url == null) { descriptor = ImageDescriptor.getMissingImageDescriptor(); diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFSelfTest.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java index 65b7e5d03..98508b71b 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFSelfTest.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.launch; +package org.eclipse.tm.internal.tcf.debug.ui.launch; import java.io.IOException; import java.io.InputStream; @@ -24,29 +24,30 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IBreakpoints; -import com.windriver.tcf.api.services.IDiagnostics; -import com.windriver.tcf.api.services.IFileSystem; -import com.windriver.tcf.api.services.ILineNumbers; -import com.windriver.tcf.api.services.IMemory; -import com.windriver.tcf.api.services.IRegisters; -import com.windriver.tcf.api.services.IRunControl; -import com.windriver.tcf.api.services.IDiagnostics.ISymbol; -import com.windriver.tcf.api.services.IFileSystem.DirEntry; -import com.windriver.tcf.api.services.IFileSystem.FileAttrs; -import com.windriver.tcf.api.services.IFileSystem.FileSystemException; -import com.windriver.tcf.api.services.IFileSystem.IFileHandle; -import com.windriver.tcf.api.services.ILineNumbers.CodeArea; -import com.windriver.tcf.api.services.IMemory.MemoryContext; -import com.windriver.tcf.api.services.IMemory.MemoryError; -import com.windriver.tcf.api.services.IRegisters.RegistersContext; -import com.windriver.tcf.api.services.IRunControl.RunControlContext; -import com.windriver.tcf.api.util.TCFFileInputStream; -import com.windriver.tcf.api.util.TCFFileOutputStream; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IBreakpoints; +import org.eclipse.tm.tcf.services.IDiagnostics; +import org.eclipse.tm.tcf.services.IFileSystem; +import org.eclipse.tm.tcf.services.ILineNumbers; +import org.eclipse.tm.tcf.services.IMemory; +import org.eclipse.tm.tcf.services.IRegisters; +import org.eclipse.tm.tcf.services.IRunControl; +import org.eclipse.tm.tcf.services.IDiagnostics.ISymbol; +import org.eclipse.tm.tcf.services.IFileSystem.DirEntry; +import org.eclipse.tm.tcf.services.IFileSystem.FileAttrs; +import org.eclipse.tm.tcf.services.IFileSystem.FileSystemException; +import org.eclipse.tm.tcf.services.IFileSystem.IFileHandle; +import org.eclipse.tm.tcf.services.ILineNumbers.CodeArea; +import org.eclipse.tm.tcf.services.IMemory.MemoryContext; +import org.eclipse.tm.tcf.services.IMemory.MemoryError; +import org.eclipse.tm.tcf.services.IRegisters.RegistersContext; +import org.eclipse.tm.tcf.services.IRunControl.RunControlContext; +import org.eclipse.tm.tcf.util.TCFFileInputStream; +import org.eclipse.tm.tcf.util.TCFFileOutputStream; + class TCFSelfTest { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFTabGroup.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTabGroup.java index 8d06cafd5..39c53c999 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TCFTabGroup.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTabGroup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.launch; +package org.eclipse.tm.internal.tcf.debug.ui.launch; import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup; import org.eclipse.debug.ui.CommonTab; diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TestErrorsDialog.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TestErrorsDialog.java index 312e85c9a..e351548f9 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/launch/TestErrorsDialog.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TestErrorsDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.launch; +package org.eclipse.tm.internal.tcf.debug.ui.launch; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildren.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildren.java index 6cc6828a8..1fb8e602d 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildren.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildren.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.util.HashMap; import java.util.Map; diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildrenExecContext.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenExecContext.java index 51ca5a64b..d31df810c 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildrenExecContext.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenExecContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.util.HashMap; import java.util.HashSet; @@ -16,10 +16,10 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IMemory; +import org.eclipse.tm.tcf.services.IRunControl; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IMemory; -import com.windriver.tcf.api.services.IRunControl; /** * This class is used to maintain a dynamic list of both executable contexts and memory spaces diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildrenRegisters.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenRegisters.java index dcf374fb5..050bbfa7b 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildrenRegisters.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenRegisters.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,13 +8,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.util.HashMap; import java.util.Map; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IRegisters; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IRegisters; + public class TCFChildrenRegisters extends TCFChildren { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildrenStackTrace.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenStackTrace.java index 9d3dae027..ee77630e9 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFChildrenStackTrace.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenStackTrace.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,13 +8,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.util.HashMap; import java.util.Map; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IStackTrace; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IStackTrace; + public class TCFChildrenStackTrace extends TCFChildren { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFColumnPresentationRegister.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFColumnPresentationRegister.java index 8881fcb20..7a26c4220 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFColumnPresentationRegister.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFColumnPresentationRegister.java @@ -1,4 +1,4 @@ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModel.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java index 8982559ff..cddebcf9a 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModel.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.util.HashMap; import java.util.Map; @@ -36,19 +36,19 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationCont import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.swt.widgets.Display; +import org.eclipse.tm.internal.tcf.debug.model.TCFLaunch; +import org.eclipse.tm.internal.tcf.debug.ui.commands.DisconnectCommand; +import org.eclipse.tm.internal.tcf.debug.ui.commands.ResumeCommand; +import org.eclipse.tm.internal.tcf.debug.ui.commands.StepIntoCommand; +import org.eclipse.tm.internal.tcf.debug.ui.commands.StepOverCommand; +import org.eclipse.tm.internal.tcf.debug.ui.commands.StepReturnCommand; +import org.eclipse.tm.internal.tcf.debug.ui.commands.SuspendCommand; +import org.eclipse.tm.internal.tcf.debug.ui.commands.TerminateCommand; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IMemory; +import org.eclipse.tm.tcf.services.IRegisters; +import org.eclipse.tm.tcf.services.IRunControl; -import com.windriver.debug.tcf.core.model.TCFLaunch; -import com.windriver.debug.tcf.ui.commands.DisconnectCommand; -import com.windriver.debug.tcf.ui.commands.ResumeCommand; -import com.windriver.debug.tcf.ui.commands.StepIntoCommand; -import com.windriver.debug.tcf.ui.commands.StepOverCommand; -import com.windriver.debug.tcf.ui.commands.StepReturnCommand; -import com.windriver.debug.tcf.ui.commands.SuspendCommand; -import com.windriver.debug.tcf.ui.commands.TerminateCommand; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IMemory; -import com.windriver.tcf.api.services.IRegisters; -import com.windriver.tcf.api.services.IRunControl; public class TCFModel implements IElementContentProvider, IElementLabelProvider, IModelProxyFactory, IColumnPresentationFactory { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelManager.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelManager.java index cfb9c9688..b979d7989 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelManager.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.util.HashMap; import java.util.Iterator; @@ -18,9 +18,9 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchesListener; import org.eclipse.swt.widgets.Display; +import org.eclipse.tm.internal.tcf.debug.model.TCFLaunch; +import org.eclipse.tm.tcf.protocol.Protocol; -import com.windriver.debug.tcf.core.model.TCFLaunch; -import com.windriver.tcf.api.protocol.Protocol; public class TCFModelManager { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelPresentation.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelPresentation.java index 98efc2471..5608f3b6f 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelPresentation.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelPresentation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.util.Collection; import java.util.HashSet; @@ -26,6 +26,13 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; +import org.eclipse.tm.internal.tcf.debug.model.ITCFBreakpointListener; +import org.eclipse.tm.internal.tcf.debug.model.TCFBreakpoint; +import org.eclipse.tm.internal.tcf.debug.model.TCFBreakpointsStatus; +import org.eclipse.tm.internal.tcf.debug.model.TCFLaunch; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IBreakpoints; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.IWindowListener; @@ -33,13 +40,6 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; -import com.windriver.debug.tcf.core.model.ITCFBreakpointListener; -import com.windriver.debug.tcf.core.model.TCFBreakpoint; -import com.windriver.debug.tcf.core.model.TCFBreakpointsStatus; -import com.windriver.debug.tcf.core.model.TCFLaunch; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IBreakpoints; public class TCFModelPresentation implements IDebugModelPresentation { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelProxy.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelProxy.java index dbdae8822..6eb014de3 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelProxy.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxy; diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelSelectionPolicy.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelSelectionPolicy.java index 6c07354ea..04214c11a 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFModelSelectionPolicy.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelSelectionPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicy; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNode.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java index fb63dcfe5..f7d4d86e9 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNode.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.net.URL; import java.util.ArrayList; @@ -38,12 +38,12 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactor import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.RGB; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IMemory; +import org.eclipse.tm.tcf.services.IRunControl; import org.osgi.framework.Bundle; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IMemory; -import com.windriver.tcf.api.services.IRunControl; /** * TCFNode is base class for all TCF debug model elements. diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeExecContext.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java index 71a776c1e..db2f09164 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeExecContext.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.util.Arrays; import java.util.Map; @@ -20,11 +20,11 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta; import org.eclipse.debug.ui.IDebugUIConstants; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IMemory; +import org.eclipse.tm.tcf.services.IRunControl; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IMemory; -import com.windriver.tcf.api.services.IRunControl; public class TCFNodeExecContext extends TCFNode { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeLaunch.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeLaunch.java index d6ad830e9..5e7b8bf65 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeLaunch.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeLaunch.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.util.Arrays; @@ -20,10 +20,10 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta; import org.eclipse.swt.graphics.RGB; +import org.eclipse.tm.internal.tcf.debug.model.TCFLaunch; +import org.eclipse.tm.tcf.services.IMemory; +import org.eclipse.tm.tcf.services.IRunControl; -import com.windriver.debug.tcf.core.model.TCFLaunch; -import com.windriver.tcf.api.services.IMemory; -import com.windriver.tcf.api.services.IRunControl; public class TCFNodeLaunch extends TCFNode { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeRegister.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeRegister.java index 6adcb2a69..748bd7280 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeRegister.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeRegister.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,13 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IRegisters; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IRegisters; //TODO: hierarchical registers public class TCFNodeRegister extends TCFNode { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeStackFrame.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java index 9dee89fec..41928e60b 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFNodeStackFrame.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import java.math.BigInteger; import java.util.ArrayList; @@ -20,14 +20,14 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdat import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; import org.eclipse.debug.ui.IDebugUIConstants; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.ILineNumbers; +import org.eclipse.tm.tcf.services.IMemory; +import org.eclipse.tm.tcf.services.IRunControl; +import org.eclipse.tm.tcf.services.IStackTrace; +import org.eclipse.tm.tcf.services.ILineNumbers.CodeArea; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.ILineNumbers; -import com.windriver.tcf.api.services.IMemory; -import com.windriver.tcf.api.services.IRunControl; -import com.windriver.tcf.api.services.IStackTrace; -import com.windriver.tcf.api.services.ILineNumbers.CodeArea; public class TCFNodeStackFrame extends TCFNode { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFRunnable.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFRunnable.java index 0a7cdac63..b9e387a92 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/model/TCFRunnable.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFRunnable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.model; +package org.eclipse.tm.internal.tcf.debug.ui.model; import org.eclipse.debug.core.IRequest; import org.eclipse.swt.widgets.Display; +import org.eclipse.tm.tcf.protocol.Protocol; -import com.windriver.tcf.api.protocol.Protocol; public abstract class TCFRunnable implements Runnable { diff --git a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/trace/TraceView.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/trace/TraceView.java index 824346801..d490823d2 100644 --- a/plugins/com.windriver.debug.tcf.ui/src/com/windriver/debug/tcf/ui/trace/TraceView.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/trace/TraceView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.ui.trace; +package org.eclipse.tm.internal.tcf.debug.ui.trace; import java.io.UnsupportedEncodingException; import java.util.HashMap; @@ -20,12 +20,12 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.Text; +import org.eclipse.tm.tcf.core.AbstractChannel; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.Protocol; import org.eclipse.ui.part.ViewPart; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.core.AbstractChannel; public class TraceView extends ViewPart implements Protocol.ChannelOpenListener { diff --git a/plugins/com.windriver.debug.tcf.core/.classpath b/plugins/org.eclipse.tm.tcf.debug/.classpath index 304e86186..304e86186 100644 --- a/plugins/com.windriver.debug.tcf.core/.classpath +++ b/plugins/org.eclipse.tm.tcf.debug/.classpath diff --git a/plugins/com.windriver.debug.tcf.core/.cvsignore b/plugins/org.eclipse.tm.tcf.debug/.cvsignore index c5e82d745..c5e82d745 100644 --- a/plugins/com.windriver.debug.tcf.core/.cvsignore +++ b/plugins/org.eclipse.tm.tcf.debug/.cvsignore diff --git a/plugins/com.windriver.tcf.rse.ui/.project b/plugins/org.eclipse.tm.tcf.debug/.project index bcca78522..aca542dd7 100644 --- a/plugins/com.windriver.tcf.rse.ui/.project +++ b/plugins/org.eclipse.tm.tcf.debug/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>com.windriver.tcf.rse.ui</name> + <name>org.eclipse.tm.tcf.debug</name> <comment></comment> <projects> </projects> diff --git a/plugins/com.windriver.debug.tcf.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.tcf.debug/.settings/org.eclipse.jdt.core.prefs index 0bf81e2f5..0bf81e2f5 100644 --- a/plugins/com.windriver.debug.tcf.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.tm.tcf.debug/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/com.windriver.debug.tcf.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.tcf.debug/.settings/org.eclipse.jdt.ui.prefs index 2a1f92d89..2a1f92d89 100644 --- a/plugins/com.windriver.debug.tcf.core/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.tm.tcf.debug/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/com.windriver.debug.tcf.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.tm.tcf.debug/.settings/org.eclipse.ltk.core.refactoring.prefs index 2bfce7b08..2bfce7b08 100644 --- a/plugins/com.windriver.debug.tcf.core/.settings/org.eclipse.ltk.core.refactoring.prefs +++ b/plugins/org.eclipse.tm.tcf.debug/.settings/org.eclipse.ltk.core.refactoring.prefs diff --git a/plugins/com.windriver.debug.tcf.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF index bb5e7240d..b1525cfdb 100644 --- a/plugins/com.windriver.debug.tcf.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF @@ -1,17 +1,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: com.windriver.debug.tcf.core;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.tcf.debug;singleton:=true Bundle-Version: 0.2.0 -Bundle-Activator: com.windriver.debug.tcf.core.TCFCore +Bundle-Activator: org.eclipse.tm.internal.tcf.debug.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, org.eclipse.debug.core, org.eclipse.core.resources, - com.windriver.tcf.api + org.eclipse.tm.tcf Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true -Export-Package: com.windriver.debug.tcf.core, - com.windriver.debug.tcf.core.launch, - com.windriver.debug.tcf.core.model +Export-Package: org.eclipse.tm.internal.tcf.debug.launch, + org.eclipse.tm.internal.tcf.debug.model diff --git a/plugins/com.windriver.debug.tcf.ui/about.html b/plugins/org.eclipse.tm.tcf.debug/about.html index 6c5b3615b..6c5b3615b 100755..100644 --- a/plugins/com.windriver.debug.tcf.ui/about.html +++ b/plugins/org.eclipse.tm.tcf.debug/about.html diff --git a/plugins/com.windriver.debug.tcf.core/build.properties b/plugins/org.eclipse.tm.tcf.debug/build.properties index 1f9e1f7be..1f9e1f7be 100644 --- a/plugins/com.windriver.debug.tcf.core/build.properties +++ b/plugins/org.eclipse.tm.tcf.debug/build.properties diff --git a/plugins/com.windriver.debug.tcf.core/plugin.properties b/plugins/org.eclipse.tm.tcf.debug/plugin.properties index d573d34eb..f3a3a4ef5 100644 --- a/plugins/com.windriver.debug.tcf.core/plugin.properties +++ b/plugins/org.eclipse.tm.tcf.debug/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007 Wind River Systems, Inc. and others. +# Copyright (c) 2007, 2008 Wind River Systems, 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 diff --git a/plugins/com.windriver.debug.tcf.core/plugin.xml b/plugins/org.eclipse.tm.tcf.debug/plugin.xml index f28e8659f..df7023c1c 100644 --- a/plugins/com.windriver.debug.tcf.core/plugin.xml +++ b/plugins/org.eclipse.tm.tcf.debug/plugin.xml @@ -4,14 +4,14 @@ <extension point="org.eclipse.debug.core.breakpoints"> <breakpoint - markerType="com.windriver.debug.tcf.breakpoint.marker" - class="com.windriver.debug.tcf.core.model.TCFBreakpoint" - id="com.windriver.debug.tcf.breakpoint" + markerType="org.eclipse.tm.tcf.debug.breakpoint.marker" + class="org.eclipse.tm.internal.tcf.debug.model.TCFBreakpoint" + id="org.eclipse.tm.tcf.debug.breakpoint" name="TCF Breakpoint"> </breakpoint> </extension> <extension - id="com.windriver.debug.tcf.breakpoint.marker" + id="org.eclipse.tm.tcf.debug.breakpoint.marker" point="org.eclipse.core.resources.markers"> <super type="org.eclipse.debug.core.breakpointMarker"/> <persistent value="true"/> @@ -19,27 +19,27 @@ <extension point="org.eclipse.debug.core.launchConfigurationTypes"> <launchConfigurationType - sourceLocatorId="com.windriver.debug.tcf.SourceLocator" + sourceLocatorId="org.eclipse.tm.tcf.debug.SourceLocator" name="Target Communication Framework" - sourcePathComputerId="com.windriver.debug.tcf.SourcePathComputer" - delegate="com.windriver.debug.tcf.core.launch.TCFLaunchDelegate" + sourcePathComputerId="org.eclipse.tm.tcf.debug.SourcePathComputer" + delegate="org.eclipse.tm.internal.tcf.debug.launch.TCFLaunchDelegate" modes="run, debug" - id="com.windriver.debug.tcf.LaunchConfigurationType"> + id="org.eclipse.tm.tcf.debug.LaunchConfigurationType"> </launchConfigurationType> </extension> <extension point="org.eclipse.debug.core.sourceLocators"> <sourceLocator name="TCF Source Lookup Director" - class="com.windriver.debug.tcf.core.launch.TCFSourceLookupDirector" - id="com.windriver.debug.tcf.SourceLocator"> + class="org.eclipse.tm.internal.tcf.debug.launch.TCFSourceLookupDirector" + id="org.eclipse.tm.tcf.debug.SourceLocator"> </sourceLocator> </extension> <extension point="org.eclipse.debug.core.sourcePathComputers"> <sourcePathComputer - class="com.windriver.debug.tcf.core.launch.TCFSourcePathComputerDelegate" - id="com.windriver.debug.tcf.SourcePathComputer"> + class="org.eclipse.tm.internal.tcf.debug.launch.TCFSourcePathComputerDelegate" + id="org.eclipse.tm.tcf.debug.SourcePathComputer"> </sourcePathComputer> </extension> </plugin> diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/TCFCore.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/Activator.java index ca6c4eab8..6294a5665 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/TCFCore.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,28 +8,28 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core; +package org.eclipse.tm.internal.tcf.debug; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; +import org.eclipse.tm.internal.tcf.debug.model.TCFBreakpointsModel; import org.osgi.framework.BundleContext; -import com.windriver.debug.tcf.core.model.TCFBreakpointsModel; /** * The activator class controls the plug-in life cycle */ -public class TCFCore extends Plugin { +public class Activator extends Plugin { // The plug-in ID - public static final String PLUGIN_ID = "com.windriver.debug.tcf.core"; + public static final String PLUGIN_ID = "org.eclipse.tm.tcf.debug"; // The shared instance - private static TCFCore plugin; + private static Activator plugin; private static TCFBreakpointsModel bp_model; - public TCFCore() { + public Activator() { plugin = this; } @@ -52,7 +52,7 @@ public class TCFCore extends Plugin { * * @return the shared instance */ - public static TCFCore getDefault() { + public static Activator getDefault() { return plugin; } diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFLaunchDelegate.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFLaunchDelegate.java index 8a555cfc3..3cf67e271 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFLaunchDelegate.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFLaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.launch; +package org.eclipse.tm.internal.tcf.debug.launch; import java.io.IOException; @@ -18,11 +18,11 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.model.LaunchConfigurationDelegate; +import org.eclipse.tm.internal.tcf.debug.model.ITCFConstants; +import org.eclipse.tm.internal.tcf.debug.model.TCFLaunch; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.Protocol; -import com.windriver.debug.tcf.core.model.ITCFConstants; -import com.windriver.debug.tcf.core.model.TCFLaunch; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.Protocol; public class TCFLaunchDelegate extends LaunchConfigurationDelegate { diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFSourceLookupDirector.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupDirector.java index 57f07834f..c34a9ae9a 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFSourceLookupDirector.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupDirector.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.launch; +package org.eclipse.tm.internal.tcf.debug.launch; import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector; import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant; diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFSourceLookupParticipant.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupParticipant.java index 765476df1..b3bb64350 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFSourceLookupParticipant.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.launch; +package org.eclipse.tm.internal.tcf.debug.launch; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant; diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFSourcePathComputerDelegate.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourcePathComputerDelegate.java index f14abaae0..4a9d65cdb 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/launch/TCFSourcePathComputerDelegate.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourcePathComputerDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.launch; +package org.eclipse.tm.internal.tcf.debug.launch; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/ITCFBreakpointListener.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/ITCFBreakpointListener.java index a5f1eb8f4..8e4cb24b2 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/ITCFBreakpointListener.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/ITCFBreakpointListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.model; +package org.eclipse.tm.internal.tcf.debug.model; public interface ITCFBreakpointListener { diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/ITCFConstants.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/ITCFConstants.java index 66cba6273..acc0a9b68 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/ITCFConstants.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/ITCFConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,13 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.model; +package org.eclipse.tm.internal.tcf.debug.model; public interface ITCFConstants { /** * Unique identifier for the TCF debug model */ - public static final String ID_TCF_DEBUG_MODEL = "com.windriver.debug.tcf"; + public static final String ID_TCF_DEBUG_MODEL = "org.eclipse.tm.tcf.debug"; } diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFBreakpoint.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFBreakpoint.java index 3b4e912ab..c86c9c635 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFBreakpoint.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFBreakpoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.model; +package org.eclipse.tm.internal.tcf.debug.model; import java.math.BigInteger; import java.util.Map; @@ -25,14 +25,14 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.Breakpoint; +import org.eclipse.tm.internal.tcf.debug.Activator; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IBreakpoints; -import com.windriver.debug.tcf.core.TCFCore; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IBreakpoints; public class TCFBreakpoint extends Breakpoint { - public static final String MARKER_TYPE = "com.windriver.debug.tcf.breakpoint.marker"; + public static final String MARKER_TYPE = "org.eclipse.tm.tcf.debug.breakpoint.marker"; private static long last_id = 0; @@ -51,7 +51,7 @@ public class TCFBreakpoint extends Breakpoint { public TCFBreakpoint(final IResource resource, Map<String,Object> props) throws DebugException { props.put(IBreakpoints.PROP_ID, createNewID()); - final Map<String,Object> m = TCFCore.getBreakpointsModel().toMarkerAttributes(props); + final Map<String,Object> m = Activator.getBreakpointsModel().toMarkerAttributes(props); final IWorkspaceRunnable runnable = new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { IMarker marker = resource.createMarker(MARKER_TYPE); diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFBreakpointsModel.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFBreakpointsModel.java index 9269368f0..ee091ca4e 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFBreakpointsModel.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFBreakpointsModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.model; +package org.eclipse.tm.internal.tcf.debug.model; import java.io.IOException; import java.util.HashMap; @@ -30,12 +30,12 @@ import org.eclipse.debug.core.IBreakpointManager; import org.eclipse.debug.core.IBreakpointManagerListener; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.model.IBreakpoint; +import org.eclipse.tm.internal.tcf.debug.Activator; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IBreakpoints; -import com.windriver.debug.tcf.core.TCFCore; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IBreakpoints; /** * TCFBreakpointsModel class handles breakpoints for all active TCF launches. @@ -51,6 +51,10 @@ public class TCFBreakpointsModel implements IBreakpointListener, IBreakpointMana bp_manager.addBreakpointListener(this); bp_manager.addBreakpointManagerListener(this); } + + public static TCFBreakpointsModel getBreakpointsModel() { + return Activator.getBreakpointsModel(); + } public void dispose() { bp_manager.removeBreakpointListener(this); @@ -148,7 +152,7 @@ public class TCFBreakpointsModel implements IBreakpointListener, IBreakpointMana } } catch (Throwable x) { - TCFCore.log("Unhandled exception in breakpoint listener", x); + Activator.log("Unhandled exception in breakpoint listener", x); } } @@ -230,7 +234,7 @@ public class TCFBreakpointsModel implements IBreakpointListener, IBreakpointMana }.exec(); } catch (Throwable x) { - TCFCore.log("Unhandled exception in breakpoint listener", x); + Activator.log("Unhandled exception in breakpoint listener", x); } } @@ -281,7 +285,7 @@ public class TCFBreakpointsModel implements IBreakpointListener, IBreakpointMana }.exec(); } catch (Throwable x) { - TCFCore.log("Unhandled exception in breakpoint listener", x); + Activator.log("Unhandled exception in breakpoint listener", x); } } @@ -300,7 +304,7 @@ public class TCFBreakpointsModel implements IBreakpointListener, IBreakpointMana }.exec(); } catch (Throwable x) { - TCFCore.log("Unhandled exception in breakpoint listener", x); + Activator.log("Unhandled exception in breakpoint listener", x); } } diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFBreakpointsStatus.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFBreakpointsStatus.java index a0a5f74cc..aeed30228 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFBreakpointsStatus.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFBreakpointsStatus.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.model; +package org.eclipse.tm.internal.tcf.debug.model; import java.util.HashMap; import java.util.HashSet; @@ -18,9 +18,9 @@ import java.util.Set; import org.eclipse.core.resources.IMarker; import org.eclipse.debug.core.model.IBreakpoint; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IBreakpoints; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IBreakpoints; public class TCFBreakpointsStatus { diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFError.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFError.java index f754eb7c2..81d422056 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFError.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFError.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.model; +package org.eclipse.tm.internal.tcf.debug.model; import org.eclipse.core.runtime.IStatus; import org.eclipse.debug.core.DebugException; +import org.eclipse.tm.internal.tcf.debug.Activator; -import com.windriver.debug.tcf.core.TCFCore; public class TCFError extends DebugException { @@ -48,7 +48,7 @@ public class TCFError extends DebugException { } public String getPlugin() { - return TCFCore.PLUGIN_ID; + return Activator.PLUGIN_ID; } public int getSeverity() { diff --git a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFLaunch.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java index 4bf23c955..9187a7144 100644 --- a/plugins/com.windriver.debug.tcf.core/src/com/windriver/debug/tcf/core/model/TCFLaunch.java +++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.debug.tcf.core.model; +package org.eclipse.tm.internal.tcf.debug.model; import java.util.ArrayList; import java.util.Collection; @@ -22,16 +22,16 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.core.Launch; +import org.eclipse.tm.internal.tcf.debug.Activator; +import org.eclipse.tm.internal.tcf.debug.launch.TCFLaunchDelegate; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IProcesses; +import org.eclipse.tm.tcf.services.IProcesses.ProcessContext; -import com.windriver.debug.tcf.core.TCFCore; -import com.windriver.debug.tcf.core.launch.TCFLaunchDelegate; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IProcesses; -import com.windriver.tcf.api.services.IProcesses.ProcessContext; public class TCFLaunch extends Launch { @@ -76,7 +76,7 @@ public class TCFLaunch extends Launch { } }; if (mode.equals(ILaunchManager.DEBUG_MODE)) { - TCFCore.getBreakpointsModel().downloadBreakpoints(channel, new Runnable() { + Activator.getBreakpointsModel().downloadBreakpoints(channel, new Runnable() { public void run() { if (channel.getState() != IChannel.STATE_OPEN) return; breakpoints_status = new TCFBreakpointsStatus(TCFLaunch.this); diff --git a/plugins/com.windriver.tcf.api/.classpath b/plugins/org.eclipse.tm.tcf.dsf.ui/.classpath index 304e86186..304e86186 100644 --- a/plugins/com.windriver.tcf.api/.classpath +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/.classpath diff --git a/plugins/com.windriver.debug.tcf.ui/.project b/plugins/org.eclipse.tm.tcf.dsf.ui/.project index fb751e4e7..1f77460dc 100644 --- a/plugins/com.windriver.debug.tcf.ui/.project +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>com.windriver.debug.tcf.ui</name> + <name>org.eclipse.tm.tcf.dsf.ui</name> <comment></comment> <projects> </projects> diff --git a/plugins/com.windriver.tcf.api/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.tcf.dsf.ui/.settings/org.eclipse.jdt.core.prefs index 0bf81e2f5..0bf81e2f5 100644 --- a/plugins/com.windriver.tcf.api/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/com.windriver.tcf.dsf.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.tcf.dsf.ui/.settings/org.eclipse.jdt.ui.prefs index 55a9abb5d..55a9abb5d 100644 --- a/plugins/com.windriver.tcf.dsf.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/com.windriver.tcf.dsf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF index d76310516..657d91f78 100644 --- a/plugins/com.windriver.tcf.dsf.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: com.windriver.tcf.dsf.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.tcf.dsf.ui;singleton:=true Bundle-Version: 0.2.0 -Bundle-Activator: com.windriver.tcf.dsf.ui.Activator +Bundle-Activator: org.eclipse.tm.internal.tcf.dsf.ui.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.ui, org.eclipse.dd.dsf, org.eclipse.dd.dsf.ui, org.eclipse.debug.ui, - com.windriver.tcf.api, - com.windriver.debug.tcf.core, - com.windriver.debug.tcf.ui, - com.windriver.tcf.dsf.core + org.eclipse.tm.tcf, + org.eclipse.tm.tcf.debug, + org.eclipse.tm.tcf.debug.ui, + org.eclipse.tm.tcf.dsf Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/com.windriver.tcf.api/about.html b/plugins/org.eclipse.tm.tcf.dsf.ui/about.html index 6c5b3615b..6c5b3615b 100755..100644 --- a/plugins/com.windriver.tcf.api/about.html +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/about.html diff --git a/plugins/com.windriver.tcf.dsf.ui/build.properties b/plugins/org.eclipse.tm.tcf.dsf.ui/build.properties index cd72b059e..cd72b059e 100644 --- a/plugins/com.windriver.tcf.dsf.ui/build.properties +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/build.properties diff --git a/plugins/com.windriver.tcf.dsf.ui/icons/tcf.gif b/plugins/org.eclipse.tm.tcf.dsf.ui/icons/tcf.gif Binary files differindex 3198679ae..3198679ae 100644 --- a/plugins/com.windriver.tcf.dsf.ui/icons/tcf.gif +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/icons/tcf.gif diff --git a/plugins/com.windriver.tcf.dsf.ui/plugin.properties b/plugins/org.eclipse.tm.tcf.dsf.ui/plugin.properties index 85a170935..758588c71 100644 --- a/plugins/com.windriver.tcf.dsf.ui/plugin.properties +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007 Wind River Systems, Inc. and others. +# Copyright (c) 2007, 2008 Wind River Systems, 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 diff --git a/plugins/com.windriver.tcf.dsf.ui/plugin.xml b/plugins/org.eclipse.tm.tcf.dsf.ui/plugin.xml index 4be8bb538..1f4a3c7a1 100644 --- a/plugins/com.windriver.tcf.dsf.ui/plugin.xml +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/plugin.xml @@ -2,12 +2,12 @@ <?eclipse version="3.2"?> <plugin> - <extension point="com.windriver.tcf.api.startup"/> + <extension point="org.eclipse.tm.tcf.startup"/> <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups"> <launchConfigurationTabGroup - type="com.windriver.tcf.dsf.LaunchConfigurationType" - class="com.windriver.tcf.dsf.ui.LaunchDialogTabGroup" + type="org.eclipse.tm.tcf.dsf.LaunchConfigurationType" + class="org.eclipse.tm.internal.tcf.dsf.ui.LaunchDialogTabGroup" id="org.eclipse.dd.dsf.mi.launch.localRunLaunchTabGroup"> </launchConfigurationTabGroup> </extension> @@ -15,15 +15,15 @@ <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages"> <launchConfigurationTypeImage icon="icons/tcf.gif" - configTypeID="com.windriver.tcf.dsf.LaunchConfigurationType" - id="com.windriver.tcf.dsf.LaunchImage"> + configTypeID="org.eclipse.tm.tcf.dsf.LaunchConfigurationType" + id="org.eclipse.tm.tcf.dsf.LaunchImage"> </launchConfigurationTypeImage> </extension> <extension point="org.eclipse.core.runtime.adapters"> <factory - class="com.windriver.tcf.dsf.ui.AdapterFactory" - adaptableType="com.windriver.tcf.dsf.core.launch.TCFDSFLaunch"> + class="org.eclipse.tm.internal.tcf.dsf.ui.AdapterFactory" + adaptableType="org.eclipse.tm.internal.tcf.dsf.launch.TCFDSFLaunch"> <adapter type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider"/> <adapter type="org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory"/> <adapter type="org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory"/> diff --git a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/Activator.java b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/Activator.java index 3244699a4..03355c9de 100644 --- a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/Activator.java +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.ui; +package org.eclipse.tm.internal.tcf.dsf.ui; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext; public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "com.windriver.tcf.dsf.ui"; + public static final String PLUGIN_ID = "org.eclipse.tm.tcf.dsf.ui"; // The shared instance private static Activator plugin; diff --git a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/AdapterFactory.java b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/AdapterFactory.java index 44c66914e..9af4a41f1 100644 --- a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/AdapterFactory.java +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/AdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.ui; +package org.eclipse.tm.internal.tcf.dsf.ui; import java.util.Collections; import java.util.HashMap; @@ -39,9 +39,9 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentati import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory; import org.eclipse.debug.ui.sourcelookup.ISourceDisplay; +import org.eclipse.tm.internal.tcf.debug.model.ITCFConstants; +import org.eclipse.tm.internal.tcf.dsf.launch.TCFDSFLaunch; -import com.windriver.debug.tcf.core.model.ITCFConstants; -import com.windriver.tcf.dsf.core.launch.TCFDSFLaunch; @SuppressWarnings("restriction") public class AdapterFactory implements IAdapterFactory, DsfSession.SessionEndedListener, ILaunchesListener2 { diff --git a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/ContainerLayoutNode.java b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/ContainerLayoutNode.java index 89fce7be8..28d84d60f 100644 --- a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/ContainerLayoutNode.java +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/ContainerLayoutNode.java @@ -10,7 +10,7 @@ * Wind River Systems - reused for TCF connection type *******************************************************************************/ -package com.windriver.tcf.dsf.ui; +package org.eclipse.tm.internal.tcf.dsf.ui; import org.eclipse.dd.dsf.concurrent.DataRequestMonitor; import org.eclipse.dd.dsf.concurrent.RequestMonitor; @@ -31,8 +31,8 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugUIConstants; +import org.eclipse.tm.internal.tcf.dsf.services.TCFDSFRunControl; -import com.windriver.tcf.dsf.core.services.TCFDSFRunControl; @SuppressWarnings("restriction") public class ContainerLayoutNode extends AbstractDMVMLayoutNode{ diff --git a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/LaunchDialogTabGroup.java b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/LaunchDialogTabGroup.java index 2b17b6aa0..eb47de6b9 100644 --- a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/LaunchDialogTabGroup.java +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/LaunchDialogTabGroup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.ui; +package org.eclipse.tm.internal.tcf.dsf.ui; import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup; import org.eclipse.debug.ui.CommonTab; @@ -16,9 +16,9 @@ import org.eclipse.debug.ui.EnvironmentTab; import org.eclipse.debug.ui.ILaunchConfigurationDialog; import org.eclipse.debug.ui.ILaunchConfigurationTab; import org.eclipse.debug.ui.sourcelookup.SourceLookupTab; +import org.eclipse.tm.internal.tcf.debug.ui.launch.TCFArgumentsTab; +import org.eclipse.tm.internal.tcf.debug.ui.launch.TCFMainTab; -import com.windriver.debug.tcf.ui.launch.TCFArgumentsTab; -import com.windriver.debug.tcf.ui.launch.TCFMainTab; /** * Launch configuration dialog tab group for TCF over DSF diff --git a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/LaunchVMProvider.java b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/LaunchVMProvider.java index aad7ddf28..b91a2c74c 100644 --- a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/LaunchVMProvider.java +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/LaunchVMProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.ui; +package org.eclipse.tm.internal.tcf.dsf.ui; import java.util.concurrent.RejectedExecutionException; diff --git a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/ThreadLayoutNode.java b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/ThreadLayoutNode.java index 496d83e64..43d6e788e 100644 --- a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/ThreadLayoutNode.java +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/ThreadLayoutNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems and others. + * Copyright (c) 2006, 2008 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -9,7 +9,7 @@ * Wind River Systems - initial API and implementation * Ericsson - Modified for multi threaded functionality *******************************************************************************/ -package com.windriver.tcf.dsf.ui; +package org.eclipse.tm.internal.tcf.dsf.ui; import java.util.List; import java.util.Map; @@ -36,8 +36,8 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugUIConstants; +import org.eclipse.tm.internal.tcf.dsf.services.TCFDSFExecutionDMC; -import com.windriver.tcf.dsf.core.services.TCFDSFExecutionDMC; @SuppressWarnings("restriction") public class ThreadLayoutNode extends AbstractDMVMLayoutNode { diff --git a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/ViewModelAdapter.java b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/ViewModelAdapter.java index f52e221db..3ee862998 100644 --- a/plugins/com.windriver.tcf.dsf.ui/src/com/windriver/tcf/dsf/ui/ViewModelAdapter.java +++ b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/ViewModelAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.ui; +package org.eclipse.tm.internal.tcf.dsf.ui; import org.eclipse.dd.dsf.concurrent.ThreadSafe; import org.eclipse.dd.dsf.debug.ui.viewmodel.expression.ExpressionVMProvider; @@ -20,8 +20,8 @@ import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; import org.eclipse.debug.ui.IDebugUIConstants; +import org.eclipse.tm.internal.tcf.dsf.launch.TCFDSFLaunch; -import com.windriver.tcf.dsf.core.launch.TCFDSFLaunch; @ThreadSafe @SuppressWarnings("restriction") diff --git a/plugins/com.windriver.tcf.dsf.core/.classpath b/plugins/org.eclipse.tm.tcf.dsf/.classpath index 304e86186..304e86186 100644 --- a/plugins/com.windriver.tcf.dsf.core/.classpath +++ b/plugins/org.eclipse.tm.tcf.dsf/.classpath diff --git a/plugins/com.windriver.tcf.dsf.ui/.project b/plugins/org.eclipse.tm.tcf.dsf/.project index 77c9739b6..68c416def 100644 --- a/plugins/com.windriver.tcf.dsf.ui/.project +++ b/plugins/org.eclipse.tm.tcf.dsf/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>com.windriver.tcf.dsf.ui</name> + <name>org.eclipse.tm.tcf.dsf</name> <comment></comment> <projects> </projects> diff --git a/plugins/com.windriver.tcf.dsf.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.tcf.dsf/.settings/org.eclipse.jdt.core.prefs index 0bf81e2f5..0bf81e2f5 100644 --- a/plugins/com.windriver.tcf.dsf.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.tm.tcf.dsf/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/com.windriver.tcf.dsf.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.tcf.dsf/.settings/org.eclipse.jdt.ui.prefs index abbc7248f..abbc7248f 100644 --- a/plugins/com.windriver.tcf.dsf.core/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.tm.tcf.dsf/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/com.windriver.tcf.dsf.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf.dsf/META-INF/MANIFEST.MF index 5a0ebf9d3..39e57e150 100644 --- a/plugins/com.windriver.tcf.dsf.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.tcf.dsf/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: com.windriver.tcf.dsf.core;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.tcf.dsf;singleton:=true Bundle-Version: 0.2.0 -Bundle-Activator: com.windriver.tcf.dsf.core.Activator +Bundle-Activator: org.eclipse.tm.internal.tcf.dsf.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, org.eclipse.debug.core, @@ -11,10 +11,10 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.dd.dsf, org.eclipse.dd.dsf.debug, org.eclipse.cdt.core, - com.windriver.tcf.api, - com.windriver.debug.tcf.core + org.eclipse.tm.tcf, + org.eclipse.tm.tcf.debug Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true -Export-Package: com.windriver.tcf.dsf.core.launch, - com.windriver.tcf.dsf.core.services +Export-Package: org.eclipse.tm.internal.tcf.dsf.launch, + org.eclipse.tm.internal.tcf.dsf.services diff --git a/plugins/com.windriver.tcf.dsf.core/about.html b/plugins/org.eclipse.tm.tcf.dsf/about.html index 6c5b3615b..6c5b3615b 100755..100644 --- a/plugins/com.windriver.tcf.dsf.core/about.html +++ b/plugins/org.eclipse.tm.tcf.dsf/about.html diff --git a/plugins/com.windriver.tcf.dsf.core/build.properties b/plugins/org.eclipse.tm.tcf.dsf/build.properties index 2b6399957..2b6399957 100644 --- a/plugins/com.windriver.tcf.dsf.core/build.properties +++ b/plugins/org.eclipse.tm.tcf.dsf/build.properties diff --git a/plugins/com.windriver.tcf.dsf.core/plugin.properties b/plugins/org.eclipse.tm.tcf.dsf/plugin.properties index 250c86adf..ee6aa5831 100644 --- a/plugins/com.windriver.tcf.dsf.core/plugin.properties +++ b/plugins/org.eclipse.tm.tcf.dsf/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007 Wind River Systems, Inc. and others. +# Copyright (c) 2007, 2008 Wind River Systems, 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 diff --git a/plugins/com.windriver.tcf.dsf.core/plugin.xml b/plugins/org.eclipse.tm.tcf.dsf/plugin.xml index 272eed3aa..03786907c 100644 --- a/plugins/com.windriver.tcf.dsf.core/plugin.xml +++ b/plugins/org.eclipse.tm.tcf.dsf/plugin.xml @@ -4,12 +4,12 @@ <extension point="org.eclipse.debug.core.launchConfigurationTypes"> <launchConfigurationType - sourceLocatorId="com.windriver.debug.tcf.SourceLocator" + sourceLocatorId="org.eclipse.tm.tcf.debug.SourceLocator" name="DSF over TCF" - sourcePathComputerId="com.windriver.debug.tcf.SourcePathComputer" - delegate="com.windriver.tcf.dsf.core.launch.TCFDSFLaunchDelegate" + sourcePathComputerId="org.eclipse.tm.tcf.debug.SourcePathComputer" + delegate="org.eclipse.tm.internal.tcf.dsf.launch.TCFDSFLaunchDelegate" modes="debug" - id="com.windriver.tcf.dsf.LaunchConfigurationType"> + id="org.eclipse.tm.tcf.dsf.LaunchConfigurationType"> </launchConfigurationType> </extension> </plugin> diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/Activator.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/Activator.java index e8153f7ef..9d71d4f25 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/Activator.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.core; +package org.eclipse.tm.internal.tcf.dsf; import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; @@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext; public class Activator extends Plugin { // The plug-in ID - public static final String PLUGIN_ID = "com.windriver.tcf.dsf.core"; + public static final String PLUGIN_ID = "org.eclipse.tm.tcf.dsf.core"; // The shared instance private static Activator plugin; diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFExecuter.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFExecuter.java index c43242ede..309159c89 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFExecuter.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFExecuter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.core.launch; +package org.eclipse.tm.internal.tcf.dsf.launch; import java.util.ArrayList; import java.util.List; @@ -22,8 +22,8 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import org.eclipse.dd.dsf.concurrent.DsfExecutor; +import org.eclipse.tm.tcf.protocol.Protocol; -import com.windriver.tcf.api.protocol.Protocol; public class TCFDSFExecuter extends AbstractExecutorService implements DsfExecutor { diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFLaunch.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunch.java index 179be870d..b48b21853 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFLaunch.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunch.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,16 +8,16 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.core.launch; +package org.eclipse.tm.internal.tcf.dsf.launch; import org.eclipse.dd.dsf.concurrent.DsfExecutor; import org.eclipse.dd.dsf.concurrent.RequestMonitor; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.tm.internal.tcf.debug.model.ITCFConstants; +import org.eclipse.tm.internal.tcf.debug.model.TCFLaunch; +import org.eclipse.tm.tcf.protocol.IChannel; -import com.windriver.debug.tcf.core.model.ITCFConstants; -import com.windriver.debug.tcf.core.model.TCFLaunch; -import com.windriver.tcf.api.protocol.IChannel; public class TCFDSFLaunch extends TCFLaunch { diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFLaunchDelegate.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchDelegate.java index a672e46e4..d6a9280bf 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFLaunchDelegate.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,13 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.core.launch; +package org.eclipse.tm.internal.tcf.dsf.launch; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.tm.internal.tcf.debug.launch.TCFLaunchDelegate; -import com.windriver.debug.tcf.core.launch.TCFLaunchDelegate; public class TCFDSFLaunchDelegate extends TCFLaunchDelegate { diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFLaunchSequence.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchSequence.java index 767aca9b0..b9c996085 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/launch/TCFDSFLaunchSequence.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchSequence.java @@ -1,83 +1,83 @@ -/*******************************************************************************
- * Copyright (c) 2007 Wind River Systems, 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:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package com.windriver.tcf.dsf.core.launch;
-
-import org.eclipse.dd.dsf.concurrent.RequestMonitor;
-import org.eclipse.dd.dsf.concurrent.Sequence;
-import org.eclipse.dd.dsf.service.DsfSession;
-
-import com.windriver.tcf.api.protocol.IChannel;
-import com.windriver.tcf.dsf.core.services.TCFDSFBreakpoints;
-import com.windriver.tcf.dsf.core.services.TCFDSFMemory;
-import com.windriver.tcf.dsf.core.services.TCFDSFNativeProcesses;
-import com.windriver.tcf.dsf.core.services.TCFDSFRegisters;
-import com.windriver.tcf.dsf.core.services.TCFDSFRunControl;
-import com.windriver.tcf.dsf.core.services.TCFDSFStack;
-import com.windriver.tcf.dsf.core.services.TCFDSFStepQueueManager;
-
-class TCFDSFLaunchSequence extends Sequence {
-
- private final Step[] steps;
-
- TCFDSFLaunchSequence(final DsfSession session, final TCFDSFLaunch launch, RequestMonitor monitor) {
- super(session.getExecutor(), monitor);
- final IChannel channel = launch.getChannel();
- steps = new Step[] {
- new Step() {
- @Override
- public void execute(RequestMonitor monitor) {
- new TCFDSFNativeProcesses(session, channel, monitor);
- }
- },
- new Step() {
- @Override
- public void execute(RequestMonitor monitor) {
- new TCFDSFRunControl(session, channel, monitor);
- }
- },
- new Step() {
- @Override
- public void execute(RequestMonitor monitor) {
- new TCFDSFStepQueueManager(session).initialize(monitor);
- }
- },
- new Step() {
- @Override
- public void execute(RequestMonitor monitor) {
- new TCFDSFStack(session, channel, monitor);
- }
- },
- new Step() {
- @Override
- public void execute(RequestMonitor monitor) {
- new TCFDSFMemory(session, channel, monitor);
- }
- },
- new Step() {
- @Override
- public void execute(RequestMonitor monitor) {
- new TCFDSFRegisters(session, channel, monitor);
- }
- },
- new Step() {
- @Override
- public void execute(RequestMonitor monitor) {
- new TCFDSFBreakpoints(session, launch, monitor);
- }
- },
- };
- }
-
- @Override
- public Step[] getSteps() {
- return steps;
- }
-}
+/******************************************************************************* + * Copyright (c) 2007, 2008 Wind River Systems, 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: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.tm.internal.tcf.dsf.launch; + +import org.eclipse.dd.dsf.concurrent.RequestMonitor; +import org.eclipse.dd.dsf.concurrent.Sequence; +import org.eclipse.dd.dsf.service.DsfSession; +import org.eclipse.tm.internal.tcf.dsf.services.TCFDSFBreakpoints; +import org.eclipse.tm.internal.tcf.dsf.services.TCFDSFMemory; +import org.eclipse.tm.internal.tcf.dsf.services.TCFDSFNativeProcesses; +import org.eclipse.tm.internal.tcf.dsf.services.TCFDSFRegisters; +import org.eclipse.tm.internal.tcf.dsf.services.TCFDSFRunControl; +import org.eclipse.tm.internal.tcf.dsf.services.TCFDSFStack; +import org.eclipse.tm.internal.tcf.dsf.services.TCFDSFStepQueueManager; +import org.eclipse.tm.tcf.protocol.IChannel; + + +class TCFDSFLaunchSequence extends Sequence { + + private final Step[] steps; + + TCFDSFLaunchSequence(final DsfSession session, final TCFDSFLaunch launch, RequestMonitor monitor) { + super(session.getExecutor(), monitor); + final IChannel channel = launch.getChannel(); + steps = new Step[] { + new Step() { + @Override + public void execute(RequestMonitor monitor) { + new TCFDSFNativeProcesses(session, channel, monitor); + } + }, + new Step() { + @Override + public void execute(RequestMonitor monitor) { + new TCFDSFRunControl(session, channel, monitor); + } + }, + new Step() { + @Override + public void execute(RequestMonitor monitor) { + new TCFDSFStepQueueManager(session).initialize(monitor); + } + }, + new Step() { + @Override + public void execute(RequestMonitor monitor) { + new TCFDSFStack(session, channel, monitor); + } + }, + new Step() { + @Override + public void execute(RequestMonitor monitor) { + new TCFDSFMemory(session, channel, monitor); + } + }, + new Step() { + @Override + public void execute(RequestMonitor monitor) { + new TCFDSFRegisters(session, channel, monitor); + } + }, + new Step() { + @Override + public void execute(RequestMonitor monitor) { + new TCFDSFBreakpoints(session, launch, monitor); + } + }, + }; + } + + @Override + public Step[] getSteps() { + return steps; + } +} diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/IDataRequest.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/IDataRequest.java index 49cee9f49..d064448fe 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/IDataRequest.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/IDataRequest.java @@ -1,17 +1,17 @@ -/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, 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:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package com.windriver.tcf.dsf.core.services;
-
-public interface IDataRequest {
-
- void cancel();
- void done();
-}
+/******************************************************************************* + * Copyright (c) 2008 Wind River Systems, 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: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.tm.internal.tcf.dsf.services; + +public interface IDataRequest { + + void cancel(); + void done(); +} diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFAddress.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFAddress.java index 0afcd6925..ec723ed95 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFAddress.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFAddress.java @@ -1,85 +1,85 @@ -/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, 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:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package com.windriver.tcf.dsf.core.services;
-
-import java.math.BigInteger;
-
-import org.eclipse.cdt.core.IAddress;
-
-public final class TCFAddress implements IAddress {
-
- private final BigInteger addr;
-
- public TCFAddress(Number addr) {
- if (addr instanceof BigInteger) this.addr = (BigInteger)addr;
- else this.addr = new BigInteger(addr.toString(), 10);
- }
-
- public IAddress add(BigInteger i) {
- return new TCFAddress(addr.add(i));
- }
-
- public IAddress add(long l) {
- if (l == 0) return this;
- return new TCFAddress(addr.add(BigInteger.valueOf(l)));
- }
-
- public BigInteger distanceTo(IAddress a) {
- return a.getValue().subtract(addr);
- }
-
- public int getCharsNum() {
- // TODO don't know what getCharsNum() is supposed to return
- return 0;
- }
-
- public BigInteger getMaxOffset() {
- // TODO don't know what getMaxOffset() is supposed to return
- return null;
- }
-
- public int getSize() {
- // TODO don't know what getSize() is supposed to return
- return 0;
- }
-
- public BigInteger getValue() {
- return addr;
- }
-
- public boolean isMax() {
- return false;
- }
-
- public boolean isZero() {
- return addr.equals(BigInteger.ZERO);
- }
-
- public String toBinaryAddressString() {
- return toHexAddressString();
- }
-
- public String toHexAddressString() {
- return "0x" + toString(16);
- }
-
- public String toString(int radix) {
- return addr.toString(radix);
- }
-
- public int compareTo(Object o) {
- return addr.compareTo(((TCFAddress)o).addr);
- }
-
- public String toString() {
- return "[" + toHexAddressString() + "]";
- }
-}
+/******************************************************************************* + * Copyright (c) 2008 Wind River Systems, 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: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.tm.internal.tcf.dsf.services; + +import java.math.BigInteger; + +import org.eclipse.cdt.core.IAddress; + +public final class TCFAddress implements IAddress { + + private final BigInteger addr; + + public TCFAddress(Number addr) { + if (addr instanceof BigInteger) this.addr = (BigInteger)addr; + else this.addr = new BigInteger(addr.toString(), 10); + } + + public IAddress add(BigInteger i) { + return new TCFAddress(addr.add(i)); + } + + public IAddress add(long l) { + if (l == 0) return this; + return new TCFAddress(addr.add(BigInteger.valueOf(l))); + } + + public BigInteger distanceTo(IAddress a) { + return a.getValue().subtract(addr); + } + + public int getCharsNum() { + // TODO don't know what getCharsNum() is supposed to return + return 0; + } + + public BigInteger getMaxOffset() { + // TODO don't know what getMaxOffset() is supposed to return + return null; + } + + public int getSize() { + // TODO don't know what getSize() is supposed to return + return 0; + } + + public BigInteger getValue() { + return addr; + } + + public boolean isMax() { + return false; + } + + public boolean isZero() { + return addr.equals(BigInteger.ZERO); + } + + public String toBinaryAddressString() { + return toHexAddressString(); + } + + public String toHexAddressString() { + return "0x" + toString(16); + } + + public String toString(int radix) { + return addr.toString(radix); + } + + public int compareTo(Object o) { + return addr.compareTo(((TCFAddress)o).addr); + } + + public String toString() { + return "[" + toHexAddressString() + "]"; + } +} diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFBreakpoints.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java index c908b4740..6b1e00502 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFBreakpoints.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java @@ -1,307 +1,306 @@ -/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, 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:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package com.windriver.tcf.dsf.core.services;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
-import org.eclipse.dd.dsf.concurrent.RequestMonitor;
-import org.eclipse.dd.dsf.datamodel.AbstractDMContext;
-import org.eclipse.dd.dsf.datamodel.IDMContext;
-import org.eclipse.dd.dsf.service.AbstractDsfService;
-import org.eclipse.dd.dsf.service.DsfSession;
-import org.eclipse.dd.dsf.service.IDsfService;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.osgi.framework.BundleContext;
-
-import com.windriver.debug.tcf.core.TCFCore;
-import com.windriver.debug.tcf.core.model.ITCFBreakpointListener;
-import com.windriver.debug.tcf.core.model.ITCFConstants;
-import com.windriver.debug.tcf.core.model.TCFBreakpointsModel;
-import com.windriver.debug.tcf.core.model.TCFLaunch;
-import com.windriver.tcf.api.protocol.IChannel;
-import com.windriver.tcf.api.protocol.IToken;
-import com.windriver.tcf.dsf.core.Activator;
-
-// TODO IBreakpointHitEvent
-
-public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse.dd.dsf.debug.service.IBreakpoints {
-
- private class BreakpointDMC extends AbstractDMContext implements IBreakpointDMContext {
-
- final String id;
- final IBreakpoint bp;
- final TCFDataCache<Map<String,Object>> status;
-
- boolean disposed;
-
- public BreakpointDMC(IDsfService service, final String id, IBreakpoint bp) {
- super(service, new IDMContext[0]);
- this.id = id;
- this.bp = bp;
- cache.put(id, this);
- status = new TCFDataCache<Map<String,Object>>(channel) {
- @Override
- public boolean startDataRetrieval() {
- assert command == null;
- assert !disposed;
- if (tcf_bpt_service == null) {
- data = null;
- valid = true;
- return true;
- }
- command = tcf_bpt_service.getStatus(id, new com.windriver.tcf.api.services.IBreakpoints.DoneGetStatus() {
- public void doneGetStatus(IToken token, Exception err, Map<String,Object> status) {
- if (command != token) return;
- command = null;
- if (err != null) {
- data = null;
- error = err;
- }
- else {
- data = status;
- }
- valid = true;
- validate();
- }
- });
- return false;
- }
- };
- }
-
- @Override
- public boolean equals(Object other) {
- return super.baseEquals(other) && ((BreakpointDMC)other).id.equals(id);
- }
-
- @Override
- public int hashCode() {
- return id.hashCode();
- }
-
- void dispose() {
- assert !disposed;
- cache.remove(id);
- disposed = true;
- }
- }
-
- private class BreakpointData implements IBreakpointDMData {
-
- final IBreakpoint bp;
- final BreakpointStatus status;
-
- BreakpointData(IBreakpoint bp, BreakpointStatus status) {
- this.bp = bp;
- this.status = status;
- }
-
- public IBreakpoint getPlatformBreakpoint() {
- return bp;
- }
-
- public BreakpointStatus getStatus() {
- return status;
- }
- }
-
- private final ITCFBreakpointListener bp_listener = new ITCFBreakpointListener() {
-
- public void breakpointStatusChanged(String id) {
- final BreakpointDMC dmc = cache.get(id);
- if (dmc != null) {
- Map<String, Object> map = launch.getBreakpointsStatus().getStatus(dmc.id);
- dmc.status.reset(map);
- IBreakpointDMEvent e = null;
- if (map == null) {
- e = new IBreakpointUninstalledDMEvent() {
- public IBreakpointDMContext getDMContext() {
- return dmc;
- }
- };
- }
- else if (map.get(com.windriver.tcf.api.services.IBreakpoints.STATUS_ERROR) != null) {
- e = new IBreakpointInstallFailedDMEvent() {
- public IBreakpointDMContext getDMContext() {
- return dmc;
- }
- };
- }
- else if (map.get(com.windriver.tcf.api.services.IBreakpoints.STATUS_PLANTED) != null) {
- e = new IBreakpointInstalledDMEvent() {
- public IBreakpointDMContext getDMContext() {
- return dmc;
- }
- };
- }
- else {
- e = new IBreakpointUninstalledDMEvent() {
- public IBreakpointDMContext getDMContext() {
- return dmc;
- }
- };
- }
- getSession().dispatchEvent(e, getProperties());
- }
- }
-
- public void breakpointRemoved(String id) {
- final BreakpointDMC dmc = cache.get(id);
- if (dmc != null) {
- dmc.dispose();
- IBreakpointDMEvent e = new IBreakpointUninstalledDMEvent() {
- public IBreakpointDMContext getDMContext() {
- return dmc;
- }
- };
- getSession().dispatchEvent(e, getProperties());
- }
- }
- };
-
- private final TCFLaunch launch;
- private final IChannel channel;
- private final com.windriver.tcf.api.services.IBreakpoints tcf_bpt_service;
- private final Map<String,BreakpointDMC> cache = new HashMap<String,BreakpointDMC>();
-
- public TCFDSFBreakpoints(DsfSession session, TCFLaunch launch, final RequestMonitor monitor) {
- super(session);
- this.launch = launch;
- channel = launch.getChannel();
- launch.getBreakpointsStatus().addListener(bp_listener);
- tcf_bpt_service = channel.getRemoteService(com.windriver.tcf.api.services.IBreakpoints.class);
- initialize(new RequestMonitor(getExecutor(), monitor) {
- @Override
- protected void handleOK() {
- String[] class_names = {
- org.eclipse.dd.dsf.debug.service.IBreakpoints.class.getName(),
- TCFDSFBreakpoints.class.getName()
- };
- register(class_names, new Hashtable<String,String>());
- monitor.done();
- }
- });
- }
-
- @Override
- public void shutdown(RequestMonitor monitor) {
- unregister();
- super.shutdown(monitor);
- }
-
- @Override
- protected BundleContext getBundleContext() {
- return Activator.getBundleContext();
- }
-
- public void getAllBreakpoints(IDMContext ctx, DataRequestMonitor<IBreakpointDMContext[]> rm) {
- IBreakpointManager bp_manager = DebugPlugin.getDefault().getBreakpointManager();
- TCFBreakpointsModel m = TCFCore.getBreakpointsModel();
- IBreakpoint[] arr = bp_manager.getBreakpoints(ITCFConstants.ID_TCF_DEBUG_MODEL);
- ArrayList<IBreakpointDMContext> l = new ArrayList<IBreakpointDMContext>();
- if (arr != null && arr.length == 0) {
- for (IBreakpoint bp : arr) {
- if (m.isSupported(channel, bp)) {
- IMarker marker = bp.getMarker();
- String id = marker.getAttribute(ITCFConstants.ID_TCF_DEBUG_MODEL +
- '.' + com.windriver.tcf.api.services.IBreakpoints.PROP_ID, (String)null);
- if (id != null) {
- BreakpointDMC c = cache.get(id);
- if (c == null) c = new BreakpointDMC(this, id, bp);
- l.add(c);
- }
- }
- }
- }
- rm.setData(l.toArray(new IBreakpointDMContext[l.size()]));
- rm.done();
- }
-
- public void getBreakpoints(IDMContext dmc, IBreakpoint bp, DataRequestMonitor<IBreakpointDMContext[]> rm) {
- TCFBreakpointsModel m = TCFCore.getBreakpointsModel();
- ArrayList<IBreakpointDMContext> l = new ArrayList<IBreakpointDMContext>();
- if (m.isSupported(channel, bp)) {
- IMarker marker = bp.getMarker();
- String id = marker.getAttribute(ITCFConstants.ID_TCF_DEBUG_MODEL +
- '.' + com.windriver.tcf.api.services.IBreakpoints.PROP_ID, (String)null);
- if (id != null) {
- BreakpointDMC c = cache.get(id);
- if (c == null) c = new BreakpointDMC(this, id, bp);
- l.add(c);
- }
- }
- rm.setData(l.toArray(new IBreakpointDMContext[l.size()]));
- rm.done();
- }
-
- public void getBreakpointData(final IDMContext dmc, final DataRequestMonitor<IBreakpointDMData> rm) {
- if (dmc instanceof BreakpointDMC) {
- BreakpointDMC bp = (BreakpointDMC)dmc;
- if (!bp.status.validate()) {
- bp.status.addWaitingRequest(new IDataRequest() {
- public void cancel() {
- rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$
- rm.setCanceled(true);
- rm.done();
- }
- public void done() {
- getBreakpointData(dmc, rm);
- }
- });
- return;
- }
- if (bp.status.getError() != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Data error", bp.status.getError())); //$NON-NLS-1$
- rm.done();
- return;
- }
- Map<String,Object> map = bp.status.getData();
- BreakpointStatus status = BreakpointStatus.FILTERED_OUT;
- if (map != null) {
- if (map.get(com.windriver.tcf.api.services.IBreakpoints.STATUS_ERROR) != null) {
- status = BreakpointStatus.FAILED_TO_INSTALL;
- }
- else if (map.get(com.windriver.tcf.api.services.IBreakpoints.STATUS_PLANTED) != null) {
- status = BreakpointStatus.INSTALLED;
- }
- }
- rm.setData(new BreakpointData(bp.bp, status));
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- rm.done();
- }
-
- @SuppressWarnings("unchecked")
- public void getModelData(IDMContext dmc, DataRequestMonitor<?> rm) {
- if (dmc instanceof BreakpointDMC) {
- getBreakpointData((BreakpointDMC)dmc, (DataRequestMonitor<IBreakpointDMData>)rm);
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-}
+/******************************************************************************* + * Copyright (c) 2008 Wind River Systems, 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: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.tm.internal.tcf.dsf.services; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; + +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.dd.dsf.concurrent.DataRequestMonitor; +import org.eclipse.dd.dsf.concurrent.RequestMonitor; +import org.eclipse.dd.dsf.datamodel.AbstractDMContext; +import org.eclipse.dd.dsf.datamodel.IDMContext; +import org.eclipse.dd.dsf.service.AbstractDsfService; +import org.eclipse.dd.dsf.service.DsfSession; +import org.eclipse.dd.dsf.service.IDsfService; +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.debug.core.IBreakpointManager; +import org.eclipse.debug.core.model.IBreakpoint; +import org.eclipse.tm.internal.tcf.debug.model.ITCFBreakpointListener; +import org.eclipse.tm.internal.tcf.debug.model.ITCFConstants; +import org.eclipse.tm.internal.tcf.debug.model.TCFBreakpointsModel; +import org.eclipse.tm.internal.tcf.debug.model.TCFLaunch; +import org.eclipse.tm.internal.tcf.dsf.Activator; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.osgi.framework.BundleContext; + + +// TODO IBreakpointHitEvent + +public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse.dd.dsf.debug.service.IBreakpoints { + + private class BreakpointDMC extends AbstractDMContext implements IBreakpointDMContext { + + final String id; + final IBreakpoint bp; + final TCFDataCache<Map<String,Object>> status; + + boolean disposed; + + public BreakpointDMC(IDsfService service, final String id, IBreakpoint bp) { + super(service, new IDMContext[0]); + this.id = id; + this.bp = bp; + cache.put(id, this); + status = new TCFDataCache<Map<String,Object>>(channel) { + @Override + public boolean startDataRetrieval() { + assert command == null; + assert !disposed; + if (tcf_bpt_service == null) { + data = null; + valid = true; + return true; + } + command = tcf_bpt_service.getStatus(id, new org.eclipse.tm.tcf.services.IBreakpoints.DoneGetStatus() { + public void doneGetStatus(IToken token, Exception err, Map<String,Object> status) { + if (command != token) return; + command = null; + if (err != null) { + data = null; + error = err; + } + else { + data = status; + } + valid = true; + validate(); + } + }); + return false; + } + }; + } + + @Override + public boolean equals(Object other) { + return super.baseEquals(other) && ((BreakpointDMC)other).id.equals(id); + } + + @Override + public int hashCode() { + return id.hashCode(); + } + + void dispose() { + assert !disposed; + cache.remove(id); + disposed = true; + } + } + + private class BreakpointData implements IBreakpointDMData { + + final IBreakpoint bp; + final BreakpointStatus status; + + BreakpointData(IBreakpoint bp, BreakpointStatus status) { + this.bp = bp; + this.status = status; + } + + public IBreakpoint getPlatformBreakpoint() { + return bp; + } + + public BreakpointStatus getStatus() { + return status; + } + } + + private final ITCFBreakpointListener bp_listener = new ITCFBreakpointListener() { + + public void breakpointStatusChanged(String id) { + final BreakpointDMC dmc = cache.get(id); + if (dmc != null) { + Map<String, Object> map = launch.getBreakpointsStatus().getStatus(dmc.id); + dmc.status.reset(map); + IBreakpointDMEvent e = null; + if (map == null) { + e = new IBreakpointUninstalledDMEvent() { + public IBreakpointDMContext getDMContext() { + return dmc; + } + }; + } + else if (map.get(org.eclipse.tm.tcf.services.IBreakpoints.STATUS_ERROR) != null) { + e = new IBreakpointInstallFailedDMEvent() { + public IBreakpointDMContext getDMContext() { + return dmc; + } + }; + } + else if (map.get(org.eclipse.tm.tcf.services.IBreakpoints.STATUS_PLANTED) != null) { + e = new IBreakpointInstalledDMEvent() { + public IBreakpointDMContext getDMContext() { + return dmc; + } + }; + } + else { + e = new IBreakpointUninstalledDMEvent() { + public IBreakpointDMContext getDMContext() { + return dmc; + } + }; + } + getSession().dispatchEvent(e, getProperties()); + } + } + + public void breakpointRemoved(String id) { + final BreakpointDMC dmc = cache.get(id); + if (dmc != null) { + dmc.dispose(); + IBreakpointDMEvent e = new IBreakpointUninstalledDMEvent() { + public IBreakpointDMContext getDMContext() { + return dmc; + } + }; + getSession().dispatchEvent(e, getProperties()); + } + } + }; + + private final TCFLaunch launch; + private final IChannel channel; + private final org.eclipse.tm.tcf.services.IBreakpoints tcf_bpt_service; + private final Map<String,BreakpointDMC> cache = new HashMap<String,BreakpointDMC>(); + + public TCFDSFBreakpoints(DsfSession session, TCFLaunch launch, final RequestMonitor monitor) { + super(session); + this.launch = launch; + channel = launch.getChannel(); + launch.getBreakpointsStatus().addListener(bp_listener); + tcf_bpt_service = channel.getRemoteService(org.eclipse.tm.tcf.services.IBreakpoints.class); + initialize(new RequestMonitor(getExecutor(), monitor) { + @Override + protected void handleOK() { + String[] class_names = { + org.eclipse.dd.dsf.debug.service.IBreakpoints.class.getName(), + TCFDSFBreakpoints.class.getName() + }; + register(class_names, new Hashtable<String,String>()); + monitor.done(); + } + }); + } + + @Override + public void shutdown(RequestMonitor monitor) { + unregister(); + super.shutdown(monitor); + } + + @Override + protected BundleContext getBundleContext() { + return Activator.getBundleContext(); + } + + public void getAllBreakpoints(IDMContext ctx, DataRequestMonitor<IBreakpointDMContext[]> rm) { + IBreakpointManager bp_manager = DebugPlugin.getDefault().getBreakpointManager(); + TCFBreakpointsModel m = TCFBreakpointsModel.getBreakpointsModel(); + IBreakpoint[] arr = bp_manager.getBreakpoints(ITCFConstants.ID_TCF_DEBUG_MODEL); + ArrayList<IBreakpointDMContext> l = new ArrayList<IBreakpointDMContext>(); + if (arr != null && arr.length == 0) { + for (IBreakpoint bp : arr) { + if (m.isSupported(channel, bp)) { + IMarker marker = bp.getMarker(); + String id = marker.getAttribute(ITCFConstants.ID_TCF_DEBUG_MODEL + + '.' + org.eclipse.tm.tcf.services.IBreakpoints.PROP_ID, (String)null); + if (id != null) { + BreakpointDMC c = cache.get(id); + if (c == null) c = new BreakpointDMC(this, id, bp); + l.add(c); + } + } + } + } + rm.setData(l.toArray(new IBreakpointDMContext[l.size()])); + rm.done(); + } + + public void getBreakpoints(IDMContext dmc, IBreakpoint bp, DataRequestMonitor<IBreakpointDMContext[]> rm) { + TCFBreakpointsModel m = TCFBreakpointsModel.getBreakpointsModel(); + ArrayList<IBreakpointDMContext> l = new ArrayList<IBreakpointDMContext>(); + if (m.isSupported(channel, bp)) { + IMarker marker = bp.getMarker(); + String id = marker.getAttribute(ITCFConstants.ID_TCF_DEBUG_MODEL + + '.' + org.eclipse.tm.tcf.services.IBreakpoints.PROP_ID, (String)null); + if (id != null) { + BreakpointDMC c = cache.get(id); + if (c == null) c = new BreakpointDMC(this, id, bp); + l.add(c); + } + } + rm.setData(l.toArray(new IBreakpointDMContext[l.size()])); + rm.done(); + } + + public void getBreakpointData(final IDMContext dmc, final DataRequestMonitor<IBreakpointDMData> rm) { + if (dmc instanceof BreakpointDMC) { + BreakpointDMC bp = (BreakpointDMC)dmc; + if (!bp.status.validate()) { + bp.status.addWaitingRequest(new IDataRequest() { + public void cancel() { + rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, + REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$ + rm.setCanceled(true); + rm.done(); + } + public void done() { + getBreakpointData(dmc, rm); + } + }); + return; + } + if (bp.status.getError() != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Data error", bp.status.getError())); //$NON-NLS-1$ + rm.done(); + return; + } + Map<String,Object> map = bp.status.getData(); + BreakpointStatus status = BreakpointStatus.FILTERED_OUT; + if (map != null) { + if (map.get(org.eclipse.tm.tcf.services.IBreakpoints.STATUS_ERROR) != null) { + status = BreakpointStatus.FAILED_TO_INSTALL; + } + else if (map.get(org.eclipse.tm.tcf.services.IBreakpoints.STATUS_PLANTED) != null) { + status = BreakpointStatus.INSTALLED; + } + } + rm.setData(new BreakpointData(bp.bp, status)); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + rm.done(); + } + + @SuppressWarnings("unchecked") + public void getModelData(IDMContext dmc, DataRequestMonitor<?> rm) { + if (dmc instanceof BreakpointDMC) { + getBreakpointData((BreakpointDMC)dmc, (DataRequestMonitor<IBreakpointDMData>)rm); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } +} diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFExecutionDMC.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFExecutionDMC.java index 65c6bf206..6246cd99d 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFExecutionDMC.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFExecutionDMC.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.core.services; +package org.eclipse.tm.internal.tcf.dsf.services; import org.eclipse.dd.dsf.datamodel.AbstractDMContext; import org.eclipse.dd.dsf.datamodel.IDMContext; diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFMemory.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFMemory.java index 8918fe4c3..cf40d6a4b 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFMemory.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFMemory.java @@ -1,307 +1,307 @@ -/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, 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:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package com.windriver.tcf.dsf.core.services;
-
-import java.util.Hashtable;
-
-import org.eclipse.cdt.core.IAddress;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
-import org.eclipse.dd.dsf.concurrent.RequestMonitor;
-import org.eclipse.dd.dsf.datamodel.IDMContext;
-import org.eclipse.dd.dsf.service.AbstractDsfService;
-import org.eclipse.dd.dsf.service.DsfSession;
-import org.eclipse.debug.core.model.MemoryByte;
-import org.osgi.framework.BundleContext;
-
-import com.windriver.tcf.api.protocol.IChannel;
-import com.windriver.tcf.api.protocol.IToken;
-import com.windriver.tcf.api.services.IMemory.MemoryContext;
-import com.windriver.tcf.api.services.IMemory.MemoryError;
-import com.windriver.tcf.dsf.core.Activator;
-
-public class TCFDSFMemory extends AbstractDsfService implements org.eclipse.dd.dsf.debug.service.IMemory {
-
- private class MemoryCache implements TCFDSFExecutionDMC.DataCache {
-
- final TCFDataCache<com.windriver.tcf.api.services.IMemory.MemoryContext> context;
-
- MemoryCache(final IChannel channel, final TCFDSFExecutionDMC exe) {
- context = new TCFDataCache<com.windriver.tcf.api.services.IMemory.MemoryContext>(channel) {
- @Override
- public boolean startDataRetrieval() {
- assert command == null;
- String id = exe.getTcfContextId();
- if (id == null || tcf_mem_service == null) {
- data = null;
- valid = true;
- return true;
- }
- command = tcf_mem_service.getContext(id,
- new com.windriver.tcf.api.services.IMemory.DoneGetContext() {
- public void doneGetContext(IToken token, Exception err,
- com.windriver.tcf.api.services.IMemory.MemoryContext ctx) {
- if (command != token) return;
- command = null;
- if (err != null) {
- error = err;
- }
- else {
- data = ctx;
- }
- valid = true;
- validate();
- }
- });
- return false;
- }
- };
- }
- }
-
- private final com.windriver.tcf.api.services.IMemory.MemoryListener mem_listener =
- new com.windriver.tcf.api.services.IMemory.MemoryListener() {
-
- public void contextAdded(MemoryContext[] contexts) {
- }
-
- public void contextChanged(MemoryContext[] contexts) {
- }
-
- public void contextRemoved(String[] context_ids) {
- }
-
- public void memoryChanged(String context_id, Number[] addr, long[] size) {
- TCFDSFRunControl rc = getServicesTracker().getService(TCFDSFRunControl.class);
- TCFDSFExecutionDMC exe = rc.getContext(context_id);
- if (exe == null || exe.memory_cache == null) return;
- for (int n = 0; n < addr.length; n++) {
- long count = size[n];
- // TODO: DSF does not support address ranges
- if (count > 256) count = 256;
- IAddress[] addresses = new IAddress[(int)count];
- for (int i = 0; i < (int)count; i++) {
- addresses[i] = new TCFAddress(addr[n]).add(i);
- }
- getSession().dispatchEvent(new MemoryChangedEvent(exe, addresses), getProperties());
- }
- }
- };
-
- private final IChannel channel;
- private final com.windriver.tcf.api.services.IMemory tcf_mem_service;
-
- public TCFDSFMemory(DsfSession session, IChannel channel, final RequestMonitor monitor) {
- super(session);
- this.channel = channel;
- tcf_mem_service = channel.getRemoteService(com.windriver.tcf.api.services.IMemory.class);
- if (tcf_mem_service != null) tcf_mem_service.addListener(mem_listener);
- initialize(new RequestMonitor(getExecutor(), monitor) {
- @Override
- protected void handleOK() {
- String[] class_names = {
- org.eclipse.dd.dsf.debug.service.IMemory.class.getName(),
- TCFDSFMemory.class.getName()
- };
- register(class_names, new Hashtable<String,String>());
- monitor.done();
- }
- });
- }
-
- @Override
- public void shutdown(RequestMonitor monitor) {
- unregister();
- super.shutdown(monitor);
- }
-
- @Override
- protected BundleContext getBundleContext() {
- return Activator.getBundleContext();
- }
-
- public void fillMemory(final IDMContext dmc, final IAddress address, final long offset,
- final int word_size, final int count, final byte[] pattern, final RequestMonitor rm) {
- if (tcf_mem_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Memory access service is not available", null)); //$NON-NLS-1$
- rm.done();
- }
- else if (dmc instanceof TCFDSFExecutionDMC) {
- final TCFDSFExecutionDMC ctx = (TCFDSFExecutionDMC)dmc;
- if (ctx.memory_cache == null) ctx.memory_cache = new MemoryCache(channel, ctx);
- MemoryCache cache = (MemoryCache)ctx.memory_cache;
- if (!cache.context.validate()) {
- cache.context.addWaitingRequest(new IDataRequest() {
- public void cancel() {
- rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$
- rm.setCanceled(true);
- rm.done();
- }
- public void done() {
- fillMemory(dmc, address, offset, word_size, count, pattern, rm);
- }
- });
- return;
- }
- if (cache.context.getError() != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Data error", cache.context.getError())); //$NON-NLS-1$
- rm.done();
- return;
- }
- com.windriver.tcf.api.services.IMemory.MemoryContext mem = cache.context.getData();
- if (mem == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Invalid DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- mem.fill(address.add(offset).getValue(), word_size, pattern, count * word_size, 0,
- new com.windriver.tcf.api.services.IMemory.DoneMemory() {
- public void doneMemory(IToken token, MemoryError error) {
- if (rm.isCanceled()) return;
- if (error != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Command error", error)); //$NON-NLS-1$
- }
- rm.done();
- }
- });
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-
- public void getMemory(final IDMContext dmc, final IAddress address, final long offset,
- final int word_size, final int count, final DataRequestMonitor<MemoryByte[]> rm) {
- if (tcf_mem_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Memory access service is not available", null)); //$NON-NLS-1$
- rm.done();
- }
- else if (dmc instanceof TCFDSFExecutionDMC) {
- final TCFDSFExecutionDMC ctx = (TCFDSFExecutionDMC)dmc;
- if (ctx.memory_cache == null) ctx.memory_cache = new MemoryCache(channel, ctx);
- MemoryCache cache = (MemoryCache)ctx.memory_cache;
- if (!cache.context.validate()) {
- cache.context.addWaitingRequest(new IDataRequest() {
- public void cancel() {
- rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$
- rm.setCanceled(true);
- rm.done();
- }
- public void done() {
- getMemory(dmc, address, offset, word_size, count, rm);
- }
- });
- return;
- }
- if (cache.context.getError() != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Data error", cache.context.getError())); //$NON-NLS-1$
- rm.done();
- return;
- }
- com.windriver.tcf.api.services.IMemory.MemoryContext mem = cache.context.getData();
- if (mem == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Invalid DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- final byte[] buffer = new byte[word_size * count];
- mem.get(address.add(offset).getValue(), word_size, buffer, 0, count * word_size, 0,
- new com.windriver.tcf.api.services.IMemory.DoneMemory() {
- public void doneMemory(IToken token, MemoryError error) {
- if (rm.isCanceled()) return;
- if (error != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Command error", error)); //$NON-NLS-1$
- }
- MemoryByte[] res = new MemoryByte[buffer.length];
- for (int i = 0; i < buffer.length; i++) {
- res[i] = new MemoryByte(buffer[i]);
- }
- rm.done();
- }
- });
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-
- public void setMemory(final IDMContext dmc, final IAddress address, final long offset,
- final int word_size, final int count, final byte[] buffer, final RequestMonitor rm) {
- if (tcf_mem_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Memory access service is not available", null)); //$NON-NLS-1$
- rm.done();
- }
- else if (dmc instanceof TCFDSFExecutionDMC) {
- final TCFDSFExecutionDMC ctx = (TCFDSFExecutionDMC)dmc;
- if (ctx.memory_cache == null) ctx.memory_cache = new MemoryCache(channel, ctx);
- MemoryCache cache = (MemoryCache)ctx.memory_cache;
- if (!cache.context.validate()) {
- cache.context.addWaitingRequest(new IDataRequest() {
- public void cancel() {
- rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$
- rm.setCanceled(true);
- rm.done();
- }
- public void done() {
- setMemory(dmc, address, offset, word_size, count, buffer, rm);
- }
- });
- return;
- }
- if (cache.context.getError() != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Data error", cache.context.getError())); //$NON-NLS-1$
- rm.done();
- return;
- }
- com.windriver.tcf.api.services.IMemory.MemoryContext mem = cache.context.getData();
- if (mem == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Invalid DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- mem.set(address.add(offset).getValue(), word_size, buffer, 0, count * word_size, 0,
- new com.windriver.tcf.api.services.IMemory.DoneMemory() {
- public void doneMemory(IToken token, MemoryError error) {
- if (rm.isCanceled()) return;
- if (error != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Command error", error)); //$NON-NLS-1$
- }
- rm.done();
- }
- });
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-}
+/******************************************************************************* + * Copyright (c) 2008 Wind River Systems, 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: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.tm.internal.tcf.dsf.services; + +import java.util.Hashtable; + +import org.eclipse.cdt.core.IAddress; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.dd.dsf.concurrent.DataRequestMonitor; +import org.eclipse.dd.dsf.concurrent.RequestMonitor; +import org.eclipse.dd.dsf.datamodel.IDMContext; +import org.eclipse.dd.dsf.service.AbstractDsfService; +import org.eclipse.dd.dsf.service.DsfSession; +import org.eclipse.debug.core.model.MemoryByte; +import org.eclipse.tm.internal.tcf.dsf.Activator; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IMemory.MemoryContext; +import org.eclipse.tm.tcf.services.IMemory.MemoryError; +import org.osgi.framework.BundleContext; + + +public class TCFDSFMemory extends AbstractDsfService implements org.eclipse.dd.dsf.debug.service.IMemory { + + private class MemoryCache implements TCFDSFExecutionDMC.DataCache { + + final TCFDataCache<org.eclipse.tm.tcf.services.IMemory.MemoryContext> context; + + MemoryCache(final IChannel channel, final TCFDSFExecutionDMC exe) { + context = new TCFDataCache<org.eclipse.tm.tcf.services.IMemory.MemoryContext>(channel) { + @Override + public boolean startDataRetrieval() { + assert command == null; + String id = exe.getTcfContextId(); + if (id == null || tcf_mem_service == null) { + data = null; + valid = true; + return true; + } + command = tcf_mem_service.getContext(id, + new org.eclipse.tm.tcf.services.IMemory.DoneGetContext() { + public void doneGetContext(IToken token, Exception err, + org.eclipse.tm.tcf.services.IMemory.MemoryContext ctx) { + if (command != token) return; + command = null; + if (err != null) { + error = err; + } + else { + data = ctx; + } + valid = true; + validate(); + } + }); + return false; + } + }; + } + } + + private final org.eclipse.tm.tcf.services.IMemory.MemoryListener mem_listener = + new org.eclipse.tm.tcf.services.IMemory.MemoryListener() { + + public void contextAdded(MemoryContext[] contexts) { + } + + public void contextChanged(MemoryContext[] contexts) { + } + + public void contextRemoved(String[] context_ids) { + } + + public void memoryChanged(String context_id, Number[] addr, long[] size) { + TCFDSFRunControl rc = getServicesTracker().getService(TCFDSFRunControl.class); + TCFDSFExecutionDMC exe = rc.getContext(context_id); + if (exe == null || exe.memory_cache == null) return; + for (int n = 0; n < addr.length; n++) { + long count = size[n]; + // TODO: DSF does not support address ranges + if (count > 256) count = 256; + IAddress[] addresses = new IAddress[(int)count]; + for (int i = 0; i < (int)count; i++) { + addresses[i] = new TCFAddress(addr[n]).add(i); + } + getSession().dispatchEvent(new MemoryChangedEvent(exe, addresses), getProperties()); + } + } + }; + + private final IChannel channel; + private final org.eclipse.tm.tcf.services.IMemory tcf_mem_service; + + public TCFDSFMemory(DsfSession session, IChannel channel, final RequestMonitor monitor) { + super(session); + this.channel = channel; + tcf_mem_service = channel.getRemoteService(org.eclipse.tm.tcf.services.IMemory.class); + if (tcf_mem_service != null) tcf_mem_service.addListener(mem_listener); + initialize(new RequestMonitor(getExecutor(), monitor) { + @Override + protected void handleOK() { + String[] class_names = { + org.eclipse.dd.dsf.debug.service.IMemory.class.getName(), + TCFDSFMemory.class.getName() + }; + register(class_names, new Hashtable<String,String>()); + monitor.done(); + } + }); + } + + @Override + public void shutdown(RequestMonitor monitor) { + unregister(); + super.shutdown(monitor); + } + + @Override + protected BundleContext getBundleContext() { + return Activator.getBundleContext(); + } + + public void fillMemory(final IDMContext dmc, final IAddress address, final long offset, + final int word_size, final int count, final byte[] pattern, final RequestMonitor rm) { + if (tcf_mem_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Memory access service is not available", null)); //$NON-NLS-1$ + rm.done(); + } + else if (dmc instanceof TCFDSFExecutionDMC) { + final TCFDSFExecutionDMC ctx = (TCFDSFExecutionDMC)dmc; + if (ctx.memory_cache == null) ctx.memory_cache = new MemoryCache(channel, ctx); + MemoryCache cache = (MemoryCache)ctx.memory_cache; + if (!cache.context.validate()) { + cache.context.addWaitingRequest(new IDataRequest() { + public void cancel() { + rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, + REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$ + rm.setCanceled(true); + rm.done(); + } + public void done() { + fillMemory(dmc, address, offset, word_size, count, pattern, rm); + } + }); + return; + } + if (cache.context.getError() != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Data error", cache.context.getError())); //$NON-NLS-1$ + rm.done(); + return; + } + org.eclipse.tm.tcf.services.IMemory.MemoryContext mem = cache.context.getData(); + if (mem == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Invalid DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + mem.fill(address.add(offset).getValue(), word_size, pattern, count * word_size, 0, + new org.eclipse.tm.tcf.services.IMemory.DoneMemory() { + public void doneMemory(IToken token, MemoryError error) { + if (rm.isCanceled()) return; + if (error != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Command error", error)); //$NON-NLS-1$ + } + rm.done(); + } + }); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } + + public void getMemory(final IDMContext dmc, final IAddress address, final long offset, + final int word_size, final int count, final DataRequestMonitor<MemoryByte[]> rm) { + if (tcf_mem_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Memory access service is not available", null)); //$NON-NLS-1$ + rm.done(); + } + else if (dmc instanceof TCFDSFExecutionDMC) { + final TCFDSFExecutionDMC ctx = (TCFDSFExecutionDMC)dmc; + if (ctx.memory_cache == null) ctx.memory_cache = new MemoryCache(channel, ctx); + MemoryCache cache = (MemoryCache)ctx.memory_cache; + if (!cache.context.validate()) { + cache.context.addWaitingRequest(new IDataRequest() { + public void cancel() { + rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, + REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$ + rm.setCanceled(true); + rm.done(); + } + public void done() { + getMemory(dmc, address, offset, word_size, count, rm); + } + }); + return; + } + if (cache.context.getError() != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Data error", cache.context.getError())); //$NON-NLS-1$ + rm.done(); + return; + } + org.eclipse.tm.tcf.services.IMemory.MemoryContext mem = cache.context.getData(); + if (mem == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Invalid DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + final byte[] buffer = new byte[word_size * count]; + mem.get(address.add(offset).getValue(), word_size, buffer, 0, count * word_size, 0, + new org.eclipse.tm.tcf.services.IMemory.DoneMemory() { + public void doneMemory(IToken token, MemoryError error) { + if (rm.isCanceled()) return; + if (error != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Command error", error)); //$NON-NLS-1$ + } + MemoryByte[] res = new MemoryByte[buffer.length]; + for (int i = 0; i < buffer.length; i++) { + res[i] = new MemoryByte(buffer[i]); + } + rm.done(); + } + }); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } + + public void setMemory(final IDMContext dmc, final IAddress address, final long offset, + final int word_size, final int count, final byte[] buffer, final RequestMonitor rm) { + if (tcf_mem_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Memory access service is not available", null)); //$NON-NLS-1$ + rm.done(); + } + else if (dmc instanceof TCFDSFExecutionDMC) { + final TCFDSFExecutionDMC ctx = (TCFDSFExecutionDMC)dmc; + if (ctx.memory_cache == null) ctx.memory_cache = new MemoryCache(channel, ctx); + MemoryCache cache = (MemoryCache)ctx.memory_cache; + if (!cache.context.validate()) { + cache.context.addWaitingRequest(new IDataRequest() { + public void cancel() { + rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, + REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$ + rm.setCanceled(true); + rm.done(); + } + public void done() { + setMemory(dmc, address, offset, word_size, count, buffer, rm); + } + }); + return; + } + if (cache.context.getError() != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Data error", cache.context.getError())); //$NON-NLS-1$ + rm.done(); + return; + } + org.eclipse.tm.tcf.services.IMemory.MemoryContext mem = cache.context.getData(); + if (mem == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Invalid DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + mem.set(address.add(offset).getValue(), word_size, buffer, 0, count * word_size, 0, + new org.eclipse.tm.tcf.services.IMemory.DoneMemory() { + public void doneMemory(IToken token, MemoryError error) { + if (rm.isCanceled()) return; + if (error != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Command error", error)); //$NON-NLS-1$ + } + rm.done(); + } + }); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } +} diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFNativeProcesses.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFNativeProcesses.java index 792f4fdae..b1f66dde4 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFNativeProcesses.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFNativeProcesses.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.core.services; +package org.eclipse.tm.internal.tcf.dsf.services; import java.util.ArrayList; import java.util.Collection; @@ -28,15 +28,15 @@ import org.eclipse.dd.dsf.datamodel.ServiceDMContext; import org.eclipse.dd.dsf.debug.service.INativeProcesses; import org.eclipse.dd.dsf.service.AbstractDsfService; import org.eclipse.dd.dsf.service.DsfSession; +import org.eclipse.tm.internal.tcf.dsf.Activator; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IProcesses; +import org.eclipse.tm.tcf.services.IRunControl; +import org.eclipse.tm.tcf.services.IProcesses.ProcessContext; +import org.eclipse.tm.tcf.services.IRunControl.RunControlContext; import org.osgi.framework.BundleContext; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IProcesses; -import com.windriver.tcf.api.services.IRunControl; -import com.windriver.tcf.api.services.IProcesses.ProcessContext; -import com.windriver.tcf.api.services.IRunControl.RunControlContext; -import com.windriver.tcf.dsf.core.Activator; public class TCFDSFNativeProcesses extends AbstractDsfService implements INativeProcesses { @@ -185,8 +185,8 @@ public class TCFDSFNativeProcesses extends AbstractDsfService implements INative } } - private final com.windriver.tcf.api.services.IRunControl.RunControlListener run_listener = - new com.windriver.tcf.api.services.IRunControl.RunControlListener() { + private final org.eclipse.tm.tcf.services.IRunControl.RunControlListener run_listener = + new org.eclipse.tm.tcf.services.IRunControl.RunControlListener() { public void containerResumed(String[] context_ids) { } @@ -238,7 +238,7 @@ public class TCFDSFNativeProcesses extends AbstractDsfService implements INative }; private final IProcesses tcf_prs_service; - private final com.windriver.tcf.api.services.IRunControl tcf_run_service; + private final org.eclipse.tm.tcf.services.IRunControl tcf_run_service; private final Map<String,ProcessDMC> process_cache = new HashMap<String,ProcessDMC>(); // all attached processes private final Map<String,ThreadDMC> thread_cache = new HashMap<String,ThreadDMC>(); // only some of attached threads private final ProcessDMC root_dmc = new ProcessDMC(null, null); @@ -247,7 +247,7 @@ public class TCFDSFNativeProcesses extends AbstractDsfService implements INative public TCFDSFNativeProcesses(DsfSession session, IChannel channel, final RequestMonitor monitor) { super(session); tcf_prs_service = channel.getRemoteService(IProcesses.class); - tcf_run_service = channel.getRemoteService(com.windriver.tcf.api.services.IRunControl.class); + tcf_run_service = channel.getRemoteService(org.eclipse.tm.tcf.services.IRunControl.class); if (tcf_run_service != null) tcf_run_service.addListener(run_listener); service_dmc = new ServiceDMContext(this, "#native_process"); initialize(new RequestMonitor(getExecutor(), monitor) { diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFProcessDMC.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFProcessDMC.java index e6c673e79..8dacf0692 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFProcessDMC.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFProcessDMC.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.core.services; +package org.eclipse.tm.internal.tcf.dsf.services; import org.eclipse.dd.dsf.datamodel.AbstractDMContext; import org.eclipse.dd.dsf.datamodel.IDMContext; diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFRegisters.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java index 80abe7aee..1614118c3 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFRegisters.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java @@ -1,1060 +1,1060 @@ -/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, 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:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package com.windriver.tcf.dsf.core.services;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
-import org.eclipse.dd.dsf.concurrent.RequestMonitor;
-import org.eclipse.dd.dsf.datamodel.AbstractDMContext;
-import org.eclipse.dd.dsf.datamodel.AbstractDMEvent;
-import org.eclipse.dd.dsf.datamodel.IDMContext;
-import org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext;
-import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason;
-import org.eclipse.dd.dsf.service.AbstractDsfService;
-import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
-import org.eclipse.dd.dsf.service.DsfSession;
-import org.osgi.framework.BundleContext;
-
-import com.windriver.tcf.api.protocol.IChannel;
-import com.windriver.tcf.api.protocol.IToken;
-import com.windriver.tcf.api.services.IRegisters.DoneGet;
-import com.windriver.tcf.api.services.IRegisters.DoneSet;
-import com.windriver.tcf.api.services.IRegisters.NamedValue;
-import com.windriver.tcf.dsf.core.Activator;
-
-public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.dd.dsf.debug.service.IRegisters {
-
- private class ObjectDMC extends AbstractDMContext implements IFormattedDataDMContext {
-
- final String id;
- final RegistersCache children;
- final Map<String,ValueDMC> values;
-
- com.windriver.tcf.api.services.IRegisters.RegistersContext context;
- boolean disposed;
-
- ObjectDMC(String session_id, IDMContext[] parents, String id) {
- super(session_id, parents);
- this.id = id;
- children = new RegistersCache(channel, id, new IDMContext[]{ this });
- values = new HashMap<String,ValueDMC>();
- model.put(id, this);
- }
-
- ObjectDMC(String session_id, IDMContext[] parents, String id, RegistersCache children) {
- super(session_id, parents);
- this.id = id;
- this.children = children;
- values = new HashMap<String,ValueDMC>();
- }
-
- @Override
- public boolean equals(Object other) {
- return super.baseEquals(other) && ((ObjectDMC)other).id.equals(id);
- }
-
- @Override
- public int hashCode() {
- return id.hashCode();
- }
-
- public String getName() {
- return context.getName();
- }
-
- void dispose() {
- assert !disposed;
- children.dispose();
- for (ValueDMC v : values.values()) v.dispose();
- values.clear();
- model.remove(id);
- disposed = true;
- }
- }
-
- private class RegisterGroupDMC extends ObjectDMC implements IRegisterGroupDMContext {
-
- RegisterGroupDMC(String session_id, IDMContext[] parents, String id) {
- super(session_id, parents, id);
- }
-
- /* Constructor for a fake register group - DSF requires at least one group object */
- RegisterGroupDMC(String session_id, IDMContext[] parents, final String id, RegistersCache children) {
- super(session_id, parents, id, children);
- context = new com.windriver.tcf.api.services.IRegisters.RegistersContext() {
- public String[] getAvailableFormats() {
- return null;
- }
- public int[] getBitNumbers() {
- return null;
- }
- public String getDescription() {
- return null;
- }
- public int getFirstBitNumber() {
- return 0;
- }
- public String getID() {
- return id;
- }
- public String getName() {
- return null;
- }
- public NamedValue[] getNamedValues() {
- return null;
- }
- public String getParentID() {
- return null;
- }
- public Map<String, Object> getProperties() {
- return null;
- }
- public boolean hasSideEffects() {
- return false;
- }
- public boolean isBigEndian() {
- return false;
- }
- public boolean isFloat() {
- return false;
- }
- public boolean isLeftToRight() {
- return false;
- }
- public boolean isReadOnce() {
- return false;
- }
- public boolean isReadable() {
- return false;
- }
- public boolean isVolatile() {
- return false;
- }
- public boolean isWriteOnce() {
- return false;
- }
- public boolean isWriteable() {
- return false;
- }
- public IToken get(String format, DoneGet done) {
- throw new Error();
- }
- public IToken set(String format, String value, DoneSet done) {
- throw new Error();
- }
- };
- }
- }
-
- private class RegisterDMC extends ObjectDMC implements IRegisterDMContext {
-
- RegisterDMC(String session_id, IDMContext[] parents, String id) {
- super(session_id, parents, id);
- }
- }
-
- private class BitFieldDMC extends ObjectDMC implements IBitFieldDMContext {
-
- BitFieldDMC(String session_id, IDMContext[] parents, String id) {
- super(session_id, parents, id);
- }
- }
-
- private class ValueDMC extends FormattedValueDMContext {
-
- final RegisterValueCache cache;
-
- boolean disposed;
-
- ValueDMC(ObjectDMC parent, String fmt) {
- super(TCFDSFRegisters.this, parent, fmt);
- cache = new RegisterValueCache(channel, parent.context, fmt);
- }
-
- void dispose() {
- assert !disposed;
- cache.dispose();
- disposed = true;
- }
- }
-
- private class RegisterGroupData implements IRegisterGroupDMData {
-
- final com.windriver.tcf.api.services.IRegisters.RegistersContext context;
-
- RegisterGroupData(com.windriver.tcf.api.services.IRegisters.RegistersContext context) {
- this.context = context;
- }
-
- public String getDescription() {
- return context.getDescription();
- }
-
- public String getName() {
- return context.getName();
- }
- }
-
- private class RegisterData implements IRegisterDMData {
-
- final com.windriver.tcf.api.services.IRegisters.RegistersContext context;
-
- RegisterData(com.windriver.tcf.api.services.IRegisters.RegistersContext context) {
- this.context = context;
- }
-
- public String getDescription() {
- return context.getDescription();
- }
-
- public String getName() {
- return context.getName();
- }
-
- public boolean hasSideEffects() {
- return context.hasSideEffects();
- }
-
- public boolean isFloat() {
- return context.isFloat();
- }
-
- public boolean isReadOnce() {
- return context.isReadOnce();
- }
-
- public boolean isReadable() {
- return context.isReadable();
- }
-
- public boolean isVolatile() {
- return context.isVolatile();
- }
-
- public boolean isWriteOnce() {
- return context.isWriteOnce();
- }
-
- public boolean isWriteable() {
- return context.isWriteable();
- }
- }
-
- private class BitFieldData implements IBitFieldDMData {
-
- final com.windriver.tcf.api.services.IRegisters.RegistersContext context;
-
- IMnemonic[] mnemonics;
- IBitGroup[] bit_groups;
-
- BitFieldData(com.windriver.tcf.api.services.IRegisters.RegistersContext context) {
- this.context = context;
- }
-
- public IBitGroup[] getBitGroup() {
- if (bit_groups == null) {
- int[] arr = context.getBitNumbers();
- if (arr == null) {
- bit_groups = new IBitGroup[0];
- }
- else {
- Arrays.sort(arr);
- ArrayList<IBitGroup> l = new ArrayList<IBitGroup>();
- int i = 0;
- while (i < arr.length) {
- int j = i;
- while (j + 1 < arr.length && arr[j + 1] == arr[j] + 1) j++;
- final int i0 = i;
- final int i1 = j;
- l.add(new IBitGroup() {
- public int bitCount() {
- return i1 - i0 + 1;
- }
- public int startBit() {
- return i0;
- }
- });
- i = j + 1;
- }
- bit_groups = l.toArray(new IBitGroup[l.size()]);
- }
- }
- return bit_groups;
- }
-
- public IMnemonic getCurrentMnemonicValue() {
- // TODO getCurrentMnemonicValue() should be async
- return null;
- }
-
- public String getDescription() {
- return context.getDescription();
- }
-
- public IMnemonic[] getMnemonics() {
- if (mnemonics == null) {
- NamedValue[] arr = context.getNamedValues();
- if (arr == null) {
- mnemonics = new IMnemonic[0];
- }
- else {
- int cnt = 0;
- mnemonics = new IMnemonic[arr.length];
- for (final NamedValue v : arr) {
- mnemonics[cnt++] = new IMnemonic() {
- public String getLongName() {
- return v.getDescription();
- }
- public String getShortName() {
- return v.getName();
- }
- };
- }
- }
- }
- return mnemonics;
- }
-
- public String getName() {
- return context.getName();
- }
-
- public boolean hasSideEffects() {
- return context.hasSideEffects();
- }
-
- public boolean isReadOnce() {
- return context.isReadOnce();
- }
-
- public boolean isReadable() {
- return context.isReadable();
- }
-
- public boolean isWriteOnce() {
- return context.isWriteOnce();
- }
-
- public boolean isWriteable() {
- return context.isWriteable();
- }
-
- public boolean isZeroBasedNumbering() {
- return context.getFirstBitNumber() == 0;
- }
-
- public boolean isZeroBitLeftMost() {
- return context.isLeftToRight();
- }
- }
-
- private class RegistersCache extends TCFDataCache<Map<String,ObjectDMC>>
- implements TCFDSFExecutionDMC.DataCache {
-
- final String id;
- final IDMContext[] parents;
-
- boolean disposed;
-
- public RegistersCache(IChannel channel, String id, IDMContext[] parents) {
- super(channel);
- this.id = id;
- this.parents = parents;
- }
-
- void invalidateRegContents() {
- if (data == null) return;
- for (ObjectDMC dmc : data.values()) {
- for (ValueDMC val : dmc.values.values()) val.cache.reset();
- dmc.children.invalidateRegContents();
- }
- }
-
- void dispose() {
- assert !disposed;
- if (data != null) {
- for (ObjectDMC dmc : data.values()) dmc.dispose();
- }
- reset();
- disposed = true;
- }
-
- @Override
- public boolean startDataRetrieval() {
- assert command == null;
- assert !disposed;
- if (tcf_reg_service == null) {
- data = null;
- valid = true;
- return true;
- }
- command = tcf_reg_service.getChildren(id, new com.windriver.tcf.api.services.IRegisters.DoneGetChildren() {
- public void doneGetChildren(IToken token, Exception err, String[] contexts) {
- if (command != token) return;
- command = null;
- if (err != null) {
- data = null;
- error = err;
- }
- else {
- data = new LinkedHashMap<String,ObjectDMC>();
- if (contexts.length > 0) {
- // TODO DSF service design does not support lazy retrieval of context attributes (because getName() is not async)
- final Set<IToken> cmds = new HashSet<IToken>();
- final IToken cb = new IToken() {
- public boolean cancel() {
- for (IToken x : cmds) x.cancel();
- return false;
- }
- };
- command = cb;
- com.windriver.tcf.api.services.IRegisters.DoneGetContext done = new com.windriver.tcf.api.services.IRegisters.DoneGetContext() {
- public void doneGetContext(IToken token, Exception err,
- com.windriver.tcf.api.services.IRegisters.RegistersContext context) {
- cmds.remove(token);
- if (command != cb) return;
- if (err != null) {
- command.cancel();
- command = null;
- data = null;
- error = err;
- valid = true;
- validate();
- return;
- }
- String id = context.getID();
- ObjectDMC dmc = null;
- if (context.getBitNumbers() != null) {
- dmc = new BitFieldDMC(getSession().getId(), parents, id);
- }
- else if (context.isReadable() || context.isWriteable()) {
- dmc = new RegisterDMC(getSession().getId(), parents, id);
- }
- else {
- dmc = new RegisterGroupDMC(getSession().getId(), parents, id);
- }
- dmc.context = context;
- data.put(id, dmc);
- if (cmds.isEmpty()) {
- command = null;
- valid = true;
- validate();
- }
- }
- };
- for (String id : contexts) {
- cmds.add(tcf_reg_service.getContext(id, done));
- }
- return;
- }
- }
- valid = true;
- validate();
- }
- });
- return false;
- }
- }
-
- private class RegisterValueCache extends TCFDataCache<FormattedValueDMData> {
-
- final com.windriver.tcf.api.services.IRegisters.RegistersContext context;
- final String fmt;
-
- boolean disposed;
-
- public RegisterValueCache(IChannel channel,
- com.windriver.tcf.api.services.IRegisters.RegistersContext context, String fmt) {
- super(channel);
- this.context = context;
- this.fmt = fmt;
- }
-
- @Override
- public boolean startDataRetrieval() {
- assert command == null;
- assert tcf_reg_service != null;
- assert context != null;
- assert !disposed;
- command = context.get(fmt, new com.windriver.tcf.api.services.IRegisters.DoneGet() {
- public void doneGet(IToken token, Exception err, String value) {
- if (command != token) return;
- command = null;
- if (err != null) {
- data = null;
- error = err;
- }
- else {
- data = new FormattedValueDMData(value);
- }
- valid = true;
- validate();
- }
- });
- return false;
- }
-
- void dispose() {
- assert !disposed;
- reset();
- disposed = true;
- }
- }
-
- private static class RegisterGroupChangedEvent extends AbstractDMEvent<IRegisterGroupDMContext>
- implements IGroupChangedDMEvent {
-
- public RegisterGroupChangedEvent(IRegisterGroupDMContext context) {
- super(context);
- }
- }
-
- private static class RegisterChangedEvent extends AbstractDMEvent<IRegisterDMContext>
- implements IRegisterChangedDMEvent {
-
- public RegisterChangedEvent(IRegisterDMContext context) {
- super(context);
- }
- }
-
- private static class BitFieldChangedEvent extends AbstractDMEvent<IBitFieldDMContext>
- implements IBitFieldChangedDMEvent {
-
- public BitFieldChangedEvent(IBitFieldDMContext context) {
- super(context);
- }
- }
-
- private static class GroupsChangedEvent
- extends AbstractDMEvent<org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext>
- implements IGroupsChangedDMEvent {
-
- public GroupsChangedEvent(IExecutionDMContext context) {
- super(context);
- }
- }
-
- private final com.windriver.tcf.api.services.IRegisters.RegistersListener listener =
- new com.windriver.tcf.api.services.IRegisters.RegistersListener() {
-
- public void contextChanged() {
- TCFDSFRunControl rc = getServicesTracker().getService(TCFDSFRunControl.class);
- for (TCFDSFExecutionDMC dmc : rc.getCachedContexts()) {
- RegistersCache c = (RegistersCache)dmc.registers_cache;
- if (c != null) {
- c.dispose();
- dmc.registers_cache = null;
- getSession().dispatchEvent(new GroupsChangedEvent(dmc), getProperties());
- }
- }
- }
-
- public void registerChanged(String id) {
- ObjectDMC dmc = model.get(id);
- if (dmc != null) {
- for (ValueDMC val : dmc.values.values()) val.cache.reset();
- dmc.children.invalidateRegContents();
- if (dmc instanceof RegisterGroupDMC) {
- getSession().dispatchEvent(new RegisterGroupChangedEvent((RegisterGroupDMC)dmc), getProperties());
- }
- else if (dmc instanceof RegisterDMC) {
- getSession().dispatchEvent(new RegisterChangedEvent((RegisterDMC)dmc), getProperties());
- }
- else if (dmc instanceof BitFieldDMC) {
- getSession().dispatchEvent(new BitFieldChangedEvent((BitFieldDMC)dmc), getProperties());
- }
- }
- }
- };
-
- private final IChannel channel;
- private final com.windriver.tcf.api.services.IRegisters tcf_reg_service;
- private final Map<String,ObjectDMC> model;
-
- public TCFDSFRegisters(DsfSession session, IChannel channel, final RequestMonitor monitor) {
- super(session);
- this.channel = channel;
- model = new HashMap<String,ObjectDMC>();
- tcf_reg_service = channel.getRemoteService(com.windriver.tcf.api.services.IRegisters.class);
- if (tcf_reg_service != null) tcf_reg_service.addListener(listener);
- initialize(new RequestMonitor(getExecutor(), monitor) {
- @Override
- protected void handleOK() {
- String[] class_names = {
- org.eclipse.dd.dsf.debug.service.IRegisters.class.getName(),
- TCFDSFRegisters.class.getName()
- };
- register(class_names, new Hashtable<String,String>());
- getSession().addServiceEventListener(TCFDSFRegisters.this, null);
- monitor.done();
- }
- });
- }
-
- @Override
- public void shutdown(RequestMonitor monitor) {
- getSession().removeServiceEventListener(this);
- unregister();
- super.shutdown(monitor);
- }
-
- @Override
- protected BundleContext getBundleContext() {
- return Activator.getBundleContext();
- }
-
- public void getRegisterGroupData(IRegisterGroupDMContext dmc, DataRequestMonitor<IRegisterGroupDMData> rm) {
- if (tcf_reg_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$
- }
- else if (dmc instanceof RegisterGroupDMC) {
- if (((ObjectDMC)dmc).disposed) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- }
- else {
- rm.setData(new RegisterGroupData(((RegisterGroupDMC)dmc).context));
- }
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- rm.done();
- }
-
- public void getRegisterData(IRegisterDMContext dmc, DataRequestMonitor<IRegisterDMData> rm) {
- if (tcf_reg_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$
- }
- else if (dmc instanceof RegisterDMC) {
- if (((ObjectDMC)dmc).disposed) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- }
- else {
- rm.setData(new RegisterData(((RegisterDMC)dmc).context));
- }
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- rm.done();
- }
-
- public void getBitFieldData(IBitFieldDMContext dmc, DataRequestMonitor<IBitFieldDMData> rm) {
- if (tcf_reg_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$
- }
- else if (dmc instanceof BitFieldDMC) {
- if (((ObjectDMC)dmc).disposed) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- }
- else {
- rm.setData(new BitFieldData(((BitFieldDMC)dmc).context));
- }
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- rm.done();
- }
-
- public void getRegisterGroups(final IDMContext dmc, final DataRequestMonitor<IRegisterGroupDMContext[]> rm) {
- if (rm.isCanceled()) return;
- RegistersCache cache = null;
- if (tcf_reg_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$
- }
- else if (dmc instanceof TCFDSFExecutionDMC) {
- TCFDSFExecutionDMC exe = (TCFDSFExecutionDMC)dmc;
- if (exe.registers_cache == null) exe.registers_cache =
- new RegistersCache(channel, exe.getTcfContextId(), new IDMContext[]{ exe });
- cache = (RegistersCache)exe.registers_cache;
- }
- else if (dmc instanceof ObjectDMC) {
- if (((ObjectDMC)dmc).disposed) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- cache = ((ObjectDMC)dmc).children;
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- if (cache != null) {
- if (!cache.validate()) {
- cache.addWaitingRequest(new IDataRequest() {
- public void cancel() {
- rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$
- rm.setCanceled(true);
- rm.done();
- }
- public void done() {
- getRegisterGroups(dmc, rm);
- }
- });
- return;
- }
- if (cache.getError() != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Data error", cache.getError())); //$NON-NLS-1$
- rm.done();
- return;
- }
- Map<String,ObjectDMC> c = cache.getData();
- int cnt = 0;
- for (IDMContext x : c.values()) {
- if (x instanceof RegisterGroupDMC) cnt++;
- }
- if (cnt == 0 && c.size() > 0 && dmc instanceof TCFDSFExecutionDMC) {
- // TODO DSF requires at least one group
- RegisterGroupDMC[] arr = new RegisterGroupDMC[1];
- arr[0] = new RegisterGroupDMC(getSession().getId(), cache.parents, cache.id, cache);
- rm.setData(arr);
- }
- else {
- RegisterGroupDMC[] arr = new RegisterGroupDMC[cnt];
- cnt = 0;
- for (IDMContext x : c.values()) {
- if (x instanceof RegisterGroupDMC) arr[cnt++] = (RegisterGroupDMC)x;
- }
- rm.setData(arr);
- }
- }
- rm.done();
- }
-
- public void getRegisterSubGroups(IDMContext dmc, DataRequestMonitor<IRegisterGroupDMContext[]> rm) {
- getRegisterGroups(dmc, rm);
- }
-
- public void getRegisters(final IDMContext dmc, final DataRequestMonitor<IRegisterDMContext[]> rm) {
- if (rm.isCanceled()) return;
- RegistersCache cache = null;
- if (tcf_reg_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$
- }
- else if (dmc instanceof TCFDSFExecutionDMC) {
- TCFDSFExecutionDMC exe = (TCFDSFExecutionDMC)dmc;
- if (exe.registers_cache == null) exe.registers_cache =
- new RegistersCache(channel, exe.getTcfContextId(), new IDMContext[]{ exe });
- cache = (RegistersCache)exe.registers_cache;
- }
- else if (dmc instanceof ObjectDMC) {
- if (((ObjectDMC)dmc).disposed) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- cache = ((ObjectDMC)dmc).children;
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- if (cache != null) {
- if (!cache.validate()) {
- cache.addWaitingRequest(new IDataRequest() {
- public void cancel() {
- rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$
- rm.setCanceled(true);
- rm.done();
- }
- public void done() {
- getRegisters(dmc, rm);
- }
- });
- return;
- }
- if (cache.getError() != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Data error", cache.getError())); //$NON-NLS-1$
- rm.done();
- return;
- }
- Map<String,ObjectDMC> c = cache.getData();
- int cnt = 0;
- for (IDMContext x : c.values()) {
- if (x instanceof RegisterDMC) cnt++;
- }
- RegisterDMC[] arr = new RegisterDMC[cnt];
- cnt = 0;
- for (IDMContext x : c.values()) {
- if (x instanceof RegisterDMC) arr[cnt++] = (RegisterDMC)x;
- }
- rm.setData(arr);
- }
- rm.done();
- }
-
- public void getBitFields(final IDMContext dmc, final DataRequestMonitor<IBitFieldDMContext[]> rm) {
- if (rm.isCanceled()) return;
- if (tcf_reg_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$
- }
- else if (dmc instanceof ObjectDMC) {
- if (((ObjectDMC)dmc).disposed) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- RegistersCache cache = ((ObjectDMC)dmc).children;
- if (!cache.validate()) {
- cache.addWaitingRequest(new IDataRequest() {
- public void cancel() {
- rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$
- rm.setCanceled(true);
- rm.done();
- }
- public void done() {
- getBitFields(dmc, rm);
- }
- });
- return;
- }
- if (cache.getError() != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Data error", cache.getError())); //$NON-NLS-1$
- rm.done();
- return;
- }
- Map<String,ObjectDMC> c = cache.getData();
- int cnt = 0;
- for (IDMContext x : c.values()) {
- if (x instanceof BitFieldDMC) cnt++;
- }
- BitFieldDMC[] arr = new BitFieldDMC[cnt];
- cnt = 0;
- for (IDMContext x : c.values()) {
- if (x instanceof BitFieldDMC) arr[cnt++] = (BitFieldDMC)x;
- }
- rm.setData(arr);
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- rm.done();
- }
-
- public void writeBitField(IDMContext dmc, String val, String fmt, final RequestMonitor rm) {
- if (tcf_reg_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$
- }
- else if (dmc instanceof ObjectDMC) {
- if (((ObjectDMC)dmc).disposed) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- ((ObjectDMC)dmc).context.set(fmt, val, new com.windriver.tcf.api.services.IRegisters.DoneSet() {
- public void doneSet(IToken token, Exception error) {
- if (rm.isCanceled()) return;
- if (error != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Command error", error)); //$NON-NLS-1$
- }
- rm.done();
- }
- });
- return;
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- rm.done();
- }
-
- public void writeBitField(IDMContext dmc, IMnemonic mnemonic, final RequestMonitor rm) {
- if (tcf_reg_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$
- }
- else if (dmc instanceof ObjectDMC) {
- if (((ObjectDMC)dmc).disposed) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- NamedValue[] arr = ((ObjectDMC)dmc).context.getNamedValues();
- if (arr != null) {
- for (NamedValue nv : arr) {
- if (nv.getName().equals(mnemonic.getShortName())) {
- String fmt = com.windriver.tcf.api.services.IRegisters.FORMAT_DECIMAL;
- String val = nv.getValue().toString();
- ((ObjectDMC)dmc).context.set(fmt, val, new com.windriver.tcf.api.services.IRegisters.DoneSet() {
- public void doneSet(IToken token, Exception error) {
- if (rm.isCanceled()) return;
- if (error != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Command error", error)); //$NON-NLS-1$
- }
- rm.done();
- }
- });
- return;
- }
- }
- }
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown mnemonic", null)); //$NON-NLS-1$
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- rm.done();
- }
-
- public void writeRegister(IDMContext dmc, String val, String fmt, RequestMonitor rm) {
- writeBitField(dmc, val, fmt, rm);
- }
-
- public void getAvailableFormats(IFormattedDataDMContext dmc, DataRequestMonitor<String[]> rm) {
- if (tcf_reg_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$
- }
- else if (dmc instanceof ObjectDMC) {
- rm.setData(((ObjectDMC)dmc).context.getAvailableFormats());
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- rm.done();
- }
-
- public void getFormattedExpressionValue(final FormattedValueDMContext dmc,
- final DataRequestMonitor<FormattedValueDMData> rm) {
- if (rm.isCanceled()) return;
- if (dmc instanceof ValueDMC) {
- ValueDMC vmc = (ValueDMC)dmc;
- if (vmc.disposed) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- if (!vmc.cache.validate()) {
- vmc.cache.addWaitingRequest(new IDataRequest() {
- public void cancel() {
- rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$
- rm.setCanceled(true);
- rm.done();
- }
- public void done() {
- getFormattedExpressionValue(dmc, rm);
- }
- });
- return;
- }
- if (vmc.cache.getError() != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Data error", vmc.cache.getError())); //$NON-NLS-1$
- rm.done();
- return;
- }
- rm.setData(vmc.cache.getData());
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- }
- rm.done();
- }
-
- public FormattedValueDMContext getFormattedValueContext(IFormattedDataDMContext dmc, String fmt) {
- if (dmc instanceof ObjectDMC) {
- ObjectDMC omc = (ObjectDMC)dmc;
- ValueDMC res = omc.values.get(fmt);
- if (res == null) {
- omc.values.put(fmt, res = new ValueDMC(omc, fmt));
- }
- return res;
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- public void getModelData(IDMContext dmc, DataRequestMonitor<?> rm) {
- if (dmc instanceof RegisterGroupDMC) {
- getRegisterGroupData((RegisterGroupDMC)dmc, (DataRequestMonitor<IRegisterGroupDMData>)rm);
- }
- else if (dmc instanceof RegisterDMC) {
- getRegisterData((RegisterDMC)dmc, (DataRequestMonitor<IRegisterDMData>)rm);
- }
- else if (dmc instanceof BitFieldDMC) {
- getBitFieldData((BitFieldDMC)dmc, (DataRequestMonitor<IBitFieldDMData>)rm);
- }
- else if (dmc instanceof FormattedValueDMContext) {
- getFormattedExpressionValue((FormattedValueDMContext)dmc, (DataRequestMonitor<FormattedValueDMData>)rm);
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-
- @DsfServiceEventHandler
- public void eventDispatched(org.eclipse.dd.dsf.debug.service.IRunControl.IResumedDMEvent e) {
- if (e.getReason() != StateChangeReason.STEP) {
- RegistersCache cache = (RegistersCache)((TCFDSFExecutionDMC)e.getDMContext()).registers_cache;
- if (cache != null) cache.invalidateRegContents();
- }
- }
-
- @DsfServiceEventHandler
- public void eventDispatched(org.eclipse.dd.dsf.debug.service.IRunControl.ISuspendedDMEvent e) {
- RegistersCache cache = (RegistersCache)((TCFDSFExecutionDMC)e.getDMContext()).registers_cache;
- if (cache != null) cache.invalidateRegContents();
- }
-
- @DsfServiceEventHandler
- public void eventDispatched(org.eclipse.dd.dsf.debug.service.IRunControl.IExitedDMEvent e) {
- RegistersCache cache = (RegistersCache)((TCFDSFExecutionDMC)e.getExecutionContext()).registers_cache;
- if (cache != null) cache.dispose();
- }
-}
+/******************************************************************************* + * Copyright (c) 2008 Wind River Systems, 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: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.tm.internal.tcf.dsf.services; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.dd.dsf.concurrent.DataRequestMonitor; +import org.eclipse.dd.dsf.concurrent.RequestMonitor; +import org.eclipse.dd.dsf.datamodel.AbstractDMContext; +import org.eclipse.dd.dsf.datamodel.AbstractDMEvent; +import org.eclipse.dd.dsf.datamodel.IDMContext; +import org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext; +import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason; +import org.eclipse.dd.dsf.service.AbstractDsfService; +import org.eclipse.dd.dsf.service.DsfServiceEventHandler; +import org.eclipse.dd.dsf.service.DsfSession; +import org.eclipse.tm.internal.tcf.dsf.Activator; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IRegisters.DoneGet; +import org.eclipse.tm.tcf.services.IRegisters.DoneSet; +import org.eclipse.tm.tcf.services.IRegisters.NamedValue; +import org.osgi.framework.BundleContext; + + +public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.dd.dsf.debug.service.IRegisters { + + private class ObjectDMC extends AbstractDMContext implements IFormattedDataDMContext { + + final String id; + final RegistersCache children; + final Map<String,ValueDMC> values; + + org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; + boolean disposed; + + ObjectDMC(String session_id, IDMContext[] parents, String id) { + super(session_id, parents); + this.id = id; + children = new RegistersCache(channel, id, new IDMContext[]{ this }); + values = new HashMap<String,ValueDMC>(); + model.put(id, this); + } + + ObjectDMC(String session_id, IDMContext[] parents, String id, RegistersCache children) { + super(session_id, parents); + this.id = id; + this.children = children; + values = new HashMap<String,ValueDMC>(); + } + + @Override + public boolean equals(Object other) { + return super.baseEquals(other) && ((ObjectDMC)other).id.equals(id); + } + + @Override + public int hashCode() { + return id.hashCode(); + } + + public String getName() { + return context.getName(); + } + + void dispose() { + assert !disposed; + children.dispose(); + for (ValueDMC v : values.values()) v.dispose(); + values.clear(); + model.remove(id); + disposed = true; + } + } + + private class RegisterGroupDMC extends ObjectDMC implements IRegisterGroupDMContext { + + RegisterGroupDMC(String session_id, IDMContext[] parents, String id) { + super(session_id, parents, id); + } + + /* Constructor for a fake register group - DSF requires at least one group object */ + RegisterGroupDMC(String session_id, IDMContext[] parents, final String id, RegistersCache children) { + super(session_id, parents, id, children); + context = new org.eclipse.tm.tcf.services.IRegisters.RegistersContext() { + public String[] getAvailableFormats() { + return null; + } + public int[] getBitNumbers() { + return null; + } + public String getDescription() { + return null; + } + public int getFirstBitNumber() { + return 0; + } + public String getID() { + return id; + } + public String getName() { + return null; + } + public NamedValue[] getNamedValues() { + return null; + } + public String getParentID() { + return null; + } + public Map<String, Object> getProperties() { + return null; + } + public boolean hasSideEffects() { + return false; + } + public boolean isBigEndian() { + return false; + } + public boolean isFloat() { + return false; + } + public boolean isLeftToRight() { + return false; + } + public boolean isReadOnce() { + return false; + } + public boolean isReadable() { + return false; + } + public boolean isVolatile() { + return false; + } + public boolean isWriteOnce() { + return false; + } + public boolean isWriteable() { + return false; + } + public IToken get(String format, DoneGet done) { + throw new Error(); + } + public IToken set(String format, String value, DoneSet done) { + throw new Error(); + } + }; + } + } + + private class RegisterDMC extends ObjectDMC implements IRegisterDMContext { + + RegisterDMC(String session_id, IDMContext[] parents, String id) { + super(session_id, parents, id); + } + } + + private class BitFieldDMC extends ObjectDMC implements IBitFieldDMContext { + + BitFieldDMC(String session_id, IDMContext[] parents, String id) { + super(session_id, parents, id); + } + } + + private class ValueDMC extends FormattedValueDMContext { + + final RegisterValueCache cache; + + boolean disposed; + + ValueDMC(ObjectDMC parent, String fmt) { + super(TCFDSFRegisters.this, parent, fmt); + cache = new RegisterValueCache(channel, parent.context, fmt); + } + + void dispose() { + assert !disposed; + cache.dispose(); + disposed = true; + } + } + + private class RegisterGroupData implements IRegisterGroupDMData { + + final org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; + + RegisterGroupData(org.eclipse.tm.tcf.services.IRegisters.RegistersContext context) { + this.context = context; + } + + public String getDescription() { + return context.getDescription(); + } + + public String getName() { + return context.getName(); + } + } + + private class RegisterData implements IRegisterDMData { + + final org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; + + RegisterData(org.eclipse.tm.tcf.services.IRegisters.RegistersContext context) { + this.context = context; + } + + public String getDescription() { + return context.getDescription(); + } + + public String getName() { + return context.getName(); + } + + public boolean hasSideEffects() { + return context.hasSideEffects(); + } + + public boolean isFloat() { + return context.isFloat(); + } + + public boolean isReadOnce() { + return context.isReadOnce(); + } + + public boolean isReadable() { + return context.isReadable(); + } + + public boolean isVolatile() { + return context.isVolatile(); + } + + public boolean isWriteOnce() { + return context.isWriteOnce(); + } + + public boolean isWriteable() { + return context.isWriteable(); + } + } + + private class BitFieldData implements IBitFieldDMData { + + final org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; + + IMnemonic[] mnemonics; + IBitGroup[] bit_groups; + + BitFieldData(org.eclipse.tm.tcf.services.IRegisters.RegistersContext context) { + this.context = context; + } + + public IBitGroup[] getBitGroup() { + if (bit_groups == null) { + int[] arr = context.getBitNumbers(); + if (arr == null) { + bit_groups = new IBitGroup[0]; + } + else { + Arrays.sort(arr); + ArrayList<IBitGroup> l = new ArrayList<IBitGroup>(); + int i = 0; + while (i < arr.length) { + int j = i; + while (j + 1 < arr.length && arr[j + 1] == arr[j] + 1) j++; + final int i0 = i; + final int i1 = j; + l.add(new IBitGroup() { + public int bitCount() { + return i1 - i0 + 1; + } + public int startBit() { + return i0; + } + }); + i = j + 1; + } + bit_groups = l.toArray(new IBitGroup[l.size()]); + } + } + return bit_groups; + } + + public IMnemonic getCurrentMnemonicValue() { + // TODO getCurrentMnemonicValue() should be async + return null; + } + + public String getDescription() { + return context.getDescription(); + } + + public IMnemonic[] getMnemonics() { + if (mnemonics == null) { + NamedValue[] arr = context.getNamedValues(); + if (arr == null) { + mnemonics = new IMnemonic[0]; + } + else { + int cnt = 0; + mnemonics = new IMnemonic[arr.length]; + for (final NamedValue v : arr) { + mnemonics[cnt++] = new IMnemonic() { + public String getLongName() { + return v.getDescription(); + } + public String getShortName() { + return v.getName(); + } + }; + } + } + } + return mnemonics; + } + + public String getName() { + return context.getName(); + } + + public boolean hasSideEffects() { + return context.hasSideEffects(); + } + + public boolean isReadOnce() { + return context.isReadOnce(); + } + + public boolean isReadable() { + return context.isReadable(); + } + + public boolean isWriteOnce() { + return context.isWriteOnce(); + } + + public boolean isWriteable() { + return context.isWriteable(); + } + + public boolean isZeroBasedNumbering() { + return context.getFirstBitNumber() == 0; + } + + public boolean isZeroBitLeftMost() { + return context.isLeftToRight(); + } + } + + private class RegistersCache extends TCFDataCache<Map<String,ObjectDMC>> + implements TCFDSFExecutionDMC.DataCache { + + final String id; + final IDMContext[] parents; + + boolean disposed; + + public RegistersCache(IChannel channel, String id, IDMContext[] parents) { + super(channel); + this.id = id; + this.parents = parents; + } + + void invalidateRegContents() { + if (data == null) return; + for (ObjectDMC dmc : data.values()) { + for (ValueDMC val : dmc.values.values()) val.cache.reset(); + dmc.children.invalidateRegContents(); + } + } + + void dispose() { + assert !disposed; + if (data != null) { + for (ObjectDMC dmc : data.values()) dmc.dispose(); + } + reset(); + disposed = true; + } + + @Override + public boolean startDataRetrieval() { + assert command == null; + assert !disposed; + if (tcf_reg_service == null) { + data = null; + valid = true; + return true; + } + command = tcf_reg_service.getChildren(id, new org.eclipse.tm.tcf.services.IRegisters.DoneGetChildren() { + public void doneGetChildren(IToken token, Exception err, String[] contexts) { + if (command != token) return; + command = null; + if (err != null) { + data = null; + error = err; + } + else { + data = new LinkedHashMap<String,ObjectDMC>(); + if (contexts.length > 0) { + // TODO DSF service design does not support lazy retrieval of context attributes (because getName() is not async) + final Set<IToken> cmds = new HashSet<IToken>(); + final IToken cb = new IToken() { + public boolean cancel() { + for (IToken x : cmds) x.cancel(); + return false; + } + }; + command = cb; + org.eclipse.tm.tcf.services.IRegisters.DoneGetContext done = new org.eclipse.tm.tcf.services.IRegisters.DoneGetContext() { + public void doneGetContext(IToken token, Exception err, + org.eclipse.tm.tcf.services.IRegisters.RegistersContext context) { + cmds.remove(token); + if (command != cb) return; + if (err != null) { + command.cancel(); + command = null; + data = null; + error = err; + valid = true; + validate(); + return; + } + String id = context.getID(); + ObjectDMC dmc = null; + if (context.getBitNumbers() != null) { + dmc = new BitFieldDMC(getSession().getId(), parents, id); + } + else if (context.isReadable() || context.isWriteable()) { + dmc = new RegisterDMC(getSession().getId(), parents, id); + } + else { + dmc = new RegisterGroupDMC(getSession().getId(), parents, id); + } + dmc.context = context; + data.put(id, dmc); + if (cmds.isEmpty()) { + command = null; + valid = true; + validate(); + } + } + }; + for (String id : contexts) { + cmds.add(tcf_reg_service.getContext(id, done)); + } + return; + } + } + valid = true; + validate(); + } + }); + return false; + } + } + + private class RegisterValueCache extends TCFDataCache<FormattedValueDMData> { + + final org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; + final String fmt; + + boolean disposed; + + public RegisterValueCache(IChannel channel, + org.eclipse.tm.tcf.services.IRegisters.RegistersContext context, String fmt) { + super(channel); + this.context = context; + this.fmt = fmt; + } + + @Override + public boolean startDataRetrieval() { + assert command == null; + assert tcf_reg_service != null; + assert context != null; + assert !disposed; + command = context.get(fmt, new org.eclipse.tm.tcf.services.IRegisters.DoneGet() { + public void doneGet(IToken token, Exception err, String value) { + if (command != token) return; + command = null; + if (err != null) { + data = null; + error = err; + } + else { + data = new FormattedValueDMData(value); + } + valid = true; + validate(); + } + }); + return false; + } + + void dispose() { + assert !disposed; + reset(); + disposed = true; + } + } + + private static class RegisterGroupChangedEvent extends AbstractDMEvent<IRegisterGroupDMContext> + implements IGroupChangedDMEvent { + + public RegisterGroupChangedEvent(IRegisterGroupDMContext context) { + super(context); + } + } + + private static class RegisterChangedEvent extends AbstractDMEvent<IRegisterDMContext> + implements IRegisterChangedDMEvent { + + public RegisterChangedEvent(IRegisterDMContext context) { + super(context); + } + } + + private static class BitFieldChangedEvent extends AbstractDMEvent<IBitFieldDMContext> + implements IBitFieldChangedDMEvent { + + public BitFieldChangedEvent(IBitFieldDMContext context) { + super(context); + } + } + + private static class GroupsChangedEvent + extends AbstractDMEvent<org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext> + implements IGroupsChangedDMEvent { + + public GroupsChangedEvent(IExecutionDMContext context) { + super(context); + } + } + + private final org.eclipse.tm.tcf.services.IRegisters.RegistersListener listener = + new org.eclipse.tm.tcf.services.IRegisters.RegistersListener() { + + public void contextChanged() { + TCFDSFRunControl rc = getServicesTracker().getService(TCFDSFRunControl.class); + for (TCFDSFExecutionDMC dmc : rc.getCachedContexts()) { + RegistersCache c = (RegistersCache)dmc.registers_cache; + if (c != null) { + c.dispose(); + dmc.registers_cache = null; + getSession().dispatchEvent(new GroupsChangedEvent(dmc), getProperties()); + } + } + } + + public void registerChanged(String id) { + ObjectDMC dmc = model.get(id); + if (dmc != null) { + for (ValueDMC val : dmc.values.values()) val.cache.reset(); + dmc.children.invalidateRegContents(); + if (dmc instanceof RegisterGroupDMC) { + getSession().dispatchEvent(new RegisterGroupChangedEvent((RegisterGroupDMC)dmc), getProperties()); + } + else if (dmc instanceof RegisterDMC) { + getSession().dispatchEvent(new RegisterChangedEvent((RegisterDMC)dmc), getProperties()); + } + else if (dmc instanceof BitFieldDMC) { + getSession().dispatchEvent(new BitFieldChangedEvent((BitFieldDMC)dmc), getProperties()); + } + } + } + }; + + private final IChannel channel; + private final org.eclipse.tm.tcf.services.IRegisters tcf_reg_service; + private final Map<String,ObjectDMC> model; + + public TCFDSFRegisters(DsfSession session, IChannel channel, final RequestMonitor monitor) { + super(session); + this.channel = channel; + model = new HashMap<String,ObjectDMC>(); + tcf_reg_service = channel.getRemoteService(org.eclipse.tm.tcf.services.IRegisters.class); + if (tcf_reg_service != null) tcf_reg_service.addListener(listener); + initialize(new RequestMonitor(getExecutor(), monitor) { + @Override + protected void handleOK() { + String[] class_names = { + org.eclipse.dd.dsf.debug.service.IRegisters.class.getName(), + TCFDSFRegisters.class.getName() + }; + register(class_names, new Hashtable<String,String>()); + getSession().addServiceEventListener(TCFDSFRegisters.this, null); + monitor.done(); + } + }); + } + + @Override + public void shutdown(RequestMonitor monitor) { + getSession().removeServiceEventListener(this); + unregister(); + super.shutdown(monitor); + } + + @Override + protected BundleContext getBundleContext() { + return Activator.getBundleContext(); + } + + public void getRegisterGroupData(IRegisterGroupDMContext dmc, DataRequestMonitor<IRegisterGroupDMData> rm) { + if (tcf_reg_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$ + } + else if (dmc instanceof RegisterGroupDMC) { + if (((ObjectDMC)dmc).disposed) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + } + else { + rm.setData(new RegisterGroupData(((RegisterGroupDMC)dmc).context)); + } + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + rm.done(); + } + + public void getRegisterData(IRegisterDMContext dmc, DataRequestMonitor<IRegisterDMData> rm) { + if (tcf_reg_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$ + } + else if (dmc instanceof RegisterDMC) { + if (((ObjectDMC)dmc).disposed) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + } + else { + rm.setData(new RegisterData(((RegisterDMC)dmc).context)); + } + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + rm.done(); + } + + public void getBitFieldData(IBitFieldDMContext dmc, DataRequestMonitor<IBitFieldDMData> rm) { + if (tcf_reg_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$ + } + else if (dmc instanceof BitFieldDMC) { + if (((ObjectDMC)dmc).disposed) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + } + else { + rm.setData(new BitFieldData(((BitFieldDMC)dmc).context)); + } + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + rm.done(); + } + + public void getRegisterGroups(final IDMContext dmc, final DataRequestMonitor<IRegisterGroupDMContext[]> rm) { + if (rm.isCanceled()) return; + RegistersCache cache = null; + if (tcf_reg_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$ + } + else if (dmc instanceof TCFDSFExecutionDMC) { + TCFDSFExecutionDMC exe = (TCFDSFExecutionDMC)dmc; + if (exe.registers_cache == null) exe.registers_cache = + new RegistersCache(channel, exe.getTcfContextId(), new IDMContext[]{ exe }); + cache = (RegistersCache)exe.registers_cache; + } + else if (dmc instanceof ObjectDMC) { + if (((ObjectDMC)dmc).disposed) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + cache = ((ObjectDMC)dmc).children; + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + if (cache != null) { + if (!cache.validate()) { + cache.addWaitingRequest(new IDataRequest() { + public void cancel() { + rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, + REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$ + rm.setCanceled(true); + rm.done(); + } + public void done() { + getRegisterGroups(dmc, rm); + } + }); + return; + } + if (cache.getError() != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Data error", cache.getError())); //$NON-NLS-1$ + rm.done(); + return; + } + Map<String,ObjectDMC> c = cache.getData(); + int cnt = 0; + for (IDMContext x : c.values()) { + if (x instanceof RegisterGroupDMC) cnt++; + } + if (cnt == 0 && c.size() > 0 && dmc instanceof TCFDSFExecutionDMC) { + // TODO DSF requires at least one group + RegisterGroupDMC[] arr = new RegisterGroupDMC[1]; + arr[0] = new RegisterGroupDMC(getSession().getId(), cache.parents, cache.id, cache); + rm.setData(arr); + } + else { + RegisterGroupDMC[] arr = new RegisterGroupDMC[cnt]; + cnt = 0; + for (IDMContext x : c.values()) { + if (x instanceof RegisterGroupDMC) arr[cnt++] = (RegisterGroupDMC)x; + } + rm.setData(arr); + } + } + rm.done(); + } + + public void getRegisterSubGroups(IDMContext dmc, DataRequestMonitor<IRegisterGroupDMContext[]> rm) { + getRegisterGroups(dmc, rm); + } + + public void getRegisters(final IDMContext dmc, final DataRequestMonitor<IRegisterDMContext[]> rm) { + if (rm.isCanceled()) return; + RegistersCache cache = null; + if (tcf_reg_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$ + } + else if (dmc instanceof TCFDSFExecutionDMC) { + TCFDSFExecutionDMC exe = (TCFDSFExecutionDMC)dmc; + if (exe.registers_cache == null) exe.registers_cache = + new RegistersCache(channel, exe.getTcfContextId(), new IDMContext[]{ exe }); + cache = (RegistersCache)exe.registers_cache; + } + else if (dmc instanceof ObjectDMC) { + if (((ObjectDMC)dmc).disposed) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + cache = ((ObjectDMC)dmc).children; + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + if (cache != null) { + if (!cache.validate()) { + cache.addWaitingRequest(new IDataRequest() { + public void cancel() { + rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, + REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$ + rm.setCanceled(true); + rm.done(); + } + public void done() { + getRegisters(dmc, rm); + } + }); + return; + } + if (cache.getError() != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Data error", cache.getError())); //$NON-NLS-1$ + rm.done(); + return; + } + Map<String,ObjectDMC> c = cache.getData(); + int cnt = 0; + for (IDMContext x : c.values()) { + if (x instanceof RegisterDMC) cnt++; + } + RegisterDMC[] arr = new RegisterDMC[cnt]; + cnt = 0; + for (IDMContext x : c.values()) { + if (x instanceof RegisterDMC) arr[cnt++] = (RegisterDMC)x; + } + rm.setData(arr); + } + rm.done(); + } + + public void getBitFields(final IDMContext dmc, final DataRequestMonitor<IBitFieldDMContext[]> rm) { + if (rm.isCanceled()) return; + if (tcf_reg_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$ + } + else if (dmc instanceof ObjectDMC) { + if (((ObjectDMC)dmc).disposed) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + RegistersCache cache = ((ObjectDMC)dmc).children; + if (!cache.validate()) { + cache.addWaitingRequest(new IDataRequest() { + public void cancel() { + rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, + REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$ + rm.setCanceled(true); + rm.done(); + } + public void done() { + getBitFields(dmc, rm); + } + }); + return; + } + if (cache.getError() != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Data error", cache.getError())); //$NON-NLS-1$ + rm.done(); + return; + } + Map<String,ObjectDMC> c = cache.getData(); + int cnt = 0; + for (IDMContext x : c.values()) { + if (x instanceof BitFieldDMC) cnt++; + } + BitFieldDMC[] arr = new BitFieldDMC[cnt]; + cnt = 0; + for (IDMContext x : c.values()) { + if (x instanceof BitFieldDMC) arr[cnt++] = (BitFieldDMC)x; + } + rm.setData(arr); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + rm.done(); + } + + public void writeBitField(IDMContext dmc, String val, String fmt, final RequestMonitor rm) { + if (tcf_reg_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$ + } + else if (dmc instanceof ObjectDMC) { + if (((ObjectDMC)dmc).disposed) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + ((ObjectDMC)dmc).context.set(fmt, val, new org.eclipse.tm.tcf.services.IRegisters.DoneSet() { + public void doneSet(IToken token, Exception error) { + if (rm.isCanceled()) return; + if (error != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Command error", error)); //$NON-NLS-1$ + } + rm.done(); + } + }); + return; + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + rm.done(); + } + + public void writeBitField(IDMContext dmc, IMnemonic mnemonic, final RequestMonitor rm) { + if (tcf_reg_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$ + } + else if (dmc instanceof ObjectDMC) { + if (((ObjectDMC)dmc).disposed) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + NamedValue[] arr = ((ObjectDMC)dmc).context.getNamedValues(); + if (arr != null) { + for (NamedValue nv : arr) { + if (nv.getName().equals(mnemonic.getShortName())) { + String fmt = org.eclipse.tm.tcf.services.IRegisters.FORMAT_DECIMAL; + String val = nv.getValue().toString(); + ((ObjectDMC)dmc).context.set(fmt, val, new org.eclipse.tm.tcf.services.IRegisters.DoneSet() { + public void doneSet(IToken token, Exception error) { + if (rm.isCanceled()) return; + if (error != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Command error", error)); //$NON-NLS-1$ + } + rm.done(); + } + }); + return; + } + } + } + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown mnemonic", null)); //$NON-NLS-1$ + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + rm.done(); + } + + public void writeRegister(IDMContext dmc, String val, String fmt, RequestMonitor rm) { + writeBitField(dmc, val, fmt, rm); + } + + public void getAvailableFormats(IFormattedDataDMContext dmc, DataRequestMonitor<String[]> rm) { + if (tcf_reg_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Registers service is not available", null)); //$NON-NLS-1$ + } + else if (dmc instanceof ObjectDMC) { + rm.setData(((ObjectDMC)dmc).context.getAvailableFormats()); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + rm.done(); + } + + public void getFormattedExpressionValue(final FormattedValueDMContext dmc, + final DataRequestMonitor<FormattedValueDMData> rm) { + if (rm.isCanceled()) return; + if (dmc instanceof ValueDMC) { + ValueDMC vmc = (ValueDMC)dmc; + if (vmc.disposed) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + if (!vmc.cache.validate()) { + vmc.cache.addWaitingRequest(new IDataRequest() { + public void cancel() { + rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, + REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$ + rm.setCanceled(true); + rm.done(); + } + public void done() { + getFormattedExpressionValue(dmc, rm); + } + }); + return; + } + if (vmc.cache.getError() != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Data error", vmc.cache.getError())); //$NON-NLS-1$ + rm.done(); + return; + } + rm.setData(vmc.cache.getData()); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + } + rm.done(); + } + + public FormattedValueDMContext getFormattedValueContext(IFormattedDataDMContext dmc, String fmt) { + if (dmc instanceof ObjectDMC) { + ObjectDMC omc = (ObjectDMC)dmc; + ValueDMC res = omc.values.get(fmt); + if (res == null) { + omc.values.put(fmt, res = new ValueDMC(omc, fmt)); + } + return res; + } + return null; + } + + @SuppressWarnings("unchecked") + public void getModelData(IDMContext dmc, DataRequestMonitor<?> rm) { + if (dmc instanceof RegisterGroupDMC) { + getRegisterGroupData((RegisterGroupDMC)dmc, (DataRequestMonitor<IRegisterGroupDMData>)rm); + } + else if (dmc instanceof RegisterDMC) { + getRegisterData((RegisterDMC)dmc, (DataRequestMonitor<IRegisterDMData>)rm); + } + else if (dmc instanceof BitFieldDMC) { + getBitFieldData((BitFieldDMC)dmc, (DataRequestMonitor<IBitFieldDMData>)rm); + } + else if (dmc instanceof FormattedValueDMContext) { + getFormattedExpressionValue((FormattedValueDMContext)dmc, (DataRequestMonitor<FormattedValueDMData>)rm); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } + + @DsfServiceEventHandler + public void eventDispatched(org.eclipse.dd.dsf.debug.service.IRunControl.IResumedDMEvent e) { + if (e.getReason() != StateChangeReason.STEP) { + RegistersCache cache = (RegistersCache)((TCFDSFExecutionDMC)e.getDMContext()).registers_cache; + if (cache != null) cache.invalidateRegContents(); + } + } + + @DsfServiceEventHandler + public void eventDispatched(org.eclipse.dd.dsf.debug.service.IRunControl.ISuspendedDMEvent e) { + RegistersCache cache = (RegistersCache)((TCFDSFExecutionDMC)e.getDMContext()).registers_cache; + if (cache != null) cache.invalidateRegContents(); + } + + @DsfServiceEventHandler + public void eventDispatched(org.eclipse.dd.dsf.debug.service.IRunControl.IExitedDMEvent e) { + RegistersCache cache = (RegistersCache)((TCFDSFExecutionDMC)e.getExecutionContext()).registers_cache; + if (cache != null) cache.dispose(); + } +} diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFRunControl.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRunControl.java index 6bfc207a0..0cbe78a87 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFRunControl.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRunControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.core.services; +package org.eclipse.tm.internal.tcf.dsf.services; import java.math.BigInteger; import java.util.ArrayList; @@ -32,14 +32,14 @@ import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IMemoryBlockRetrieval; import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension; +import org.eclipse.tm.internal.tcf.debug.model.ITCFConstants; +import org.eclipse.tm.internal.tcf.dsf.Activator; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IRunControl; +import org.eclipse.tm.tcf.services.IRunControl.RunControlContext; import org.osgi.framework.BundleContext; -import com.windriver.debug.tcf.core.model.ITCFConstants; -import com.windriver.tcf.dsf.core.Activator; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IRunControl; -import com.windriver.tcf.api.services.IRunControl.RunControlContext; public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse.dd.dsf.debug.service.IRunControl { @@ -134,8 +134,8 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. } } - private final com.windriver.tcf.api.services.IRunControl.RunControlListener run_listener = - new com.windriver.tcf.api.services.IRunControl.RunControlListener() { + private final org.eclipse.tm.tcf.services.IRunControl.RunControlListener run_listener = + new org.eclipse.tm.tcf.services.IRunControl.RunControlListener() { public void containerResumed(String[] context_ids) { for (String id : context_ids) { @@ -510,20 +510,20 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. private static StateChangeReason toStateChangeReason(String s) { if (s == null) return StateChangeReason.UNKNOWN; - if (s.equals(com.windriver.tcf.api.services.IRunControl.REASON_USER_REQUEST)) return StateChangeReason.USER_REQUEST; - if (s.equals(com.windriver.tcf.api.services.IRunControl.REASON_STEP)) return StateChangeReason.STEP; - if (s.equals(com.windriver.tcf.api.services.IRunControl.REASON_BREAKPOINT)) return StateChangeReason.BREAKPOINT; - if (s.equals(com.windriver.tcf.api.services.IRunControl.REASON_EXCEPTION)) return StateChangeReason.EXCEPTION; - if (s.equals(com.windriver.tcf.api.services.IRunControl.REASON_CONTAINER)) return StateChangeReason.CONTAINER; - if (s.equals(com.windriver.tcf.api.services.IRunControl.REASON_WATCHPOINT)) return StateChangeReason.WATCHPOINT; - if (s.equals(com.windriver.tcf.api.services.IRunControl.REASON_SIGNAL)) return StateChangeReason.SIGNAL; - if (s.equals(com.windriver.tcf.api.services.IRunControl.REASON_SHAREDLIB)) return StateChangeReason.SHAREDLIB; - if (s.equals(com.windriver.tcf.api.services.IRunControl.REASON_ERROR)) return StateChangeReason.ERROR; + if (s.equals(org.eclipse.tm.tcf.services.IRunControl.REASON_USER_REQUEST)) return StateChangeReason.USER_REQUEST; + if (s.equals(org.eclipse.tm.tcf.services.IRunControl.REASON_STEP)) return StateChangeReason.STEP; + if (s.equals(org.eclipse.tm.tcf.services.IRunControl.REASON_BREAKPOINT)) return StateChangeReason.BREAKPOINT; + if (s.equals(org.eclipse.tm.tcf.services.IRunControl.REASON_EXCEPTION)) return StateChangeReason.EXCEPTION; + if (s.equals(org.eclipse.tm.tcf.services.IRunControl.REASON_CONTAINER)) return StateChangeReason.CONTAINER; + if (s.equals(org.eclipse.tm.tcf.services.IRunControl.REASON_WATCHPOINT)) return StateChangeReason.WATCHPOINT; + if (s.equals(org.eclipse.tm.tcf.services.IRunControl.REASON_SIGNAL)) return StateChangeReason.SIGNAL; + if (s.equals(org.eclipse.tm.tcf.services.IRunControl.REASON_SHAREDLIB)) return StateChangeReason.SHAREDLIB; + if (s.equals(org.eclipse.tm.tcf.services.IRunControl.REASON_ERROR)) return StateChangeReason.ERROR; return StateChangeReason.UNKNOWN; } private final IChannel channel; - private final com.windriver.tcf.api.services.IRunControl tcf_run_service; + private final org.eclipse.tm.tcf.services.IRunControl tcf_run_service; private final Map<String,ExecutionDMC> cache = new HashMap<String,ExecutionDMC>(); private final ExecutionDMC root_dmc; private IDMContext service_dmc; @@ -531,7 +531,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. public TCFDSFRunControl(DsfSession session, IChannel channel, final RequestMonitor monitor) { super(session); this.channel = channel; - tcf_run_service = channel.getRemoteService(com.windriver.tcf.api.services.IRunControl.class); + tcf_run_service = channel.getRemoteService(org.eclipse.tm.tcf.services.IRunControl.class); if (tcf_run_service != null) tcf_run_service.addListener(run_listener); service_dmc = new ServiceDMContext(this, "#run_control"); root_dmc = new ExecutionDMC(null, null); @@ -651,7 +651,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. ExecutionDMC ctx = (ExecutionDMC)context; if (ctx.context.isValid()) { RunControlContext c = ctx.context.getData(); - return c != null && c.canResume(com.windriver.tcf.api.services.IRunControl.RM_STEP_INTO); + return c != null && c.canResume(org.eclipse.tm.tcf.services.IRunControl.RM_STEP_INTO); } } return false; @@ -662,7 +662,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. ExecutionDMC ctx = (ExecutionDMC)context; if (ctx.context.isValid()) { RunControlContext c = ctx.context.getData(); - return c != null && c.canResume(com.windriver.tcf.api.services.IRunControl.RM_RESUME); + return c != null && c.canResume(org.eclipse.tm.tcf.services.IRunControl.RM_RESUME); } } return false; @@ -674,8 +674,8 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. if (ctx.context.isValid()) { RunControlContext c = ctx.context.getData(); if (c != null) { - if (c.canResume(com.windriver.tcf.api.services.IRunControl.RM_STEP_INTO_LINE)) return true; - if (c.canResume(com.windriver.tcf.api.services.IRunControl.RM_STEP_INTO)) return true; + if (c.canResume(org.eclipse.tm.tcf.services.IRunControl.RM_STEP_INTO_LINE)) return true; + if (c.canResume(org.eclipse.tm.tcf.services.IRunControl.RM_STEP_INTO)) return true; } } } @@ -795,29 +795,29 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. RunControlContext c = ctx.context.getData(); if (c != null) { int md = -1; - if (c.canResume(com.windriver.tcf.api.services.IRunControl.RM_STEP_INTO_LINE)) { + if (c.canResume(org.eclipse.tm.tcf.services.IRunControl.RM_STEP_INTO_LINE)) { switch (stepType) { case STEP_OVER: - md = com.windriver.tcf.api.services.IRunControl.RM_STEP_OVER_LINE; + md = org.eclipse.tm.tcf.services.IRunControl.RM_STEP_OVER_LINE; break; case STEP_INTO: - md = com.windriver.tcf.api.services.IRunControl.RM_STEP_INTO_LINE; + md = org.eclipse.tm.tcf.services.IRunControl.RM_STEP_INTO_LINE; break; case STEP_RETURN: - md = com.windriver.tcf.api.services.IRunControl.RM_STEP_OUT; + md = org.eclipse.tm.tcf.services.IRunControl.RM_STEP_OUT; break; } } else { switch (stepType) { case STEP_OVER: - md = com.windriver.tcf.api.services.IRunControl.RM_STEP_OVER; + md = org.eclipse.tm.tcf.services.IRunControl.RM_STEP_OVER; break; case STEP_INTO: - md = com.windriver.tcf.api.services.IRunControl.RM_STEP_INTO; + md = org.eclipse.tm.tcf.services.IRunControl.RM_STEP_INTO; break; case STEP_RETURN: - md = com.windriver.tcf.api.services.IRunControl.RM_STEP_OUT; + md = org.eclipse.tm.tcf.services.IRunControl.RM_STEP_OUT; break; } } @@ -827,7 +827,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. rm.done(); } else { - c.resume(md, 1, new com.windriver.tcf.api.services.IRunControl.DoneCommand() { + c.resume(md, 1, new org.eclipse.tm.tcf.services.IRunControl.DoneCommand() { public void doneCommand(IToken token, Exception error) { if (rm.isCanceled()) return; if (error != null) { @@ -863,13 +863,13 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. int md = -1; switch (stepType) { case STEP_OVER: - md = com.windriver.tcf.api.services.IRunControl.RM_STEP_OVER; + md = org.eclipse.tm.tcf.services.IRunControl.RM_STEP_OVER; break; case STEP_INTO: - md = com.windriver.tcf.api.services.IRunControl.RM_STEP_INTO; + md = org.eclipse.tm.tcf.services.IRunControl.RM_STEP_INTO; break; case STEP_RETURN: - md = com.windriver.tcf.api.services.IRunControl.RM_STEP_OUT; + md = org.eclipse.tm.tcf.services.IRunControl.RM_STEP_OUT; break; } if (md < 0) { @@ -878,7 +878,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. rm.done(); } else { - c.resume(md, 1, new com.windriver.tcf.api.services.IRunControl.DoneCommand() { + c.resume(md, 1, new org.eclipse.tm.tcf.services.IRunControl.DoneCommand() { public void doneCommand(IToken token, Exception error) { if (rm.isCanceled()) return; if (error != null) { @@ -919,8 +919,8 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. if (ctx.context.isValid()) { RunControlContext c = ctx.context.getData(); if (c != null) { - c.resume(com.windriver.tcf.api.services.IRunControl.RM_RESUME, 1, - new com.windriver.tcf.api.services.IRunControl.DoneCommand() { + c.resume(org.eclipse.tm.tcf.services.IRunControl.RM_RESUME, 1, + new org.eclipse.tm.tcf.services.IRunControl.DoneCommand() { public void doneCommand(IToken token, Exception error) { if (rm.isCanceled()) return; if (error != null) { @@ -952,7 +952,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. if (ctx.context.isValid()) { RunControlContext c = ctx.context.getData(); if (c != null) { - c.suspend(new com.windriver.tcf.api.services.IRunControl.DoneCommand() { + c.suspend(new org.eclipse.tm.tcf.services.IRunControl.DoneCommand() { public void doneCommand(IToken token, Exception error) { if (rm.isCanceled()) return; if (error != null) { diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFStack.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java index 85a72f1f7..67f7c9461 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFStack.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java @@ -1,516 +1,516 @@ -/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, 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:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package com.windriver.tcf.dsf.core.services;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.eclipse.cdt.core.IAddress;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
-import org.eclipse.dd.dsf.concurrent.RequestMonitor;
-import org.eclipse.dd.dsf.datamodel.AbstractDMContext;
-import org.eclipse.dd.dsf.datamodel.IDMContext;
-import org.eclipse.dd.dsf.datamodel.ServiceDMContext;
-import org.eclipse.dd.dsf.debug.service.IRunControl;
-import org.eclipse.dd.dsf.debug.service.IStack;
-import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason;
-import org.eclipse.dd.dsf.service.AbstractDsfService;
-import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
-import org.eclipse.dd.dsf.service.DsfSession;
-import org.osgi.framework.BundleContext;
-
-import com.windriver.tcf.api.protocol.IChannel;
-import com.windriver.tcf.api.protocol.IToken;
-import com.windriver.tcf.api.services.ILineNumbers;
-import com.windriver.tcf.api.services.IStackTrace;
-import com.windriver.tcf.api.services.ILineNumbers.CodeArea;
-import com.windriver.tcf.dsf.core.Activator;
-
-public class TCFDSFStack extends AbstractDsfService implements IStack {
-
- private static final String TOP_FRAME = "TopFrame:";
-
- private class TCFFrameDMC extends AbstractDMContext implements IFrameDMContext, Comparable<TCFFrameDMC> {
-
- final String id;
- final TCFDSFExecutionDMC exe_dmc;
- final TCFDataCache<TCFFrameData> frame_data;
-
- int level;
- TCFFrameData prev_data;
-
- public TCFFrameDMC(final TCFDSFExecutionDMC exe_dmc, final String id) {
- super(TCFDSFStack.this.getSession().getId(), new IDMContext[] { exe_dmc });
- this.id = id;
- this.exe_dmc = exe_dmc;
- frame_data = new TCFDataCache<TCFFrameData>(channel) {
-
- @Override
- public boolean startDataRetrieval() {
- assert command == null;
- if (id == null || tcf_stk_service == null) {
- data = null;
- valid = true;
- return true;
- }
- if (level == 0) {
- assert id.startsWith(TOP_FRAME);
- // Top frame is special case: most of its data is stored in CPU registers.
- // Other frames are stored in memory - in thread stack area.
- return getTopFrame();
- }
- command = tcf_stk_service.getContext(new String[]{ id }, new IStackTrace.DoneGetContext() {
- public void doneGetContext(IToken token, Exception err, IStackTrace.StackTraceContext[] context) {
- if (command != token) return;
- command = null;
- if (err != null) {
- error = err;
- data = null;
- }
- else {
- TCFAddress a = null;
- Number n = context[0].getReturnAddress();
- if (n != null) a = new TCFAddress(n);
- // Optimization: skip source position lookup if same address
- if (prev_data != null && prev_data.address.equals(a)) {
- data = prev_data;
- data.context = context[0];
- data.level = level;
- }
- else {
- data = new TCFFrameData();
- data.context = context[0];
- data.address = a;
- data.level = level;
- if (!getSourcePos()) return;
- }
- }
- valid = true;
- validate();
- }
- });
- return false;
- }
-
- private boolean getTopFrame() {
- assert level == 0;
- if (!exe_dmc.validateState()) {
- exe_dmc.addStateWaitingRequest(new IDataRequest() {
- public void cancel() {
- reset();
- }
- public void done() {
- validate();
- }
- });
- return false;
- }
- prev_data = data = new TCFFrameData();
- data.address = exe_dmc.getPC();
- data.level = level;
- if (!getSourcePos()) return false;
- valid = true;
- return true;
- }
-
- private boolean getSourcePos() {
- if (tcf_lns_service == null) return true;
- if (data.address == null) return true;
- BigInteger a1 = data.address.getValue();
- BigInteger a2 = data.address.add(1).getValue();
- command = tcf_lns_service.mapToSource(exe_dmc.getTcfContextId(), a1, a2, new ILineNumbers.DoneMapToSource() {
-
- public void doneMapToSource(IToken token, Exception err, CodeArea[] areas) {
- if (command != token) return;
- command = null;
- if (err != null) {
- data.src_pos_error = err;
- }
- else if (areas != null && areas.length > 0) {
- for (ILineNumbers.CodeArea area : areas) {
- if (data.code_area == null || area.start_line < data.code_area.start_line) {
- data.code_area = area;
- }
- }
- prev_data = data;
- }
- valid = true;
- validate();
- }
- });
- return false;
- }
- };
- }
-
- public int getLevel() {
- return level;
- }
-
- @Override
- public boolean equals(Object other) {
- return super.baseEquals(other) && ((TCFFrameDMC)other).id.equals(id);
- }
-
- @Override
- public int hashCode() {
- return id.hashCode();
- }
-
- @Override
- public String toString() {
- return baseToString() + ".frame[" + id + "]"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public int compareTo(TCFFrameDMC f) {
- if (level < f.level) return -1;
- if (level > f.level) return +1;
- return 0;
- }
- }
-
- private static class TCFFrameData implements IFrameDMData {
-
- IStackTrace.StackTraceContext context;
- IAddress address;
- int level;
- String function;
- Throwable src_pos_error;
- ILineNumbers.CodeArea code_area;
-
- public IAddress getAddress() {
- return address;
- }
-
- public String getFunction() {
- return function;
- }
-
- public int getLevel() {
- return level;
- }
-
- public String getFile() {
- if (code_area == null) return null;
- return code_area.file;
- }
-
- public int getLine() {
- if (code_area == null) return -1;
- return code_area.start_line + 1;
- }
-
- public int getColumn() {
- if (code_area == null) return -1;
- return code_area.start_column + 1;
- }
- }
-
- private class FramesCache extends TCFDataCache<Map<String,TCFFrameDMC>> implements TCFDSFExecutionDMC.DataCache {
-
- private final TCFDSFExecutionDMC dmc;
- private final Map<String,TCFFrameDMC> frame_pool;
-
- FramesCache(IChannel channel, TCFDSFExecutionDMC dmc) {
- super(channel);
- this.dmc = dmc;
- frame_pool = new HashMap<String,TCFFrameDMC>();
- }
-
- @Override
- public boolean startDataRetrieval() {
- assert command == null;
- if (tcf_stk_service == null) {
- data = null;
- valid = true;
- return true;
- }
- assert !dmc.isDisposed();
- command = tcf_stk_service.getChildren(dmc.getTcfContextId(), new IStackTrace.DoneGetChildren() {
- public void doneGetChildren(IToken token, Exception err, String[] contexts) {
- if (command != token) return;
- command = null;
- if (err != null) {
- data = null;
- error = err;
- }
- else {
- data = new HashMap<String,TCFFrameDMC>();
- for (int i = 0; i < contexts.length; i++) {
- String id = contexts[i];
- TCFFrameDMC n = frame_pool.get(id);
- if (n == null) frame_pool.put(id, n = new TCFFrameDMC(dmc, id));
- n.level = contexts.length - i;
- data.put(id, n);
- }
- String id = TOP_FRAME + dmc.getTcfContextId();
- TCFFrameDMC n = frame_pool.get(id);
- if (n == null) frame_pool.put(id, n = new TCFFrameDMC(dmc, id));
- n.level = 0;
- data.put(id, n);
- }
- valid = true;
- validate();
- }
- });
- return false;
- }
-
- void invalidateFrames() {
- reset();
- for (TCFFrameDMC dmc : frame_pool.values()) dmc.frame_data.reset();
- }
-
- void dispose() {
- }
- }
-
- private final IChannel channel;
- private final IStackTrace tcf_stk_service;
- private final ILineNumbers tcf_lns_service;
- private IDMContext service_dmc;
-
- public TCFDSFStack(DsfSession session, IChannel channel, final RequestMonitor monitor) {
- super(session);
- this.channel = channel;
- tcf_stk_service = channel.getRemoteService(IStackTrace.class);
- tcf_lns_service = channel.getRemoteService(ILineNumbers.class);
- service_dmc = new ServiceDMContext(this, "#stack_trace");
- initialize(new RequestMonitor(getExecutor(), monitor) {
- @Override
- protected void handleOK() {
- String[] class_names = {
- IStack.class.getName(),
- TCFDSFStack.class.getName()
- };
- register(class_names, new Hashtable<String,String>());
- getSession().addServiceEventListener(TCFDSFStack.this, null);
- monitor.done();
- }
- });
- }
-
- @Override
- public void shutdown(RequestMonitor monitor) {
- getSession().removeServiceEventListener(this);
- unregister();
- super.shutdown(monitor);
- }
-
- @Override
- protected BundleContext getBundleContext() {
- return Activator.getBundleContext();
- }
-
- public IDMContext getServiceContext() {
- return service_dmc;
- }
-
- public void getArguments(IDMContext dmc, DataRequestMonitor<IVariableDMContext[]> rm) {
- if (dmc instanceof TCFFrameDMC) {
- // TODO function arguments
- rm.setData(new IVariableDMContext[0]);
- rm.done();
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-
- public void getFrameData(final IFrameDMContext dmc, final DataRequestMonitor<IFrameDMData> rm) {
- if (dmc instanceof TCFFrameDMC) {
- final TCFFrameDMC frame_dmc = (TCFFrameDMC)dmc;
- TCFDataCache<TCFFrameData> cache = frame_dmc.frame_data;
- if (!cache.validate()) {
- cache.addWaitingRequest(new IDataRequest() {
- public void cancel() {
- rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$
- rm.setCanceled(true);
- rm.done();
- }
- public void done() {
- getFrameData(dmc, rm);
- }
- });
- return;
- }
- if (cache.getError() != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Data error", cache.getError())); //$NON-NLS-1$
- rm.done();
- return;
- }
- rm.setData(cache.getData());
- rm.done();
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-
- public void getFrames(final IDMContext dmc, final DataRequestMonitor<IFrameDMContext[]> rm) {
- if (tcf_stk_service == null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Stack trace service is not available", null)); //$NON-NLS-1$
- rm.done();
- }
- else if (dmc instanceof TCFDSFExecutionDMC) {
- TCFDSFExecutionDMC exe = (TCFDSFExecutionDMC)dmc;
- if (exe.isDisposed()) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- if (exe.stack_frames_cache == null) exe.stack_frames_cache = new FramesCache(channel, exe);
- FramesCache cache = (FramesCache)exe.stack_frames_cache;
- if (!cache.validate()) {
- cache.addWaitingRequest(new IDataRequest() {
- public void cancel() {
- rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$
- rm.setCanceled(true);
- rm.done();
- }
- public void done() {
- getFrames(dmc, rm);
- }
- });
- return;
- }
- if (cache.getError() != null) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- REQUEST_FAILED, "Data error", cache.getError())); //$NON-NLS-1$
- rm.done();
- return;
- }
- Map<String,TCFFrameDMC> c = cache.getData();
- TCFFrameDMC[] arr = c.values().toArray(new TCFFrameDMC[c.size()]);
- Arrays.sort(arr);
- rm.setData(arr);
- rm.done();
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-
- public void getLocals(IDMContext dmc, DataRequestMonitor<IVariableDMContext[]> rm) {
- if (dmc instanceof TCFFrameDMC) {
- // TODO function local variables
- rm.setData(new IVariableDMContext[0]);
- rm.done();
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-
- public void getStackDepth(DataRequestMonitor<Integer> rm) {
- // TODO don't know what getStackDepth() is supposed to return
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
-
- public void getStackDepth(int maxDepth, DataRequestMonitor<Integer> rm) {
- // TODO don't know what getStackDepth() is supposed to return
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
-
- public void getTopFrame(IDMContext dmc, DataRequestMonitor<IFrameDMContext> rm) {
- if (dmc instanceof TCFDSFExecutionDMC) {
- TCFDSFExecutionDMC exe = (TCFDSFExecutionDMC)dmc;
- if (exe.isDisposed()) {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$
- rm.done();
- return;
- }
- if (exe.stack_frames_cache == null) exe.stack_frames_cache = new FramesCache(channel, exe);
- FramesCache cache = (FramesCache)exe.stack_frames_cache;
- String id = TOP_FRAME + exe.getTcfContextId();
- TCFFrameDMC n = cache.frame_pool.get(id);
- if (n == null) cache.frame_pool.put(id, n = new TCFFrameDMC(exe, id));
- n.level = 0;
- rm.setData(n);
- rm.done();
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-
- public void getVariableData(IVariableDMContext variableDmc, DataRequestMonitor<IVariableDMData> rm) {
- // TODO model data for local variables
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
-
- public boolean isStackAvailable(IDMContext dmc) {
- return tcf_stk_service != null && dmc instanceof TCFDSFExecutionDMC;
- }
-
- @SuppressWarnings("unchecked")
- public void getModelData(IDMContext dmc, DataRequestMonitor<?> rm) {
- if (dmc instanceof IFrameDMContext) {
- getFrameData((IFrameDMContext)dmc, (DataRequestMonitor<IFrameDMData>)rm);
- }
- else if (dmc == service_dmc) {
- ((DataRequestMonitor<TCFDSFStack>)rm).setData(this);
- rm.done();
- }
- else {
- rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
- rm.done();
- }
- }
-
- @DsfServiceEventHandler
- public void eventDispatched(IRunControl.IResumedDMEvent e) {
- if (e.getReason() != StateChangeReason.STEP) {
- FramesCache cache = (FramesCache)((TCFDSFExecutionDMC)e.getDMContext()).stack_frames_cache;
- if (cache != null) cache.invalidateFrames();
- }
- }
-
- @DsfServiceEventHandler
- public void eventDispatched(IRunControl.ISuspendedDMEvent e) {
- FramesCache cache = (FramesCache)((TCFDSFExecutionDMC)e.getDMContext()).stack_frames_cache;
- if (cache != null) cache.invalidateFrames();
- }
-
- @DsfServiceEventHandler
- public void eventDispatched(IRunControl.IExitedDMEvent e) {
- FramesCache cache = (FramesCache)((TCFDSFExecutionDMC)e.getExecutionContext()).stack_frames_cache;
- if (cache != null) cache.dispose();
- }
-}
+/******************************************************************************* + * Copyright (c) 2008 Wind River Systems, 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: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.tm.internal.tcf.dsf.services; + +import java.math.BigInteger; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; + +import org.eclipse.cdt.core.IAddress; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.dd.dsf.concurrent.DataRequestMonitor; +import org.eclipse.dd.dsf.concurrent.RequestMonitor; +import org.eclipse.dd.dsf.datamodel.AbstractDMContext; +import org.eclipse.dd.dsf.datamodel.IDMContext; +import org.eclipse.dd.dsf.datamodel.ServiceDMContext; +import org.eclipse.dd.dsf.debug.service.IRunControl; +import org.eclipse.dd.dsf.debug.service.IStack; +import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason; +import org.eclipse.dd.dsf.service.AbstractDsfService; +import org.eclipse.dd.dsf.service.DsfServiceEventHandler; +import org.eclipse.dd.dsf.service.DsfSession; +import org.eclipse.tm.internal.tcf.dsf.Activator; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.ILineNumbers; +import org.eclipse.tm.tcf.services.IStackTrace; +import org.eclipse.tm.tcf.services.ILineNumbers.CodeArea; +import org.osgi.framework.BundleContext; + + +public class TCFDSFStack extends AbstractDsfService implements IStack { + + private static final String TOP_FRAME = "TopFrame:"; + + private class TCFFrameDMC extends AbstractDMContext implements IFrameDMContext, Comparable<TCFFrameDMC> { + + final String id; + final TCFDSFExecutionDMC exe_dmc; + final TCFDataCache<TCFFrameData> frame_data; + + int level; + TCFFrameData prev_data; + + public TCFFrameDMC(final TCFDSFExecutionDMC exe_dmc, final String id) { + super(TCFDSFStack.this.getSession().getId(), new IDMContext[] { exe_dmc }); + this.id = id; + this.exe_dmc = exe_dmc; + frame_data = new TCFDataCache<TCFFrameData>(channel) { + + @Override + public boolean startDataRetrieval() { + assert command == null; + if (id == null || tcf_stk_service == null) { + data = null; + valid = true; + return true; + } + if (level == 0) { + assert id.startsWith(TOP_FRAME); + // Top frame is special case: most of its data is stored in CPU registers. + // Other frames are stored in memory - in thread stack area. + return getTopFrame(); + } + command = tcf_stk_service.getContext(new String[]{ id }, new IStackTrace.DoneGetContext() { + public void doneGetContext(IToken token, Exception err, IStackTrace.StackTraceContext[] context) { + if (command != token) return; + command = null; + if (err != null) { + error = err; + data = null; + } + else { + TCFAddress a = null; + Number n = context[0].getReturnAddress(); + if (n != null) a = new TCFAddress(n); + // Optimization: skip source position lookup if same address + if (prev_data != null && prev_data.address.equals(a)) { + data = prev_data; + data.context = context[0]; + data.level = level; + } + else { + data = new TCFFrameData(); + data.context = context[0]; + data.address = a; + data.level = level; + if (!getSourcePos()) return; + } + } + valid = true; + validate(); + } + }); + return false; + } + + private boolean getTopFrame() { + assert level == 0; + if (!exe_dmc.validateState()) { + exe_dmc.addStateWaitingRequest(new IDataRequest() { + public void cancel() { + reset(); + } + public void done() { + validate(); + } + }); + return false; + } + prev_data = data = new TCFFrameData(); + data.address = exe_dmc.getPC(); + data.level = level; + if (!getSourcePos()) return false; + valid = true; + return true; + } + + private boolean getSourcePos() { + if (tcf_lns_service == null) return true; + if (data.address == null) return true; + BigInteger a1 = data.address.getValue(); + BigInteger a2 = data.address.add(1).getValue(); + command = tcf_lns_service.mapToSource(exe_dmc.getTcfContextId(), a1, a2, new ILineNumbers.DoneMapToSource() { + + public void doneMapToSource(IToken token, Exception err, CodeArea[] areas) { + if (command != token) return; + command = null; + if (err != null) { + data.src_pos_error = err; + } + else if (areas != null && areas.length > 0) { + for (ILineNumbers.CodeArea area : areas) { + if (data.code_area == null || area.start_line < data.code_area.start_line) { + data.code_area = area; + } + } + prev_data = data; + } + valid = true; + validate(); + } + }); + return false; + } + }; + } + + public int getLevel() { + return level; + } + + @Override + public boolean equals(Object other) { + return super.baseEquals(other) && ((TCFFrameDMC)other).id.equals(id); + } + + @Override + public int hashCode() { + return id.hashCode(); + } + + @Override + public String toString() { + return baseToString() + ".frame[" + id + "]"; //$NON-NLS-1$ //$NON-NLS-2$ + } + + public int compareTo(TCFFrameDMC f) { + if (level < f.level) return -1; + if (level > f.level) return +1; + return 0; + } + } + + private static class TCFFrameData implements IFrameDMData { + + IStackTrace.StackTraceContext context; + IAddress address; + int level; + String function; + Throwable src_pos_error; + ILineNumbers.CodeArea code_area; + + public IAddress getAddress() { + return address; + } + + public String getFunction() { + return function; + } + + public int getLevel() { + return level; + } + + public String getFile() { + if (code_area == null) return null; + return code_area.file; + } + + public int getLine() { + if (code_area == null) return -1; + return code_area.start_line + 1; + } + + public int getColumn() { + if (code_area == null) return -1; + return code_area.start_column + 1; + } + } + + private class FramesCache extends TCFDataCache<Map<String,TCFFrameDMC>> implements TCFDSFExecutionDMC.DataCache { + + private final TCFDSFExecutionDMC dmc; + private final Map<String,TCFFrameDMC> frame_pool; + + FramesCache(IChannel channel, TCFDSFExecutionDMC dmc) { + super(channel); + this.dmc = dmc; + frame_pool = new HashMap<String,TCFFrameDMC>(); + } + + @Override + public boolean startDataRetrieval() { + assert command == null; + if (tcf_stk_service == null) { + data = null; + valid = true; + return true; + } + assert !dmc.isDisposed(); + command = tcf_stk_service.getChildren(dmc.getTcfContextId(), new IStackTrace.DoneGetChildren() { + public void doneGetChildren(IToken token, Exception err, String[] contexts) { + if (command != token) return; + command = null; + if (err != null) { + data = null; + error = err; + } + else { + data = new HashMap<String,TCFFrameDMC>(); + for (int i = 0; i < contexts.length; i++) { + String id = contexts[i]; + TCFFrameDMC n = frame_pool.get(id); + if (n == null) frame_pool.put(id, n = new TCFFrameDMC(dmc, id)); + n.level = contexts.length - i; + data.put(id, n); + } + String id = TOP_FRAME + dmc.getTcfContextId(); + TCFFrameDMC n = frame_pool.get(id); + if (n == null) frame_pool.put(id, n = new TCFFrameDMC(dmc, id)); + n.level = 0; + data.put(id, n); + } + valid = true; + validate(); + } + }); + return false; + } + + void invalidateFrames() { + reset(); + for (TCFFrameDMC dmc : frame_pool.values()) dmc.frame_data.reset(); + } + + void dispose() { + } + } + + private final IChannel channel; + private final IStackTrace tcf_stk_service; + private final ILineNumbers tcf_lns_service; + private IDMContext service_dmc; + + public TCFDSFStack(DsfSession session, IChannel channel, final RequestMonitor monitor) { + super(session); + this.channel = channel; + tcf_stk_service = channel.getRemoteService(IStackTrace.class); + tcf_lns_service = channel.getRemoteService(ILineNumbers.class); + service_dmc = new ServiceDMContext(this, "#stack_trace"); + initialize(new RequestMonitor(getExecutor(), monitor) { + @Override + protected void handleOK() { + String[] class_names = { + IStack.class.getName(), + TCFDSFStack.class.getName() + }; + register(class_names, new Hashtable<String,String>()); + getSession().addServiceEventListener(TCFDSFStack.this, null); + monitor.done(); + } + }); + } + + @Override + public void shutdown(RequestMonitor monitor) { + getSession().removeServiceEventListener(this); + unregister(); + super.shutdown(monitor); + } + + @Override + protected BundleContext getBundleContext() { + return Activator.getBundleContext(); + } + + public IDMContext getServiceContext() { + return service_dmc; + } + + public void getArguments(IDMContext dmc, DataRequestMonitor<IVariableDMContext[]> rm) { + if (dmc instanceof TCFFrameDMC) { + // TODO function arguments + rm.setData(new IVariableDMContext[0]); + rm.done(); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } + + public void getFrameData(final IFrameDMContext dmc, final DataRequestMonitor<IFrameDMData> rm) { + if (dmc instanceof TCFFrameDMC) { + final TCFFrameDMC frame_dmc = (TCFFrameDMC)dmc; + TCFDataCache<TCFFrameData> cache = frame_dmc.frame_data; + if (!cache.validate()) { + cache.addWaitingRequest(new IDataRequest() { + public void cancel() { + rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, + REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$ + rm.setCanceled(true); + rm.done(); + } + public void done() { + getFrameData(dmc, rm); + } + }); + return; + } + if (cache.getError() != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Data error", cache.getError())); //$NON-NLS-1$ + rm.done(); + return; + } + rm.setData(cache.getData()); + rm.done(); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } + + public void getFrames(final IDMContext dmc, final DataRequestMonitor<IFrameDMContext[]> rm) { + if (tcf_stk_service == null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Stack trace service is not available", null)); //$NON-NLS-1$ + rm.done(); + } + else if (dmc instanceof TCFDSFExecutionDMC) { + TCFDSFExecutionDMC exe = (TCFDSFExecutionDMC)dmc; + if (exe.isDisposed()) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + if (exe.stack_frames_cache == null) exe.stack_frames_cache = new FramesCache(channel, exe); + FramesCache cache = (FramesCache)exe.stack_frames_cache; + if (!cache.validate()) { + cache.addWaitingRequest(new IDataRequest() { + public void cancel() { + rm.setStatus(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, + REQUEST_FAILED, "Canceled", null)); //$NON-NLS-1$ + rm.setCanceled(true); + rm.done(); + } + public void done() { + getFrames(dmc, rm); + } + }); + return; + } + if (cache.getError() != null) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + REQUEST_FAILED, "Data error", cache.getError())); //$NON-NLS-1$ + rm.done(); + return; + } + Map<String,TCFFrameDMC> c = cache.getData(); + TCFFrameDMC[] arr = c.values().toArray(new TCFFrameDMC[c.size()]); + Arrays.sort(arr); + rm.setData(arr); + rm.done(); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } + + public void getLocals(IDMContext dmc, DataRequestMonitor<IVariableDMContext[]> rm) { + if (dmc instanceof TCFFrameDMC) { + // TODO function local variables + rm.setData(new IVariableDMContext[0]); + rm.done(); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } + + public void getStackDepth(DataRequestMonitor<Integer> rm) { + // TODO don't know what getStackDepth() is supposed to return + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + + public void getStackDepth(int maxDepth, DataRequestMonitor<Integer> rm) { + // TODO don't know what getStackDepth() is supposed to return + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + + public void getTopFrame(IDMContext dmc, DataRequestMonitor<IFrameDMContext> rm) { + if (dmc instanceof TCFDSFExecutionDMC) { + TCFDSFExecutionDMC exe = (TCFDSFExecutionDMC)dmc; + if (exe.isDisposed()) { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Disposed DMC", null)); //$NON-NLS-1$ + rm.done(); + return; + } + if (exe.stack_frames_cache == null) exe.stack_frames_cache = new FramesCache(channel, exe); + FramesCache cache = (FramesCache)exe.stack_frames_cache; + String id = TOP_FRAME + exe.getTcfContextId(); + TCFFrameDMC n = cache.frame_pool.get(id); + if (n == null) cache.frame_pool.put(id, n = new TCFFrameDMC(exe, id)); + n.level = 0; + rm.setData(n); + rm.done(); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } + + public void getVariableData(IVariableDMContext variableDmc, DataRequestMonitor<IVariableDMData> rm) { + // TODO model data for local variables + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + + public boolean isStackAvailable(IDMContext dmc) { + return tcf_stk_service != null && dmc instanceof TCFDSFExecutionDMC; + } + + @SuppressWarnings("unchecked") + public void getModelData(IDMContext dmc, DataRequestMonitor<?> rm) { + if (dmc instanceof IFrameDMContext) { + getFrameData((IFrameDMContext)dmc, (DataRequestMonitor<IFrameDMData>)rm); + } + else if (dmc == service_dmc) { + ((DataRequestMonitor<TCFDSFStack>)rm).setData(this); + rm.done(); + } + else { + rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ + rm.done(); + } + } + + @DsfServiceEventHandler + public void eventDispatched(IRunControl.IResumedDMEvent e) { + if (e.getReason() != StateChangeReason.STEP) { + FramesCache cache = (FramesCache)((TCFDSFExecutionDMC)e.getDMContext()).stack_frames_cache; + if (cache != null) cache.invalidateFrames(); + } + } + + @DsfServiceEventHandler + public void eventDispatched(IRunControl.ISuspendedDMEvent e) { + FramesCache cache = (FramesCache)((TCFDSFExecutionDMC)e.getDMContext()).stack_frames_cache; + if (cache != null) cache.invalidateFrames(); + } + + @DsfServiceEventHandler + public void eventDispatched(IRunControl.IExitedDMEvent e) { + FramesCache cache = (FramesCache)((TCFDSFExecutionDMC)e.getExecutionContext()).stack_frames_cache; + if (cache != null) cache.dispose(); + } +} diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFStepQueueManager.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStepQueueManager.java index 360a95ac4..dd5e2042b 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFStepQueueManager.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStepQueueManager.java @@ -1,233 +1,233 @@ -/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, 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:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package com.windriver.tcf.dsf.core.services;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.dd.dsf.concurrent.DsfRunnable;
-import org.eclipse.dd.dsf.concurrent.RequestMonitor;
-import org.eclipse.dd.dsf.datamodel.DMContexts;
-import org.eclipse.dd.dsf.datamodel.IDMContext;
-import org.eclipse.dd.dsf.debug.service.IRunControl;
-import org.eclipse.dd.dsf.debug.service.IStepQueueManager;
-import org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext;
-import org.eclipse.dd.dsf.debug.service.IRunControl.IResumedDMEvent;
-import org.eclipse.dd.dsf.debug.service.IRunControl.ISuspendedDMEvent;
-import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason;
-import org.eclipse.dd.dsf.debug.service.IRunControl.StepType;
-import org.eclipse.dd.dsf.service.AbstractDsfService;
-import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
-import org.eclipse.dd.dsf.service.DsfSession;
-import org.osgi.framework.BundleContext;
-
-import com.windriver.tcf.dsf.core.Activator;
-
-public class TCFDSFStepQueueManager extends AbstractDsfService
-implements IStepQueueManager{
-
- private static class StepRequest {
- StepType fStepType;
- boolean fIsInstructionStep;
- StepRequest(StepType type, boolean instruction) {
- fStepType = type;
- fIsInstructionStep = instruction;
- }
- }
-
- private IRunControl fRunControl;
- private int fQueueDepth = 3;
- private Map<IExecutionDMContext,List<StepRequest>> fStepQueues = new HashMap<IExecutionDMContext,List<StepRequest>>();
- private Map<IExecutionDMContext,Boolean> fTimedOutFlags = new HashMap<IExecutionDMContext,Boolean>();
- private Map<IExecutionDMContext,ScheduledFuture<?>> fTimedOutFutures = new HashMap<IExecutionDMContext,ScheduledFuture<?>>();
-
- public TCFDSFStepQueueManager(DsfSession session) {
- super(session);
- }
-
- ///////////////////////////////////////////////////////////////////////////
- // IDsfService
- @Override
- public void initialize(final RequestMonitor requestMonitor) {
- super.initialize(
- new RequestMonitor(getExecutor(), requestMonitor) {
- @Override
- protected void handleOK() {
- doInitialize(requestMonitor);
- }});
- }
-
- private void doInitialize(final RequestMonitor requestMonitor) {
- fRunControl = getServicesTracker().getService(IRunControl.class);
-
- getSession().addServiceEventListener(this, null);
- register(new String[]{IStepQueueManager.class.getName()}, new Hashtable<String,String>());
- requestMonitor.done();
- }
-
- @Override
- public void shutdown(final RequestMonitor requestMonitor) {
- unregister();
- getSession().removeServiceEventListener(this);
- super.shutdown(requestMonitor);
- }
-
- ///////////////////////////////////////////////////////////////////////////
- // AbstractService
- @Override
- protected BundleContext getBundleContext() {
- return Activator.getBundleContext();
- }
-
- ///////////////////////////////////////////////////////////////////////////
- // IStepQueueManager
- public boolean canEnqueueStep(IDMContext ctx) {
- IExecutionDMContext execCtx = DMContexts.getAncestorOfType(ctx, IExecutionDMContext.class);
- return execCtx != null &&
- ( (fRunControl.isSuspended(execCtx) && fRunControl.canStep(execCtx)) ||
- (fRunControl.isStepping(execCtx) && !isSteppingTimedOut(execCtx)) );
- }
-
- // IStepQueueManager
- public boolean canEnqueueInstructionStep(IDMContext ctx) {
- IExecutionDMContext execCtx = DMContexts.getAncestorOfType(ctx, IExecutionDMContext.class);
- return execCtx != null &&
- ( (fRunControl.isSuspended(execCtx) && fRunControl.canInstructionStep(execCtx)) ||
- (fRunControl.isStepping(execCtx) && !isSteppingTimedOut(execCtx)) );
- }
-
- public int getPendingStepCount(IDMContext execCtx) {
- List<StepRequest> stepQueue = fStepQueues.get(execCtx);
- if (stepQueue == null) return 0;
- return stepQueue.size();
- }
-
- public void enqueueStep(IDMContext ctx, StepType stepType) {
- IExecutionDMContext execCtx = DMContexts.getAncestorOfType(ctx, IExecutionDMContext.class);
- if (execCtx != null) {
- if (fRunControl.canStep(execCtx)) {
- fRunControl.step(execCtx, stepType, new RequestMonitor(getExecutor(), null));
- } else if (canEnqueueStep(execCtx)) {
- List<StepRequest> stepQueue = fStepQueues.get(execCtx);
- if (stepQueue == null) {
- stepQueue = new LinkedList<StepRequest>();
- fStepQueues.put(execCtx, stepQueue);
- }
- if (stepQueue.size() < fQueueDepth) {
- stepQueue.add(new StepRequest(stepType, false));
- }
- }
- }
- }
-
- public void enqueueInstructionStep(IDMContext ctx, StepType stepType) {
- IExecutionDMContext execCtx = DMContexts.getAncestorOfType(ctx, IExecutionDMContext.class);
- if (execCtx != null) {
- if (fRunControl.canInstructionStep(execCtx)) {
- fRunControl.instructionStep(execCtx, stepType, new RequestMonitor(getExecutor(), null));
- }
- else if (canEnqueueInstructionStep(execCtx)) {
- List<StepRequest> stepQueue = fStepQueues.get(execCtx);
- if (stepQueue == null) {
- stepQueue = new LinkedList<StepRequest>();
- fStepQueues.put(execCtx, stepQueue);
- }
- if (stepQueue.size() < fQueueDepth) {
- stepQueue.add(new StepRequest(stepType, true));
- }
- }
- }
- }
-
- public boolean isSteppingTimedOut(IDMContext context) {
- IExecutionDMContext execCtx = DMContexts.getAncestorOfType(context, IExecutionDMContext.class);
- if (execCtx != null) {
- return fTimedOutFlags.containsKey(execCtx) ? fTimedOutFlags.get(execCtx) : false;
- }
- return false;
- }
-
-
- public int getStepQueueDepth() { return fQueueDepth; }
- public void setStepQueueDepth(int depth) { fQueueDepth = depth; }
-
- ///////////////////////////////////////////////////////////////////////////
-
- @DsfServiceEventHandler
- public void eventDispatched(ISuspendedDMEvent e) {
- // Take care of the stepping time out
- fTimedOutFlags.remove(e.getDMContext());
- ScheduledFuture<?> future = fTimedOutFutures.remove(e.getDMContext());
- if (future != null) future.cancel(false);
-
- // Check if there's a step pending, if so execute it
- if (fStepQueues.containsKey(e.getDMContext())) {
- List<StepRequest> queue = fStepQueues.get(e.getDMContext());
- StepRequest request = queue.remove(queue.size() - 1);
- if (queue.isEmpty()) fStepQueues.remove(e.getDMContext());
- if (request.fIsInstructionStep) {
- if (fRunControl.canInstructionStep(e.getDMContext())) {
- fRunControl.instructionStep(
- e.getDMContext(), request.fStepType, new RequestMonitor(getExecutor(), null));
- } else {
- // For whatever reason we can't step anymore, so clear out
- // the step queue.
- fStepQueues.remove(e.getDMContext());
- }
- } else {
- if (fRunControl.canStep(e.getDMContext())) {
- fRunControl.step(e.getDMContext(), request.fStepType,new RequestMonitor(getExecutor(), null));
- } else {
- // For whatever reason we can't step anymore, so clear out
- // the step queue.
- fStepQueues.remove(e.getDMContext());
- }
- }
- }
- }
-
- @DsfServiceEventHandler
- public void eventDispatched(final IResumedDMEvent e) {
- if (e.getReason().equals(StateChangeReason.STEP)) {
- fTimedOutFlags.put(e.getDMContext(), Boolean.FALSE);
- // We shouldn't have a stepping timeout running unless we get two
- // stepping events in a row without a suspended, which would be a
- // protocol error.
- assert !fTimedOutFutures.containsKey(e.getDMContext());
- fTimedOutFutures.put(
- e.getDMContext(),
- getExecutor().schedule(
- new DsfRunnable() { public void run() {
- fTimedOutFutures.remove(e.getDMContext());
-
- // Issue the stepping time-out event.
- getSession().dispatchEvent(
- new ISteppingTimedOutEvent() {
- public IExecutionDMContext getDMContext() { return e.getDMContext(); }
- },
- getProperties());
- }},
- STEPPING_TIMEOUT, TimeUnit.MILLISECONDS)
- );
-
- }
- }
-
- @DsfServiceEventHandler
- public void eventDispatched(ISteppingTimedOutEvent e) {
- fTimedOutFlags.put(e.getDMContext(), Boolean.TRUE);
- }
-}
+/******************************************************************************* + * Copyright (c) 2008 Wind River Systems, 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: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.tm.internal.tcf.dsf.services; + +import java.util.HashMap; +import java.util.Hashtable; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; + +import org.eclipse.dd.dsf.concurrent.DsfRunnable; +import org.eclipse.dd.dsf.concurrent.RequestMonitor; +import org.eclipse.dd.dsf.datamodel.DMContexts; +import org.eclipse.dd.dsf.datamodel.IDMContext; +import org.eclipse.dd.dsf.debug.service.IRunControl; +import org.eclipse.dd.dsf.debug.service.IStepQueueManager; +import org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext; +import org.eclipse.dd.dsf.debug.service.IRunControl.IResumedDMEvent; +import org.eclipse.dd.dsf.debug.service.IRunControl.ISuspendedDMEvent; +import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason; +import org.eclipse.dd.dsf.debug.service.IRunControl.StepType; +import org.eclipse.dd.dsf.service.AbstractDsfService; +import org.eclipse.dd.dsf.service.DsfServiceEventHandler; +import org.eclipse.dd.dsf.service.DsfSession; +import org.eclipse.tm.internal.tcf.dsf.Activator; +import org.osgi.framework.BundleContext; + + +public class TCFDSFStepQueueManager extends AbstractDsfService +implements IStepQueueManager{ + + private static class StepRequest { + StepType fStepType; + boolean fIsInstructionStep; + StepRequest(StepType type, boolean instruction) { + fStepType = type; + fIsInstructionStep = instruction; + } + } + + private IRunControl fRunControl; + private int fQueueDepth = 3; + private Map<IExecutionDMContext,List<StepRequest>> fStepQueues = new HashMap<IExecutionDMContext,List<StepRequest>>(); + private Map<IExecutionDMContext,Boolean> fTimedOutFlags = new HashMap<IExecutionDMContext,Boolean>(); + private Map<IExecutionDMContext,ScheduledFuture<?>> fTimedOutFutures = new HashMap<IExecutionDMContext,ScheduledFuture<?>>(); + + public TCFDSFStepQueueManager(DsfSession session) { + super(session); + } + + /////////////////////////////////////////////////////////////////////////// + // IDsfService + @Override + public void initialize(final RequestMonitor requestMonitor) { + super.initialize( + new RequestMonitor(getExecutor(), requestMonitor) { + @Override + protected void handleOK() { + doInitialize(requestMonitor); + }}); + } + + private void doInitialize(final RequestMonitor requestMonitor) { + fRunControl = getServicesTracker().getService(IRunControl.class); + + getSession().addServiceEventListener(this, null); + register(new String[]{IStepQueueManager.class.getName()}, new Hashtable<String,String>()); + requestMonitor.done(); + } + + @Override + public void shutdown(final RequestMonitor requestMonitor) { + unregister(); + getSession().removeServiceEventListener(this); + super.shutdown(requestMonitor); + } + + /////////////////////////////////////////////////////////////////////////// + // AbstractService + @Override + protected BundleContext getBundleContext() { + return Activator.getBundleContext(); + } + + /////////////////////////////////////////////////////////////////////////// + // IStepQueueManager + public boolean canEnqueueStep(IDMContext ctx) { + IExecutionDMContext execCtx = DMContexts.getAncestorOfType(ctx, IExecutionDMContext.class); + return execCtx != null && + ( (fRunControl.isSuspended(execCtx) && fRunControl.canStep(execCtx)) || + (fRunControl.isStepping(execCtx) && !isSteppingTimedOut(execCtx)) ); + } + + // IStepQueueManager + public boolean canEnqueueInstructionStep(IDMContext ctx) { + IExecutionDMContext execCtx = DMContexts.getAncestorOfType(ctx, IExecutionDMContext.class); + return execCtx != null && + ( (fRunControl.isSuspended(execCtx) && fRunControl.canInstructionStep(execCtx)) || + (fRunControl.isStepping(execCtx) && !isSteppingTimedOut(execCtx)) ); + } + + public int getPendingStepCount(IDMContext execCtx) { + List<StepRequest> stepQueue = fStepQueues.get(execCtx); + if (stepQueue == null) return 0; + return stepQueue.size(); + } + + public void enqueueStep(IDMContext ctx, StepType stepType) { + IExecutionDMContext execCtx = DMContexts.getAncestorOfType(ctx, IExecutionDMContext.class); + if (execCtx != null) { + if (fRunControl.canStep(execCtx)) { + fRunControl.step(execCtx, stepType, new RequestMonitor(getExecutor(), null)); + } else if (canEnqueueStep(execCtx)) { + List<StepRequest> stepQueue = fStepQueues.get(execCtx); + if (stepQueue == null) { + stepQueue = new LinkedList<StepRequest>(); + fStepQueues.put(execCtx, stepQueue); + } + if (stepQueue.size() < fQueueDepth) { + stepQueue.add(new StepRequest(stepType, false)); + } + } + } + } + + public void enqueueInstructionStep(IDMContext ctx, StepType stepType) { + IExecutionDMContext execCtx = DMContexts.getAncestorOfType(ctx, IExecutionDMContext.class); + if (execCtx != null) { + if (fRunControl.canInstructionStep(execCtx)) { + fRunControl.instructionStep(execCtx, stepType, new RequestMonitor(getExecutor(), null)); + } + else if (canEnqueueInstructionStep(execCtx)) { + List<StepRequest> stepQueue = fStepQueues.get(execCtx); + if (stepQueue == null) { + stepQueue = new LinkedList<StepRequest>(); + fStepQueues.put(execCtx, stepQueue); + } + if (stepQueue.size() < fQueueDepth) { + stepQueue.add(new StepRequest(stepType, true)); + } + } + } + } + + public boolean isSteppingTimedOut(IDMContext context) { + IExecutionDMContext execCtx = DMContexts.getAncestorOfType(context, IExecutionDMContext.class); + if (execCtx != null) { + return fTimedOutFlags.containsKey(execCtx) ? fTimedOutFlags.get(execCtx) : false; + } + return false; + } + + + public int getStepQueueDepth() { return fQueueDepth; } + public void setStepQueueDepth(int depth) { fQueueDepth = depth; } + + /////////////////////////////////////////////////////////////////////////// + + @DsfServiceEventHandler + public void eventDispatched(ISuspendedDMEvent e) { + // Take care of the stepping time out + fTimedOutFlags.remove(e.getDMContext()); + ScheduledFuture<?> future = fTimedOutFutures.remove(e.getDMContext()); + if (future != null) future.cancel(false); + + // Check if there's a step pending, if so execute it + if (fStepQueues.containsKey(e.getDMContext())) { + List<StepRequest> queue = fStepQueues.get(e.getDMContext()); + StepRequest request = queue.remove(queue.size() - 1); + if (queue.isEmpty()) fStepQueues.remove(e.getDMContext()); + if (request.fIsInstructionStep) { + if (fRunControl.canInstructionStep(e.getDMContext())) { + fRunControl.instructionStep( + e.getDMContext(), request.fStepType, new RequestMonitor(getExecutor(), null)); + } else { + // For whatever reason we can't step anymore, so clear out + // the step queue. + fStepQueues.remove(e.getDMContext()); + } + } else { + if (fRunControl.canStep(e.getDMContext())) { + fRunControl.step(e.getDMContext(), request.fStepType,new RequestMonitor(getExecutor(), null)); + } else { + // For whatever reason we can't step anymore, so clear out + // the step queue. + fStepQueues.remove(e.getDMContext()); + } + } + } + } + + @DsfServiceEventHandler + public void eventDispatched(final IResumedDMEvent e) { + if (e.getReason().equals(StateChangeReason.STEP)) { + fTimedOutFlags.put(e.getDMContext(), Boolean.FALSE); + // We shouldn't have a stepping timeout running unless we get two + // stepping events in a row without a suspended, which would be a + // protocol error. + assert !fTimedOutFutures.containsKey(e.getDMContext()); + fTimedOutFutures.put( + e.getDMContext(), + getExecutor().schedule( + new DsfRunnable() { public void run() { + fTimedOutFutures.remove(e.getDMContext()); + + // Issue the stepping time-out event. + getSession().dispatchEvent( + new ISteppingTimedOutEvent() { + public IExecutionDMContext getDMContext() { return e.getDMContext(); } + }, + getProperties()); + }}, + STEPPING_TIMEOUT, TimeUnit.MILLISECONDS) + ); + + } + } + + @DsfServiceEventHandler + public void eventDispatched(ISteppingTimedOutEvent e) { + fTimedOutFlags.put(e.getDMContext(), Boolean.TRUE); + } +} diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFThreadDMC.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFThreadDMC.java index ec91b6911..eaf308a9b 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDSFThreadDMC.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFThreadDMC.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.dsf.core.services; +package org.eclipse.tm.internal.tcf.dsf.services; import org.eclipse.dd.dsf.datamodel.AbstractDMContext; import org.eclipse.dd.dsf.datamodel.IDMContext; diff --git a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDataCache.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDataCache.java index 18c8addd3..e95bb43d4 100644 --- a/plugins/com.windriver.tcf.dsf.core/src/com/windriver/tcf/dsf/core/services/TCFDataCache.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDataCache.java @@ -1,105 +1,106 @@ -/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, 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:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package com.windriver.tcf.dsf.core.services;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import com.windriver.tcf.api.protocol.IChannel;
-import com.windriver.tcf.api.protocol.IToken;
-import com.windriver.tcf.api.protocol.Protocol;
-
-public abstract class TCFDataCache<V> {
-
- protected Throwable error;
- protected IToken command;
- protected boolean valid;
- protected V data;
-
- protected final IChannel channel;
- protected final Collection<IDataRequest> waiting_list = new ArrayList<IDataRequest>();
-
- public TCFDataCache(IChannel channel) {
- assert channel != null;
- this.channel = channel;
- }
-
- public void cancel() {
- // Cancel current data retrieval command
- if (command != null) {
- command.cancel();
- command = null;
- }
- // Cancel waiting data requests
- if (!waiting_list.isEmpty()) {
- IDataRequest[] arr = waiting_list.toArray(new IDataRequest[waiting_list.size()]);
- waiting_list.clear();
- for (IDataRequest r : arr) r.cancel();
- }
- }
-
- public boolean validate() {
- assert Protocol.isDispatchThread();
- if (channel.getState() != IChannel.STATE_OPEN) {
- error = null;
- command = null;
- data = null;
- valid = true;
- return true;
- }
- if (command != null) {
- return false;
- }
- if (!valid && !startDataRetrieval()) return false;
- assert command == null;
- if (!waiting_list.isEmpty()) {
- IDataRequest[] arr = waiting_list.toArray(new IDataRequest[waiting_list.size()]);
- waiting_list.clear();
- for (IDataRequest r : arr) r.done();
- }
- return true;
- }
-
- public void addWaitingRequest(IDataRequest req) {
- assert !valid;
- waiting_list.add(req);
- }
-
- public void reset(V data) {
- cancel();
- this.data = data;
- error = null;
- valid = true;
- }
-
- public void reset() {
- cancel();
- error = null;
- data = null;
- valid = false;
- }
-
- public boolean isValid() {
- return valid;
- }
-
- public Throwable getError() {
- assert valid;
- return error;
- }
-
- public V getData() {
- assert valid;
- return data;
- }
-
- public abstract boolean startDataRetrieval();
-}
+/******************************************************************************* + * Copyright (c) 2008 Wind River Systems, 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: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.tm.internal.tcf.dsf.services; + +import java.util.ArrayList; +import java.util.Collection; + +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; + + +public abstract class TCFDataCache<V> { + + protected Throwable error; + protected IToken command; + protected boolean valid; + protected V data; + + protected final IChannel channel; + protected final Collection<IDataRequest> waiting_list = new ArrayList<IDataRequest>(); + + public TCFDataCache(IChannel channel) { + assert channel != null; + this.channel = channel; + } + + public void cancel() { + // Cancel current data retrieval command + if (command != null) { + command.cancel(); + command = null; + } + // Cancel waiting data requests + if (!waiting_list.isEmpty()) { + IDataRequest[] arr = waiting_list.toArray(new IDataRequest[waiting_list.size()]); + waiting_list.clear(); + for (IDataRequest r : arr) r.cancel(); + } + } + + public boolean validate() { + assert Protocol.isDispatchThread(); + if (channel.getState() != IChannel.STATE_OPEN) { + error = null; + command = null; + data = null; + valid = true; + return true; + } + if (command != null) { + return false; + } + if (!valid && !startDataRetrieval()) return false; + assert command == null; + if (!waiting_list.isEmpty()) { + IDataRequest[] arr = waiting_list.toArray(new IDataRequest[waiting_list.size()]); + waiting_list.clear(); + for (IDataRequest r : arr) r.done(); + } + return true; + } + + public void addWaitingRequest(IDataRequest req) { + assert !valid; + waiting_list.add(req); + } + + public void reset(V data) { + cancel(); + this.data = data; + error = null; + valid = true; + } + + public void reset() { + cancel(); + error = null; + data = null; + valid = false; + } + + public boolean isValid() { + return valid; + } + + public Throwable getError() { + assert valid; + return error; + } + + public V getData() { + assert valid; + return data; + } + + public abstract boolean startDataRetrieval(); +} diff --git a/plugins/com.windriver.tcf.dsf.ui/.classpath b/plugins/org.eclipse.tm.tcf.rse/.classpath index 304e86186..304e86186 100644 --- a/plugins/com.windriver.tcf.dsf.ui/.classpath +++ b/plugins/org.eclipse.tm.tcf.rse/.classpath diff --git a/plugins/org.eclipse.tm.tcf.rse/.project b/plugins/org.eclipse.tm.tcf.rse/.project new file mode 100644 index 000000000..c5832542b --- /dev/null +++ b/plugins/org.eclipse.tm.tcf.rse/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.tm.tcf.rse</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/plugins/com.windriver.tcf.dsf.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.tcf.rse/.settings/org.eclipse.jdt.core.prefs index 0bf81e2f5..0bf81e2f5 100644 --- a/plugins/com.windriver.tcf.dsf.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.tm.tcf.rse/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/com.windriver.tcf.rse.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.tcf.rse/.settings/org.eclipse.jdt.ui.prefs index 24dc6baab..24dc6baab 100644 --- a/plugins/com.windriver.tcf.rse.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.tm.tcf.rse/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/com.windriver.tcf.rse.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf.rse/META-INF/MANIFEST.MF index 1b7030f6c..08b2b4e29 100644 --- a/plugins/com.windriver.tcf.rse.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.tcf.rse/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: com.windriver.tcf.rse.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.tcf.rse;singleton:=true Bundle-Version: 0.2.0 -Bundle-Activator: com.windriver.tcf.rse.ui.Activator +Bundle-Activator: org.eclipse.tm.internal.tcf.rse.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.rse.core, org.eclipse.rse.ui, org.eclipse.rse.services, - com.windriver.tcf.api, + org.eclipse.tm.tcf, org.eclipse.ui.views, org.eclipse.rse.subsystems.files.core, org.eclipse.rse.subsystems.processes.core diff --git a/plugins/com.windriver.tcf.dsf.ui/about.html b/plugins/org.eclipse.tm.tcf.rse/about.html index 6c5b3615b..6c5b3615b 100755..100644 --- a/plugins/com.windriver.tcf.dsf.ui/about.html +++ b/plugins/org.eclipse.tm.tcf.rse/about.html diff --git a/plugins/com.windriver.tcf.rse.ui/build.properties b/plugins/org.eclipse.tm.tcf.rse/build.properties index cd72b059e..cd72b059e 100644 --- a/plugins/com.windriver.tcf.rse.ui/build.properties +++ b/plugins/org.eclipse.tm.tcf.rse/build.properties diff --git a/plugins/com.windriver.tcf.rse.ui/icons/process-r.gif b/plugins/org.eclipse.tm.tcf.rse/icons/process-r.gif Binary files differindex 87aa144a8..87aa144a8 100644 --- a/plugins/com.windriver.tcf.rse.ui/icons/process-r.gif +++ b/plugins/org.eclipse.tm.tcf.rse/icons/process-r.gif diff --git a/plugins/com.windriver.tcf.rse.ui/icons/process-s.gif b/plugins/org.eclipse.tm.tcf.rse/icons/process-s.gif Binary files differindex c1644b2ec..c1644b2ec 100644 --- a/plugins/com.windriver.tcf.rse.ui/icons/process-s.gif +++ b/plugins/org.eclipse.tm.tcf.rse/icons/process-s.gif diff --git a/plugins/com.windriver.tcf.rse.ui/icons/system-files-live.gif b/plugins/org.eclipse.tm.tcf.rse/icons/system-files-live.gif Binary files differindex 885b8a69e..885b8a69e 100644 --- a/plugins/com.windriver.tcf.rse.ui/icons/system-files-live.gif +++ b/plugins/org.eclipse.tm.tcf.rse/icons/system-files-live.gif diff --git a/plugins/com.windriver.tcf.rse.ui/icons/system-files.gif b/plugins/org.eclipse.tm.tcf.rse/icons/system-files.gif Binary files differindex 874c99262..874c99262 100644 --- a/plugins/com.windriver.tcf.rse.ui/icons/system-files.gif +++ b/plugins/org.eclipse.tm.tcf.rse/icons/system-files.gif diff --git a/plugins/com.windriver.tcf.rse.ui/icons/system-processes-live.gif b/plugins/org.eclipse.tm.tcf.rse/icons/system-processes-live.gif Binary files differindex 96a447a71..96a447a71 100644 --- a/plugins/com.windriver.tcf.rse.ui/icons/system-processes-live.gif +++ b/plugins/org.eclipse.tm.tcf.rse/icons/system-processes-live.gif diff --git a/plugins/com.windriver.tcf.rse.ui/icons/system-processes.gif b/plugins/org.eclipse.tm.tcf.rse/icons/system-processes.gif Binary files differindex e07b81aa6..e07b81aa6 100644 --- a/plugins/com.windriver.tcf.rse.ui/icons/system-processes.gif +++ b/plugins/org.eclipse.tm.tcf.rse/icons/system-processes.gif diff --git a/plugins/com.windriver.tcf.rse.ui/icons/tcf.gif b/plugins/org.eclipse.tm.tcf.rse/icons/tcf.gif Binary files differindex 3198679ae..3198679ae 100644 --- a/plugins/com.windriver.tcf.rse.ui/icons/tcf.gif +++ b/plugins/org.eclipse.tm.tcf.rse/icons/tcf.gif diff --git a/plugins/com.windriver.tcf.rse.ui/icons/thread-r.gif b/plugins/org.eclipse.tm.tcf.rse/icons/thread-r.gif Binary files differindex 17d7d69df..17d7d69df 100644 --- a/plugins/com.windriver.tcf.rse.ui/icons/thread-r.gif +++ b/plugins/org.eclipse.tm.tcf.rse/icons/thread-r.gif diff --git a/plugins/com.windriver.tcf.rse.ui/icons/thread-s.gif b/plugins/org.eclipse.tm.tcf.rse/icons/thread-s.gif Binary files differindex 3fa5fe586..3fa5fe586 100644 --- a/plugins/com.windriver.tcf.rse.ui/icons/thread-s.gif +++ b/plugins/org.eclipse.tm.tcf.rse/icons/thread-s.gif diff --git a/plugins/com.windriver.tcf.rse.ui/plugin.properties b/plugins/org.eclipse.tm.tcf.rse/plugin.properties index f736bbb13..119db6db5 100644 --- a/plugins/com.windriver.tcf.rse.ui/plugin.properties +++ b/plugins/org.eclipse.tm.tcf.rse/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007 Wind River Systems, Inc. and others. +# Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,6 +8,6 @@ # Contributors: # Wind River Systems - initial implementation ############################################################################### -pluginName = TCF/RSE Integration UI +pluginName = TCF/RSE Integration providerName = Eclipse.org diff --git a/plugins/com.windriver.tcf.rse.ui/plugin.xml b/plugins/org.eclipse.tm.tcf.rse/plugin.xml index 93325e7fe..ad30dd243 100644 --- a/plugins/com.windriver.tcf.rse.ui/plugin.xml +++ b/plugins/org.eclipse.tm.tcf.rse/plugin.xml @@ -7,7 +7,7 @@ description="Connects using Target Commenucation Framework" icon="icons/tcf.gif" iconLive="icons/tcf.gif" - id="com.windriver.tcf.rse.ui.systemType" + id="org.eclipse.tm.tcf.rse.systemType" label="TCF" name="TCF"> </systemType> @@ -16,14 +16,14 @@ point="org.eclipse.rse.core.subsystemConfigurations"> <configuration category="processes" - class="com.windriver.tcf.rse.ui.TCFProcessSubSystemConfiguration" + class="org.eclipse.tm.internal.tcf.rse.processes.TCFProcessSubSystemConfiguration" description="Processes" icon="icons/system-processes.gif" iconlive="icons/system-processes-live.gif" - id="com.windriver.tcf.rse.ui.Processes" + id="org.eclipse.tm.tcf.rse.Processes" name="Processes" priority="200" - systemTypeIds="com.windriver.tcf.rse.ui.systemType" + systemTypeIds="org.eclipse.tm.tcf.rse.systemType" vendor="Wind River"> </configuration> </extension> @@ -31,21 +31,21 @@ point="org.eclipse.rse.core.subsystemConfigurations"> <configuration category="files" - class="com.windriver.tcf.rse.ui.TCFFileSubSystemConfiguration" + class="org.eclipse.tm.internal.tcf.rse.files.TCFFileSubSystemConfiguration" description="Files" icon="icons/system-files.gif" iconlive="icons/system-files-live.gif" - id="com.windriver.tcf.rse.ui.Files" + id="org.eclipse.tm.tcf.rse.Files" name="Files" priority="200" - systemTypeIds="com.windriver.tcf.rse.ui.systemType" + systemTypeIds="org.eclipse.tm.tcf.rse.systemType" vendor="Wind River"> </configuration> </extension> <extension point="org.eclipse.core.runtime.adapters"> <factory - class="com.windriver.tcf.rse.ui.TCFSystemViewProcessAdapterFactory" - adaptableType="com.windriver.tcf.rse.ui.TCFRemoteProcess"> + class="org.eclipse.tm.internal.tcf.rse.processes.TCFSystemViewProcessAdapterFactory" + adaptableType="org.eclipse.tm.internal.tcf.rse.processes.TCFRemoteProcess"> <adapter type="org.eclipse.rse.ui.view.ISystemViewElementAdapter"/> <adapter type="org.eclipse.rse.core.subsystems.ISystemDragDropAdapter"/> <adapter type="org.eclipse.rse.ui.view.ISystemRemoteElementAdapter"/> diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/Activator.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/Activator.java index 682b8d4c2..035222909 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/Activator.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext; public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "com.windriver.tcf.rse.ui"; + public static final String PLUGIN_ID = "org.eclipse.tm.tcf.rse"; // The shared instance private static Activator plugin; diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/ITCFSubSystem.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/ITCFSubSystem.java index c842c6f8c..aef4786ff 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/ITCFSubSystem.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/ITCFSubSystem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse; import org.eclipse.rse.core.subsystems.ISubSystem; diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/Messages.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/Messages.java index 57d898ebf..1b39fc3d0 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/Messages.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,14 +8,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "com.windriver.tcf.rse.ui.messages"; //$NON-NLS-1$ - public static String SysMonitor_AllProcesses; public static String SysMonitor_Process; @@ -123,7 +121,7 @@ public class Messages extends NLS { static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); + NLS.initializeMessages(Messages.class.getName(), Messages.class); } private Messages() { diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFConnectorService.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorService.java index ebfa0031d..d90a7e654 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFConnectorService.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse; import java.util.ArrayList; import java.util.HashMap; @@ -20,17 +20,17 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.AbstractConnectorService; import org.eclipse.rse.core.subsystems.CommunicationsEvent; +import org.eclipse.tm.tcf.core.AbstractPeer; +import org.eclipse.tm.tcf.core.ChannelTCP; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IFileSystem; +import org.eclipse.tm.tcf.services.ILocator; +import org.eclipse.tm.tcf.services.ISysMonitor; -import com.windriver.tcf.api.core.AbstractPeer; -import com.windriver.tcf.api.core.ChannelTCP; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IFileSystem; -import com.windriver.tcf.api.services.ILocator; -import com.windriver.tcf.api.services.ISysMonitor; -class TCFConnectorService extends AbstractConnectorService { +public class TCFConnectorService extends AbstractConnectorService { private IChannel channel; private Throwable channel_error; diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFConnectorServiceManager.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorServiceManager.java index e13fd58d8..354e57832 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFConnectorServiceManager.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorServiceManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager; diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFRSETask.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFRSETask.java index 9a37e4b6e..acb10cd9b 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFRSETask.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFRSETask.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,17 +8,17 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse; import java.lang.reflect.InvocationTargetException; import java.util.concurrent.ExecutionException; -import com.windriver.tcf.api.util.TCFTask; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.rse.services.clientserver.messages.IndicatorException; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; +import org.eclipse.tm.tcf.util.TCFTask; public abstract class TCFRSETask<V> extends TCFTask<V> { diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileAdapter.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileAdapter.java index e5164df66..5187345e0 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileAdapter.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.files; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; @@ -32,5 +32,4 @@ public class TCFFileAdapter implements IHostFileToRemoteFileAdapter { } return res; } - } diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileResource.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileResource.java index cb8ff4052..563ec50a8 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileResource.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileResource.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,22 +8,22 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.files; import org.eclipse.rse.core.subsystems.AbstractResource; import org.eclipse.rse.services.files.IHostFile; +import org.eclipse.tm.tcf.services.IFileSystem; -import com.windriver.tcf.api.services.IFileSystem; public class TCFFileResource extends AbstractResource implements IHostFile { - private final ITCFFileService service; + private final TCFFileService service; private String parent; private String name; private final IFileSystem.FileAttrs attrs; private final boolean root; - public TCFFileResource(ITCFFileService service, String parent, String name, + public TCFFileResource(TCFFileService service, String parent, String name, IFileSystem.FileAttrs attrs, boolean root) { if (name == null) { int i = parent.lastIndexOf('/'); diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileService.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileService.java index 51f5b24ec..4135d5691 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileService.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.files; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -36,18 +36,22 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.IHostFile; - -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IFileSystem; -import com.windriver.tcf.api.services.IFileSystem.DirEntry; -import com.windriver.tcf.api.services.IFileSystem.FileAttrs; -import com.windriver.tcf.api.services.IFileSystem.FileSystemException; -import com.windriver.tcf.api.services.IFileSystem.IFileHandle; -import com.windriver.tcf.api.util.TCFFileInputStream; -import com.windriver.tcf.api.util.TCFFileOutputStream; - -public class TCFFileService extends AbstractFileService implements ITCFFileService { +import org.eclipse.tm.internal.tcf.rse.ITCFSubSystem; +import org.eclipse.tm.internal.tcf.rse.TCFConnectorService; +import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager; +import org.eclipse.tm.internal.tcf.rse.TCFRSETask; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IFileSystem; +import org.eclipse.tm.tcf.services.IFileSystem.DirEntry; +import org.eclipse.tm.tcf.services.IFileSystem.FileAttrs; +import org.eclipse.tm.tcf.services.IFileSystem.FileSystemException; +import org.eclipse.tm.tcf.services.IFileSystem.IFileHandle; +import org.eclipse.tm.tcf.util.TCFFileInputStream; +import org.eclipse.tm.tcf.util.TCFFileOutputStream; + + +public class TCFFileService extends AbstractFileService { private final TCFConnectorService connector; diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileSubSystemConfiguration.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java index af6678aef..42bcd206d 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFFileSubSystemConfiguration.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.files; import java.util.Vector; @@ -30,6 +30,9 @@ import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSyst import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.ui.SystemBasePlugin; +import org.eclipse.tm.internal.tcf.rse.ITCFSubSystem; +import org.eclipse.tm.internal.tcf.rse.TCFConnectorService; +import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager; public class TCFFileSubSystemConfiguration extends FileServiceSubSystemConfiguration { diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFRemoteFile.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFRemoteFile.java index 9f4087af6..805fda509 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFRemoteFile.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFRemoteFile.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.files; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/messages.properties b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/messages.properties index 3b48e7409..3b48e7409 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/messages.properties +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/messages.properties diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessAdapter.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessAdapter.java index 3748cda67..2f519f271 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessAdapter.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.processes; import java.util.ArrayList; import java.util.List; diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessResource.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessResource.java index b46d4e4a5..1674d2ef8 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessResource.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessResource.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.processes; import java.math.BigInteger; import java.text.NumberFormat; @@ -19,11 +19,11 @@ import java.util.Map; import org.eclipse.rse.core.subsystems.AbstractResource; import org.eclipse.rse.services.clientserver.processes.IHostProcess; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.ISysMonitor; +import org.eclipse.tm.tcf.services.ISysMonitor.SysMonitorContext; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.ISysMonitor; -import com.windriver.tcf.api.services.ISysMonitor.SysMonitorContext; public class TCFProcessResource extends AbstractResource implements IHostProcess { diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessService.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessService.java index 4f3445b9f..60af44eee 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessService.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.processes; import java.io.IOException; import java.util.ArrayList; @@ -30,9 +30,13 @@ import org.eclipse.rse.services.clientserver.processes.HostProcessFilterImpl; import org.eclipse.rse.services.clientserver.processes.IHostProcess; import org.eclipse.rse.services.clientserver.processes.IHostProcessFilter; import org.eclipse.rse.services.processes.IProcessService; +import org.eclipse.tm.internal.tcf.rse.ITCFSubSystem; +import org.eclipse.tm.internal.tcf.rse.TCFConnectorService; +import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager; +import org.eclipse.tm.internal.tcf.rse.TCFRSETask; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.ISysMonitor; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.ISysMonitor; public class TCFProcessService implements IProcessService { diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessSubSystemConfiguration.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java index 0c7242051..78cd5711d 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFProcessSubSystemConfiguration.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.processes; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.IConnectorService; @@ -17,6 +17,9 @@ import org.eclipse.rse.services.processes.IProcessService; import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter; import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem; import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystemConfiguration; +import org.eclipse.tm.internal.tcf.rse.ITCFSubSystem; +import org.eclipse.tm.internal.tcf.rse.TCFConnectorService; +import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager; public class TCFProcessSubSystemConfiguration extends ProcessServiceSubSystemConfiguration { diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFRemoteProcess.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFRemoteProcess.java index d44b7200c..b765e21ad 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFRemoteProcess.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFRemoteProcess.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.processes; import java.util.Map; diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFSystemViewProcessAdapterFactory.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewProcessAdapterFactory.java index b97047796..47d1954ac 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFSystemViewProcessAdapterFactory.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewProcessAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.processes; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier; diff --git a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFSystemViewRemoteProcessAdapter.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewRemoteProcessAdapter.java index 748f262ab..a892a4141 100644 --- a/plugins/com.windriver.tcf.rse.ui/src/com/windriver/tcf/rse/ui/TCFSystemViewRemoteProcessAdapter.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewRemoteProcessAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.rse.ui; +package org.eclipse.tm.internal.tcf.rse.processes; import java.math.BigInteger; import java.util.ArrayList; @@ -40,9 +40,11 @@ import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.widgets.Shell; +import org.eclipse.tm.internal.tcf.rse.Activator; +import org.eclipse.tm.internal.tcf.rse.Messages; +import org.eclipse.tm.tcf.services.ISysMonitor; import org.eclipse.ui.views.properties.IPropertyDescriptor; -import com.windriver.tcf.api.services.ISysMonitor; public class TCFSystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter, ISystemRemoteElementAdapter{ diff --git a/plugins/com.windriver.tcf.rse.ui/.classpath b/plugins/org.eclipse.tm.tcf/.classpath index 304e86186..304e86186 100644 --- a/plugins/com.windriver.tcf.rse.ui/.classpath +++ b/plugins/org.eclipse.tm.tcf/.classpath diff --git a/plugins/com.windriver.tcf.api/.cvsignore b/plugins/org.eclipse.tm.tcf/.cvsignore index c5e82d745..c5e82d745 100644 --- a/plugins/com.windriver.tcf.api/.cvsignore +++ b/plugins/org.eclipse.tm.tcf/.cvsignore diff --git a/plugins/com.windriver.tcf.api/.project b/plugins/org.eclipse.tm.tcf/.project index 48171f9bd..b781c808e 100644 --- a/plugins/com.windriver.tcf.api/.project +++ b/plugins/org.eclipse.tm.tcf/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>com.windriver.tcf.api</name> + <name>org.eclipse.tm.tcf</name> <comment></comment> <projects> </projects> diff --git a/plugins/com.windriver.tcf.rse.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.core.prefs index 0bf81e2f5..0bf81e2f5 100644 --- a/plugins/com.windriver.tcf.rse.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/com.windriver.tcf.api/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.ui.prefs index 010494bb8..010494bb8 100644 --- a/plugins/com.windriver.tcf.api/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/com.windriver.tcf.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf/META-INF/MANIFEST.MF index 5ad6ca0e6..936e0c5bb 100644 --- a/plugins/com.windriver.tcf.api/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.tcf/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: com.windriver.tcf.api;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.tcf;singleton:=true Bundle-Version: 0.2.0 -Bundle-Activator: com.windriver.tcf.api.Activator +Bundle-Activator: org.eclipse.tm.tcf.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true -Export-Package: com.windriver.tcf.api.core, - com.windriver.tcf.api.protocol, - com.windriver.tcf.api.services, - com.windriver.tcf.api.util +Export-Package: org.eclipse.tm.tcf.core, + org.eclipse.tm.tcf.protocol, + org.eclipse.tm.tcf.services, + org.eclipse.tm.tcf.util diff --git a/plugins/com.windriver.tcf.rse.ui/about.html b/plugins/org.eclipse.tm.tcf/about.html index 6c5b3615b..6c5b3615b 100755..100644 --- a/plugins/com.windriver.tcf.rse.ui/about.html +++ b/plugins/org.eclipse.tm.tcf/about.html diff --git a/plugins/com.windriver.tcf.api/build.properties b/plugins/org.eclipse.tm.tcf/build.properties index cdd2db7f1..cdd2db7f1 100644 --- a/plugins/com.windriver.tcf.api/build.properties +++ b/plugins/org.eclipse.tm.tcf/build.properties diff --git a/plugins/com.windriver.tcf.api/plugin.properties b/plugins/org.eclipse.tm.tcf/plugin.properties index 8c23febbe..5217dd93a 100644 --- a/plugins/com.windriver.tcf.api/plugin.properties +++ b/plugins/org.eclipse.tm.tcf/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007 Wind River Systems, Inc. and others. +# Copyright (c) 2007, 2008 Wind River Systems, 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 diff --git a/plugins/com.windriver.tcf.api/plugin.xml b/plugins/org.eclipse.tm.tcf/plugin.xml index a3ab7c70e..a3ab7c70e 100644 --- a/plugins/com.windriver.tcf.api/plugin.xml +++ b/plugins/org.eclipse.tm.tcf/plugin.xml diff --git a/plugins/com.windriver.tcf.api/schema/startup.exsd b/plugins/org.eclipse.tm.tcf/schema/startup.exsd index 8411b714d..511a4ce91 100644 --- a/plugins/com.windriver.tcf.api/schema/startup.exsd +++ b/plugins/org.eclipse.tm.tcf/schema/startup.exsd @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="com.windriver.tcf.api"> +<schema targetNamespace="org.eclipse.tm.tcf"> <annotation> <appInfo> - <meta.schema plugin="com.windriver.tcf.api" id="startup" name="TCF Startup"/> + <meta.schema plugin="org.eclipse.tm.tcf" id="startup" name="TCF Startup"/> </appInfo> <documentation> This extension point is used to register plugins diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/ChannelLoop.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/ChannelLoop.java index 1bb1cd141..b27eba05b 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/ChannelLoop.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/ChannelLoop.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,13 +8,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.core; +package org.eclipse.tm.internal.tcf.core; import java.io.IOException; import java.io.InterruptedIOException; -import com.windriver.tcf.api.core.StreamChannel; -import com.windriver.tcf.api.protocol.IPeer; +import org.eclipse.tm.tcf.core.StreamChannel; +import org.eclipse.tm.tcf.protocol.IPeer; + public class ChannelLoop extends StreamChannel { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/LocalPeer.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/LocalPeer.java index 9300e3ad4..b571c4db6 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/LocalPeer.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/LocalPeer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,13 +8,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.core; +package org.eclipse.tm.internal.tcf.core; import java.util.HashMap; import java.util.Map; -import com.windriver.tcf.api.core.AbstractPeer; -import com.windriver.tcf.api.protocol.IChannel; +import org.eclipse.tm.tcf.core.AbstractPeer; +import org.eclipse.tm.tcf.protocol.IChannel; + public class LocalPeer extends AbstractPeer { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/ReadOnlyCollection.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/ReadOnlyCollection.java index cc8aeb422..7c27d0806 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/ReadOnlyCollection.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/ReadOnlyCollection.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.core; +package org.eclipse.tm.internal.tcf.core; import java.util.Collection; import java.util.Iterator; diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/ReadOnlyMap.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/ReadOnlyMap.java index 458d27f72..538713a3a 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/ReadOnlyMap.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/ReadOnlyMap.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.core; +package org.eclipse.tm.internal.tcf.core; import java.util.Collection; import java.util.Map; diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/RemotePeer.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/RemotePeer.java index fa4c93eef..3a97f975c 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/RemotePeer.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/RemotePeer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,14 +8,15 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.core; +package org.eclipse.tm.internal.tcf.core; import java.util.Iterator; import java.util.Map; -import com.windriver.tcf.api.core.AbstractPeer; -import com.windriver.tcf.api.core.ChannelTCP; -import com.windriver.tcf.api.protocol.IChannel; +import org.eclipse.tm.tcf.core.AbstractPeer; +import org.eclipse.tm.tcf.core.ChannelTCP; +import org.eclipse.tm.tcf.protocol.IChannel; + public class RemotePeer extends AbstractPeer { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/Token.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/Token.java index 9892b9cbd..5e3255467 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/Token.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/Token.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.core; +package org.eclipse.tm.internal.tcf.core; import java.io.UnsupportedEncodingException; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; + public class Token implements IToken { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/Transport.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/Transport.java index 3e2d1840e..d6622d16b 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/core/Transport.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/core/Transport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.core; +package org.eclipse.tm.internal.tcf.core; import java.util.ArrayList; import java.util.Collection; @@ -17,14 +17,15 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.Set; -import com.windriver.tcf.api.Activator; -import com.windriver.tcf.api.core.AbstractChannel; -import com.windriver.tcf.api.core.AbstractPeer; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.ILocator; +import org.eclipse.tm.tcf.Activator; +import org.eclipse.tm.tcf.core.AbstractChannel; +import org.eclipse.tm.tcf.core.AbstractPeer; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.ILocator; + public class Transport { @@ -74,7 +75,7 @@ public class Transport { * Transmit TCF event message. * The message is sent to all open communication channels – broadcasted. * - * This is internal API, TCF clients should use {@code com.windriver.tcf.api.protocol.Protocol}. + * This is internal API, TCF clients should use {@code org.eclipse.tm.tcf.protocol.Protocol}. */ public static void sendEvent(String service_name, String event_name, byte[] data) { for (Iterator<AbstractChannel> i = channels.iterator(); i.hasNext();) { @@ -95,7 +96,7 @@ public class Transport { * @param done will be executed by dispatch thread after communication * messages are delivered to corresponding targets. * - * This is internal API, TCF clients should use {@code com.windriver.tcf.api.protocol.Protocol}. + * This is internal API, TCF clients should use {@code org.eclipse.tm.tcf.protocol.Protocol}. */ public static void sync(final Runnable done) { final Set<IToken> set = new HashSet<IToken>(); diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/local/DiagnosticsService.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/local/DiagnosticsService.java index 88ad937bb..b14c4101b 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/local/DiagnosticsService.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/local/DiagnosticsService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,14 +8,15 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.local; +package org.eclipse.tm.internal.tcf.services.local; + +import org.eclipse.tm.internal.tcf.core.Token; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.JSON; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IDiagnostics; -import com.windriver.tcf.api.internal.core.Token; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.JSON; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IDiagnostics; public class DiagnosticsService implements IDiagnostics { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/local/LocatorService.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/local/LocatorService.java index 8923c28d0..c08b5ad4d 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/local/LocatorService.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/local/LocatorService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.local; +package org.eclipse.tm.internal.tcf.services.local; import java.io.IOException; import java.net.DatagramPacket; @@ -22,16 +22,17 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import com.windriver.tcf.api.Activator; -import com.windriver.tcf.api.core.AbstractChannel; -import com.windriver.tcf.api.internal.core.LocalPeer; -import com.windriver.tcf.api.internal.core.RemotePeer; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.JSON; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.ILocator; +import org.eclipse.tm.internal.tcf.core.LocalPeer; +import org.eclipse.tm.internal.tcf.core.RemotePeer; +import org.eclipse.tm.tcf.Activator; +import org.eclipse.tm.tcf.core.AbstractChannel; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.JSON; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.ILocator; + /** * Locator service uses transport layer to search @@ -322,42 +323,42 @@ public class LocatorService implements ILocator { } /* (non-Javadoc) - * @see com.windriver.tcf.api.protocol.ILocator#getName() + * @see org.eclipse.tm.tcf.protocol.ILocator#getName() */ public String getName() { return NAME; } /* (non-Javadoc) - * @see com.windriver.tcf.api.protocol.ILocator#getPeers() + * @see org.eclipse.tm.tcf.protocol.ILocator#getPeers() */ public Map<String,IPeer> getPeers() { return peers; } /* (non-Javadoc) - * @see com.windriver.tcf.api.protocol.ILocator#redirect() + * @see org.eclipse.tm.tcf.protocol.ILocator#redirect() */ public IToken redirect(String peer_id, DoneRedirect done) { throw new Error("Channel redirect cannot be done on local peer"); } /* (non-Javadoc) - * @see com.windriver.tcf.api.protocol.ILocator#sync() + * @see org.eclipse.tm.tcf.protocol.ILocator#sync() */ public IToken sync(DoneSync done) { throw new Error("Channel sync cannot be done on local peer"); } /* (non-Javadoc) - * @see com.windriver.tcf.api.protocol.ILocator#addListener(com.windriver.tcf.api.protocol.ILocator.Listener) + * @see org.eclipse.tm.tcf.protocol.ILocator#addListener(org.eclipse.tm.tcf.protocol.ILocator.Listener) */ public void addListener(LocatorListener listener) { listeners.add(listener); } /* (non-Javadoc) - * @see com.windriver.tcf.api.protocol.ILocator#removeListener(com.windriver.tcf.api.protocol.ILocator.Listener) + * @see org.eclipse.tm.tcf.protocol.ILocator#removeListener(org.eclipse.tm.tcf.protocol.ILocator.Listener) */ public void removeListener(LocatorListener listener) { listeners.remove(listener); diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/BreakpointsProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/BreakpointsProxy.java index 475ff79fe..3a7ac8ef7 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/BreakpointsProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/BreakpointsProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,18 +8,19 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.io.IOException; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.JSON; -import com.windriver.tcf.api.services.IBreakpoints; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.JSON; +import org.eclipse.tm.tcf.services.IBreakpoints; + public class BreakpointsProxy implements IBreakpoints { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/DiagnosticsProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/DiagnosticsProxy.java index cafcb845e..5fbdcb854 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/DiagnosticsProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/DiagnosticsProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,15 +8,16 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.util.Collection; import java.util.Map; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IDiagnostics; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IDiagnostics; + public class DiagnosticsProxy implements IDiagnostics { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/FileSystemProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/FileSystemProxy.java index 38d8678ef..fb23c22e8 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/FileSystemProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/FileSystemProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,17 +8,18 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import com.windriver.tcf.api.core.Base64; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IFileSystem; +import org.eclipse.tm.tcf.core.Base64; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IFileSystem; + public class FileSystemProxy implements IFileSystem { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/GenericProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/GenericProxy.java index 36293b5c2..99df14426 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/GenericProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/GenericProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,10 +8,10 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IService; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IService; /** * Objects of GenericProxy class represent remote services, which don't diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/LineNumbersProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/LineNumbersProxy.java index 51e32cd7f..af3194fd4 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/LineNumbersProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/LineNumbersProxy.java @@ -1,12 +1,13 @@ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.util.Collection; import java.util.Map; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.ILineNumbers; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.ILineNumbers; + public class LineNumbersProxy implements ILineNumbers { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/LocatorProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/LocatorProxy.java index 91dccfb38..436c93678 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/LocatorProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/LocatorProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.io.IOException; import java.util.ArrayList; @@ -17,13 +17,14 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.JSON; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.ILocator; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.JSON; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.ILocator; + public class LocatorProxy implements ILocator { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/MemoryProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/MemoryProxy.java index 1231f96da..40ddf0ae3 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/MemoryProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/MemoryProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.io.IOException; import java.math.BigInteger; @@ -18,13 +18,14 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import com.windriver.tcf.api.core.Base64; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.internal.core.ReadOnlyMap; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.JSON; -import com.windriver.tcf.api.services.IMemory; +import org.eclipse.tm.internal.tcf.core.ReadOnlyMap; +import org.eclipse.tm.tcf.core.Base64; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.JSON; +import org.eclipse.tm.tcf.services.IMemory; + public class MemoryProxy implements IMemory { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/ProcessesProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/ProcessesProxy.java index 0eacb5d28..7c25cf51d 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/ProcessesProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/ProcessesProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,16 +8,17 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IProcesses; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IProcesses; + public class ProcessesProxy implements IProcesses { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/RegistersProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/RegistersProxy.java index e313078ec..c402ae02c 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/RegistersProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/RegistersProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,18 +8,19 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.io.IOException; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.JSON; -import com.windriver.tcf.api.services.IRegisters; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.JSON; +import org.eclipse.tm.tcf.services.IRegisters; + public class RegistersProxy implements IRegisters { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/RunControlProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/RunControlProxy.java index 7160a9509..cf42aad41 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/RunControlProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/RunControlProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,19 +8,20 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.io.IOException; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.internal.core.ReadOnlyMap; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.JSON; -import com.windriver.tcf.api.services.IRunControl; +import org.eclipse.tm.internal.tcf.core.ReadOnlyMap; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.JSON; +import org.eclipse.tm.tcf.services.IRunControl; + public class RunControlProxy implements IRunControl { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/StackTraceProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/StackTraceProxy.java index 5945082f1..074f1d25e 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/StackTraceProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/StackTraceProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,16 +8,17 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IStackTrace; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IStackTrace; + public class StackTraceProxy implements IStackTrace { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/SysMonitorProxy.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/SysMonitorProxy.java index 6e4648bc8..55fe26640 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/internal/services/remote/SysMonitorProxy.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/internal/tcf/services/remote/SysMonitorProxy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,16 +8,17 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.internal.services.remote; +package org.eclipse.tm.internal.tcf.services.remote; import java.util.Collection; import java.util.Map; -import com.windriver.tcf.api.core.Command; -import com.windriver.tcf.api.internal.core.ReadOnlyMap; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.ISysMonitor; +import org.eclipse.tm.internal.tcf.core.ReadOnlyMap; +import org.eclipse.tm.tcf.core.Command; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.ISysMonitor; + public class SysMonitorProxy implements ISysMonitor { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/Activator.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/Activator.java index 24536f4b4..d1df1ce56 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/Activator.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api; +package org.eclipse.tm.tcf; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -17,10 +17,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; +import org.eclipse.tm.tcf.protocol.Protocol; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; -import com.windriver.tcf.api.protocol.Protocol; /** * The activator class controls the plug-in life cycle @@ -28,7 +28,7 @@ import com.windriver.tcf.api.protocol.Protocol; public class Activator extends Plugin { // The plug-in ID - public static final String PLUGIN_ID = "com.windriver.tcf.api"; + public static final String PLUGIN_ID = "org.eclipse.tm.tcf"; // The shared instance private static Activator plugin; @@ -40,8 +40,10 @@ public class Activator extends Plugin { @Override public void start(BundleContext context) throws Exception { super.start(context); - Protocol.setEventQueue(new EventQueue()); + EventQueue e = new EventQueue(); + Protocol.setEventQueue(e); runTCFStartup(); + e.start(); } @Override diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/ErrorCodes.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/ErrorCodes.java index e26cfa100..2c17b5ba5 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/ErrorCodes.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/ErrorCodes.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api; +package org.eclipse.tm.tcf; public class ErrorCodes { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/EventQueue.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/EventQueue.java index fec45e8dd..7c05085f0 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/EventQueue.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/EventQueue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api; +package org.eclipse.tm.tcf; import java.util.LinkedList; @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.IJobChangeListener; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.tm.tcf.protocol.IEventQueue; -import com.windriver.tcf.api.protocol.IEventQueue; /** * Implementation of Target Communication Framework event queue. @@ -35,7 +35,6 @@ class EventQueue implements IEventQueue, Runnable { thread = new Thread(this); thread.setDaemon(true); thread.setName("TCF Event Dispatch"); - thread.start(); // Need to monitor jobs to detect congestion Job.getJobManager().addJobChangeListener(new IJobChangeListener() { @@ -63,6 +62,10 @@ class EventQueue implements IEventQueue, Runnable { } }); } + + void start() { + thread.start(); + } private void error(Throwable x) { if (debug) x.printStackTrace(); diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/AbstractChannel.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/AbstractChannel.java index d5315cd6d..fa974f8fa 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/AbstractChannel.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/AbstractChannel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.core; +package org.eclipse.tm.tcf.core; import java.io.IOException; import java.util.ArrayList; @@ -17,20 +17,21 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.Map; -import com.windriver.tcf.api.Activator; -import com.windriver.tcf.api.internal.core.Token; -import com.windriver.tcf.api.internal.core.Transport; -import com.windriver.tcf.api.internal.services.local.DiagnosticsService; -import com.windriver.tcf.api.internal.services.local.LocatorService; -import com.windriver.tcf.api.internal.services.remote.GenericProxy; -import com.windriver.tcf.api.internal.services.remote.LocatorProxy; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.JSON; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.ILocator; +import org.eclipse.tm.internal.tcf.core.Token; +import org.eclipse.tm.internal.tcf.core.Transport; +import org.eclipse.tm.internal.tcf.services.local.DiagnosticsService; +import org.eclipse.tm.internal.tcf.services.local.LocatorService; +import org.eclipse.tm.internal.tcf.services.remote.GenericProxy; +import org.eclipse.tm.internal.tcf.services.remote.LocatorProxy; +import org.eclipse.tm.tcf.Activator; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.JSON; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.ILocator; + public abstract class AbstractChannel implements IChannel { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/AbstractPeer.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/AbstractPeer.java index 314d9b03a..e75514542 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/AbstractPeer.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/AbstractPeer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,16 +8,17 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.core; +package org.eclipse.tm.tcf.core; import java.util.HashMap; import java.util.Map; -import com.windriver.tcf.api.internal.core.ReadOnlyMap; -import com.windriver.tcf.api.internal.core.Transport; -import com.windriver.tcf.api.internal.services.local.LocatorService; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.Protocol; +import org.eclipse.tm.internal.tcf.core.ReadOnlyMap; +import org.eclipse.tm.internal.tcf.core.Transport; +import org.eclipse.tm.internal.tcf.services.local.LocatorService; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.Protocol; + public abstract class AbstractPeer implements IPeer { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/Base64.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/Base64.java index 498104fac..52835065d 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/Base64.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/Base64.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.core; +package org.eclipse.tm.tcf.core; /** * Methods for translating Base64 encoded strings to byte arrays and back. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/ChannelTCP.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/ChannelTCP.java index c50a5ad03..a31eb4bdb 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/ChannelTCP.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/ChannelTCP.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.core; +package org.eclipse.tm.tcf.core; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -18,8 +18,9 @@ import java.io.OutputStream; import java.net.Socket; import java.net.SocketException; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.Protocol; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.Protocol; + public class ChannelTCP extends StreamChannel { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/Command.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/Command.java index d704ba96b..9a3d0600b 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/Command.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/Command.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,19 +8,20 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.core; +package org.eclipse.tm.tcf.core; import java.io.IOException; import java.text.MessageFormat; import java.util.Collection; import java.util.Map; -import com.windriver.tcf.api.internal.core.Token; -import com.windriver.tcf.api.protocol.IChannel; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.JSON; -import com.windriver.tcf.api.protocol.Protocol; +import org.eclipse.tm.internal.tcf.core.Token; +import org.eclipse.tm.tcf.protocol.IChannel; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.JSON; +import org.eclipse.tm.tcf.protocol.Protocol; + /** * This is utility class that helps to implement sending a command and receiving diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/StreamChannel.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/StreamChannel.java index a6b871740..ca22b11d4 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/core/StreamChannel.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/core/StreamChannel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,11 +8,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.core; +package org.eclipse.tm.tcf.core; import java.io.IOException; -import com.windriver.tcf.api.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.IPeer; + public abstract class StreamChannel extends AbstractChannel { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IChannel.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IChannel.java index 589ead0b4..158bd80ae 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IChannel.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IChannel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.protocol; +package org.eclipse.tm.tcf.protocol; import java.util.Collection; diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IEventQueue.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IEventQueue.java index 0ace6e635..9fc8948e2 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IEventQueue.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IEventQueue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.protocol; +package org.eclipse.tm.tcf.protocol; /** * Clients of the framework should implement this interface and call Protocol.setEventQueue. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IPeer.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IPeer.java index 7abc75e2c..aa3b1290e 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IPeer.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IPeer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.protocol; +package org.eclipse.tm.tcf.protocol; import java.util.Map; diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IService.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IService.java index d6eb3d4f1..d623df6a4 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IService.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.protocol; +package org.eclipse.tm.tcf.protocol; /** * Base interface for all service interfaces. A client can get list of available services diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IToken.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IToken.java index b42645107..effa591d0 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/IToken.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/IToken.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.protocol; +package org.eclipse.tm.tcf.protocol; /** * IToken is created by the framework for each command sent to a remote peer. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/JSON.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/JSON.java index 16fdcb5e8..e5dd10c61 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/JSON.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/JSON.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.protocol; +package org.eclipse.tm.tcf.protocol; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -24,8 +24,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import com.windriver.tcf.api.internal.core.ReadOnlyCollection; -import com.windriver.tcf.api.internal.core.ReadOnlyMap; +import org.eclipse.tm.internal.tcf.core.ReadOnlyCollection; +import org.eclipse.tm.internal.tcf.core.ReadOnlyMap; + /** * JSON is TCF preferred marshaling. This class implements generation and parsing of JSON strings. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/Protocol.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/Protocol.java index 7e577ccf5..4c41d6b3d 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/protocol/Protocol.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/protocol/Protocol.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.protocol; +package org.eclipse.tm.tcf.protocol; + +import org.eclipse.tm.internal.tcf.core.LocalPeer; +import org.eclipse.tm.internal.tcf.core.Transport; +import org.eclipse.tm.internal.tcf.services.local.LocatorService; +import org.eclipse.tm.tcf.services.ILocator; -import com.windriver.tcf.api.internal.core.LocalPeer; -import com.windriver.tcf.api.internal.core.Transport; -import com.windriver.tcf.api.internal.services.local.LocatorService; -import com.windriver.tcf.api.services.ILocator; /** * diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IBreakpoints.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IBreakpoints.java index fbcb5e0b5..ec1477341 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IBreakpoints.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IBreakpoints.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; import java.util.Map; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; + /** * Breakpoint is represented by unique identifier and set of properties. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IDiagnostics.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IDiagnostics.java index 9552c4a6d..075420a84 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IDiagnostics.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IDiagnostics.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,10 +8,10 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; /** * This is optional service that can be implemented by a peer. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IFileSystem.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IFileSystem.java index 70213469b..b7af9a306 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IFileSystem.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IFileSystem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,13 +8,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; import java.io.IOException; import java.util.Map; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; + /** * File System service provides file transfer (and more generally file diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/ILineNumbers.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/ILineNumbers.java index 2547e6f1e..e562e6c60 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/ILineNumbers.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/ILineNumbers.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,10 +8,10 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; /** * Line numbers service associates locations in the source files with the corresponding diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/ILocator.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/ILocator.java index 9116d9d7f..de04a7c3a 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/ILocator.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/ILocator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,13 +8,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; import java.util.Map; -import com.windriver.tcf.api.protocol.IPeer; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IPeer; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; + /** * ILocator service uses transport layer to search for peers and to collect data about @@ -71,7 +72,7 @@ public interface ILocator extends IService { * @param done will be executed by dispatch thread after communication * messages are delivered to corresponding targets. * - * This is internal API, TCF clients should use {@code com.windriver.tcf.api.protocol.Protocol}. + * This is internal API, TCF clients should use {@code org.eclipse.tm.tcf.protocol.Protocol}. */ IToken sync(DoneSync done); diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IMemory.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IMemory.java index ef0b7a5fb..ccadb6f87 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IMemory.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IMemory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; import java.util.Map; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; + /** * IMemory service provides basic operations to read/write memory on a target. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IProcesses.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IProcesses.java index 531e8e57a..b4a5f789d 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IProcesses.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IProcesses.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; import java.util.Map; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; + /** * IProcesses service provides access to the target OS's process diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IRegisters.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IRegisters.java index 2cf4de1f4..5bfed81c2 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IRegisters.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IRegisters.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; import java.util.Map; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; + /** * IRegisters service provides access to target CPU register values and properties. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IRunControl.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IRunControl.java index 65f2d0835..a1700282e 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IRunControl.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IRunControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; import java.util.Map; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; + public interface IRunControl extends IService { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IStackTrace.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IStackTrace.java index a3657bcab..6c86f9458 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/IStackTrace.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/IStackTrace.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; import java.util.Map; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; + public interface IStackTrace extends IService { diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/ISysMonitor.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/ISysMonitor.java index bffd8743c..cd54d76ac 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/services/ISysMonitor.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/services/ISysMonitor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,12 +8,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.services; +package org.eclipse.tm.tcf.services; import java.util.Map; -import com.windriver.tcf.api.protocol.IService; -import com.windriver.tcf.api.protocol.IToken; +import org.eclipse.tm.tcf.protocol.IService; +import org.eclipse.tm.tcf.protocol.IToken; + /** * This is optional service that can be implemented by a peer. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/util/TCFFileInputStream.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/util/TCFFileInputStream.java index da81ce5e0..4eb71abda 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/util/TCFFileInputStream.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/util/TCFFileInputStream.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,18 +8,19 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.util; +package org.eclipse.tm.tcf.util; import java.io.IOException; import java.io.InputStream; import java.util.Iterator; import java.util.LinkedList; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.protocol.Protocol; -import com.windriver.tcf.api.services.IFileSystem; -import com.windriver.tcf.api.services.IFileSystem.FileSystemException; -import com.windriver.tcf.api.services.IFileSystem.IFileHandle; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.protocol.Protocol; +import org.eclipse.tm.tcf.services.IFileSystem; +import org.eclipse.tm.tcf.services.IFileSystem.FileSystemException; +import org.eclipse.tm.tcf.services.IFileSystem.IFileHandle; + /** * TCFFileInputStream is high performance InputStream implementation over TCF FileSystem service. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/util/TCFFileOutputStream.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/util/TCFFileOutputStream.java index 486e119e6..93be9ffda 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/util/TCFFileOutputStream.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/util/TCFFileOutputStream.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.util; +package org.eclipse.tm.tcf.util; import java.io.IOException; import java.io.InterruptedIOException; @@ -17,10 +17,11 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import com.windriver.tcf.api.protocol.IToken; -import com.windriver.tcf.api.services.IFileSystem; -import com.windriver.tcf.api.services.IFileSystem.FileSystemException; -import com.windriver.tcf.api.services.IFileSystem.IFileHandle; +import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tm.tcf.services.IFileSystem; +import org.eclipse.tm.tcf.services.IFileSystem.FileSystemException; +import org.eclipse.tm.tcf.services.IFileSystem.IFileHandle; + /** * TCFFileOutputStream is high performance OutputStream implementation over TCF FileSystem service. diff --git a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/util/TCFTask.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/util/TCFTask.java index abda52d02..160cab4ea 100644 --- a/plugins/com.windriver.tcf.api/src/com/windriver/tcf/api/util/TCFTask.java +++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/util/TCFTask.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2008 Wind River Systems, 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 @@ -8,7 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package com.windriver.tcf.api.util; +package org.eclipse.tm.tcf.util; import java.io.IOException; import java.util.concurrent.CancellationException; @@ -17,7 +17,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.windriver.tcf.api.protocol.Protocol; +import org.eclipse.tm.tcf.protocol.Protocol; + public abstract class TCFTask<V> implements Runnable, Future<V> { |