Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2011-10-03 19:59:06 +0000
committerEugene Tarassov2011-10-03 19:59:06 +0000
commit1c950e35a76ef2d9e233b19c3ba536ab4a323fd1 (patch)
tree75ba9a7da4a2f5222531b3cfdf8306e5d66d3b48
parent1dd53a1605bb7b6d614b939875ade7ce89e7d068 (diff)
parent542bb29b56916b6e6aed148e036e78354f828ce0 (diff)
downloadorg.eclipse.tcf-1c950e35a76ef2d9e233b19c3ba536ab4a323fd1.tar.gz
org.eclipse.tcf-1c950e35a76ef2d9e233b19c3ba536ab4a323fd1.tar.xz
org.eclipse.tcf-1c950e35a76ef2d9e233b19c3ba536ab4a323fd1.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/tcf/org.eclipse.tcf
-rw-r--r--.gitignore14
-rw-r--r--pom.xml17
-rw-r--r--target_explorer/features/org.eclipse.tm.te.feature/feature.xml33
-rw-r--r--target_explorer/features/org.eclipse.tm.te.sdk.feature/feature.xml33
-rw-r--r--target_explorer/features/org.eclipse.tm.te.tcf.feature/feature.xml10
-rw-r--r--target_explorer/features/org.eclipse.tm.te.tcf.sdk.feature/feature.xml1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core.persistence/META-INF/MANIFEST.MF16
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core.persistence/plugin.xml14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core.statushandler/META-INF/MANIFEST.MF18
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/nls/Messages.properties4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core/.classpath2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core/.options2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core/META-INF/MANIFEST.MF19
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core/build.properties3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core/plugin.xml30
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/activator/CoreBundleActivator.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nls/Messages.java5
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nls/Messages.properties6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.rcp/products/TargetExplorer.product19
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.rcp/products/TargetExplorer_TCF.product21
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.classpath (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/.classpath)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.options1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.project28
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.settings/org.eclipse.jdt.core.prefs (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/.settings/org.eclipse.jdt.core.prefs)8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/META-INF/MANIFEST.MF20
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/build.properties (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/build.properties)0
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/plugin.properties15
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/plugin.xml24
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/pom.xml (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/pom.xml)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/schema/executorServices.exsd200
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/schema/executorUtilDelegates.exsd200
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/Executors.java141
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/activator/CoreBundleActivator.java71
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/event/ExecutorThreadNotificationListener.java35
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/executors/AbstractDelegatingExecutorService.java219
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/executors/SingleThreadedExecutorService.java188
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/factories/SingleThreadThreadFactory.java72
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/IExecutor.java21
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/IExecutorUtilDelegate.java38
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/INestableExecutor.java37
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/ISingleThreadedExecutor.java38
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/nls/Messages.java33
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/nls/Messages.properties8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/util/ExecutorsUtil.java301
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/.classpath (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/.classpath)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/.options1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/.project (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/.project)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/.settings/org.eclipse.jdt.core.prefs (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/.settings/org.eclipse.jdt.core.prefs)8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/META-INF/MANIFEST.MF16
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/build.properties5
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/plugin.properties12
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/pom.xml17
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/ContainerModelNode.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/ContainerModelNode.java)41
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/MessageModelNode.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/MessageModelNode.java)8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/ModelNode.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/ModelNode.java)66
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/PendingOperationModelNode.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/PendingOperationModelNode.java)4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/activator/CoreBundleActivator.java72
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/interfaces/IContainerModelNode.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IContainerModelNode.java)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/interfaces/IModelNode.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IModelNode.java)3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/interfaces/IModelNodeProvider.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IModelNodeProvider.java)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/nls/Messages.java33
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/nls/Messages.properties6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.classpath7
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.project28
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.settings/org.eclipse.jdt.core.prefs82
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/META-INF/MANIFEST.MF16
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/build.properties6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/plugin.properties (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/plugin.properties)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/plugin.xml17
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/pom.xml (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/pom.xml)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/schema/delegates.exsd (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/schema/delegates.exsd)20
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/AbstractPersistenceDelegate.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/AbstractPersistenceDelegate.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/PersistenceDelegateManager.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/PersistenceDelegateManager.java)14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/activator/CoreBundleActivator.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/activator/CoreBundleActivator.java)4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/interfaces/IPersistenceDelegate.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/interfaces/IPersistenceDelegate.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/properties/PropertiesFilePersistenceDelegate.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/properties/PropertiesFilePersistenceDelegate.java)17
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.classpath7
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.project (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/.project)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.settings/org.eclipse.jdt.core.prefs82
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/META-INF/MANIFEST.MF18
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/build.properties (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/build.properties)0
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/plugin.properties (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/plugin.properties)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/plugin.xml (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/plugin.xml)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/pom.xml17
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/schema/bindings.exsd (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/schema/bindings.exsd)8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/schema/handlers.exsd (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/schema/handlers.exsd)16
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/AbstractStatusHandler.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/AbstractStatusHandler.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/StatusHandlerManager.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/StatusHandlerManager.java)18
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/activator/CoreBundleActivator.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/activator/CoreBundleActivator.java)4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/interfaces/IStatusHandler.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/interfaces/IStatusHandler.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/internal/StatusHandlerBinding.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/internal/StatusHandlerBinding.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/internal/StatusHandlerBindingExtensionPointManager.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/internal/StatusHandlerBindingExtensionPointManager.java)18
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/nls/Messages.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/nls/Messages.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/nls/Messages.properties4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/.classpath7
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/.options3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/.project28
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/.settings/org.eclipse.jdt.core.prefs82
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/META-INF/MANIFEST.MF27
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/build.properties6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/plugin.properties12
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/plugin.xml32
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/pom.xml17
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/schema/eventListeners.exsd (renamed from target_explorer/plugins/org.eclipse.tm.te.core/schema/eventListeners.exsd)14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/activator/CoreBundleActivator.java71
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/callback/Callback.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/callback/Callback.java)27
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/events/EventManager.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/events/EventManager.java)19
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/events/PropertyChangeEvent.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/events/PropertyChangeEvent.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/extensions/AbstractExtensionPointManager.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/extensions/AbstractExtensionPointManager.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/extensions/ExecutableExtension.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/extensions/ExecutableExtension.java)18
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/extensions/ExecutableExtensionProxy.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/extensions/ExecutableExtensionProxy.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/IConditionTester.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/IConditionTester.java)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/callback/ICallback.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/callback/ICallback.java)4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/events/IEventFireDelegate.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/events/IEventFireDelegate.java)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/events/IEventListener.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/events/IEventListener.java)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/extensions/IExecutableExtension.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/IExecutableExtension.java)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/properties/IPropertiesContainer.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IPropertiesContainer.java)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/tracing/ITraceIds.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/tracing/ITraceIds.java)4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/internal/DebugEventListener.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/DebugEventListener.java)11
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/internal/PreferencesPropertyTester.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/PreferencesPropertyTester.java)9
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/internal/PropertiesContainerPropertyTester.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/PropertiesContainerPropertyTester.java)5
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/nls/Messages.java35
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/nls/Messages.properties8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/preferences/ScopedEclipsePreferences.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/preferences/ScopedEclipsePreferences.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/progress/ProgressHelper.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/progress/ProgressHelper.java)10
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/properties/PropertiesContainer.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/PropertiesContainer.java)90
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/tracing/TraceHandler.java (renamed from target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/tracing/TraceHandler.java)2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.core/.classpath14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.core/.settings/org.eclipse.jdt.core.prefs164
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.core/META-INF/MANIFEST.MF2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/Tcf.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/activator/CoreBundleActivator.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/ChannelManager.java7
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/Startup.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/listener/InternalChannelListener.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/listener/InternalChannelOpenListener.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/.classpath14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/.settings/org.eclipse.jdt.core.prefs164
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/META-INF/MANIFEST.MF2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/plugin.xml2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeContentProvider.java27
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeControl.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeLabelProvider.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/dialogs/FSOpenFileDialog.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/CacheManager.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/FSTreeNodePropertyTester.java12
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/OpenFileHandler.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/TimeTriggeredProgressMonitorDialog.java9
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/url/TcfInputStream.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/model/FSTreeNode.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/.classpath14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/.settings/org.eclipse.jdt.core.prefs164
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/META-INF/MANIFEST.MF6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/plugin.xml2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/Scanner.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/ScannerRunnable.java5
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/activator/CoreBundleActivator.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/internal/MyPropertyTester.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/internal/PeersPersistenceDelegate.java13
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/ChannelStateChangeListener.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/LocatorListener.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/ModelAdapter.java5
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/nodes/LocatorModel.java13
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/nodes/PeerModel.java29
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/AbstractLocatorModelService.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelLookupService.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelRefreshService.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelUpdateService.java5
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/.classpath2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/META-INF/MANIFEST.MF4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/activator/CoreBundleActivator.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/LogManager.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/Startup.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelStateChangeListener.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelTraceListener.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelTraceListenerManager.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/.classpath14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/META-INF/MANIFEST.MF6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/PeersPersistenceManager.java9
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/filter/UnreachablePeersFilter.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/handler/DeleteCommandHandler.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/handler/RefreshCommandHandler.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/model/Model.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/ContentProviderDelegate.java7
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/LabelProviderDelegate.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/ModelListener.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/images/PeerImageDescriptor.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/wizards/NewTargetWizard.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/wizards/pages/NewTargetWizardPage.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/tables/NodePropertiesContentProvider.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/tables/NodePropertiesLabelProvider.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tests/.classpath2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tests/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tests/META-INF/MANIFEST.MF6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tests/plugin.xml4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/CoreTestCase.java5
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/statushandler/StatusHandlerTestCase.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/statushandler/TestStatusHandler.java7
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/.classpath14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/.settings/org.eclipse.jdt.core.prefs164
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/META-INF/MANIFEST.MF4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseControl.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseDialogPageControl.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseEditBrowseTextControl.java9
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/interfaces/IWizardConfigurationPanel.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/net/RemoteHostAddressControl.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/panels/AbstractWizardConfigurationPanel.java8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/RegexVerifyListener.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/Validator.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/WorkspaceContainerValidator.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.forms/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.forms/build.properties1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/CustomFormToolkit.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractFormTextSection.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractSection.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractStructuredViewerSection.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractTableSection.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractTreeSection.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/TablePart.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/TreePart.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.swt/.classpath2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.swt/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.swt/META-INF/MANIFEST.MF2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/jface/dialogs/CustomTitleAreaDialog.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/swt/listener/AbstractCellPaintListener.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/swt/widgets/NoteCompositeHelper.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/.classpath14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/META-INF/MANIFEST.MF5
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/ViewsUtil.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/editor/AbstractEditorPage.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/editor/Editor.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/editor/EditorInput.java8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/expressions/EditorPropertyTester.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageBinding.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageBindingExtensionPointManager.java12
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageExtensionPointManager.java8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/handler/OpenCommandHandler.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/handler/PropertiesCommandHandler.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/listeners/WorkbenchPartListener.java8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/listeners/WorkbenchWindowListener.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/perspective/PerspectiveFactory.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/.classpath14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/META-INF/MANIFEST.MF5
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/plugin.properties4
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/plugin.xml19
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/activator/UIPlugin.java15
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/dialogs/RenameDialog.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/events/AbstractEventListener.java7
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/internal/executors/EclipsePlatformDisplayExecutor.java91
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/internal/executors/EclipsePlatformDisplayExecutorUtilDelegate.java36
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/tables/properties/NodePropertiesTableControl.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/trees/AbstractTreeControl.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/AbstractWizardCommandHandler.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/interfaces/ISharedDataWizardPage.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizard.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizardNode.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizardSelectionPage.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractFormsWizardPage.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractSharedDataWizardPage.java14
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractValidatableWizardPage.java1
265 files changed, 3847 insertions, 897 deletions
diff --git a/.gitignore b/.gitignore
index bca7bdc10..49f591f98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,14 +80,20 @@ tests/test-dwarf/*.ncb
# target explorer
/target_explorer/plugins/org.eclipse.tm.te.core/target
/target_explorer/plugins/org.eclipse.tm.te.core/bin
-/target_explorer/plugins/org.eclipse.tm.te.core.persistence/target
-/target_explorer/plugins/org.eclipse.tm.te.core.persistence/bin
-/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/target
-/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/bin
/target_explorer/plugins/org.eclipse.tm.te.rcp/target
/target_explorer/plugins/org.eclipse.tm.te.rcp/bin
/target_explorer/plugins/org.eclipse.tm.te.rcp.application/target
/target_explorer/plugins/org.eclipse.tm.te.rcp.application/bin
+/target_explorer/plugins/org.eclipse.tm.te.runtime/target
+/target_explorer/plugins/org.eclipse.tm.te.runtime/bin
+/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/target
+/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/bin
+/target_explorer/plugins/org.eclipse.tm.te.runtime.model/target
+/target_explorer/plugins/org.eclipse.tm.te.runtime.model/bin
+/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/target
+/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/bin
+/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/target
+/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/bin
/target_explorer/plugins/org.eclipse.tm.te.tcf.core/target
/target_explorer/plugins/org.eclipse.tm.te.tcf.core/bin
/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/target
diff --git a/pom.xml b/pom.xml
index a300b394b..cfcdf699f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,19 +52,22 @@
<module>features/org.eclipse.tm.tcf.rse.feature</module>
<module>features/org.eclipse.tm.tcf.rse.sdk.feature</module>
+ <module>target_explorer/plugins/org.eclipse.tm.te.runtime</module>
+ <module>target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent</module>
+ <module>target_explorer/plugins/org.eclipse.tm.te.runtime.model</module>
+ <module>target_explorer/plugins/org.eclipse.tm.te.runtime.persistence</module>
+ <module>target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler</module>
<module>target_explorer/plugins/org.eclipse.tm.te.core</module>
- <module>target_explorer/plugins/org.eclipse.tm.te.core.persistence</module>
- <module>target_explorer/plugins/org.eclipse.tm.te.core.statushandler</module>
+ <module>target_explorer/plugins/org.eclipse.tm.te.ui</module>
+ <module>target_explorer/plugins/org.eclipse.tm.te.ui.controls</module>
+ <module>target_explorer/plugins/org.eclipse.tm.te.ui.forms</module>
+ <module>target_explorer/plugins/org.eclipse.tm.te.ui.swt</module>
+ <module>target_explorer/plugins/org.eclipse.tm.te.ui.views</module>
<module>target_explorer/plugins/org.eclipse.tm.te.tcf.core</module>
<module>target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem</module>
<module>target_explorer/plugins/org.eclipse.tm.te.tcf.locator</module>
<module>target_explorer/plugins/org.eclipse.tm.te.tcf.log.core</module>
<module>target_explorer/plugins/org.eclipse.tm.te.tcf.ui</module>
- <module>target_explorer/plugins/org.eclipse.tm.te.ui</module>
- <module>target_explorer/plugins/org.eclipse.tm.te.ui.swt</module>
- <module>target_explorer/plugins/org.eclipse.tm.te.ui.forms</module>
- <module>target_explorer/plugins/org.eclipse.tm.te.ui.controls</module>
- <module>target_explorer/plugins/org.eclipse.tm.te.ui.views</module>
<module>target_explorer/features/org.eclipse.tm.te.feature</module>
<module>target_explorer/features/org.eclipse.tm.te.sdk.feature</module>
diff --git a/target_explorer/features/org.eclipse.tm.te.feature/feature.xml b/target_explorer/features/org.eclipse.tm.te.feature/feature.xml
index 3b2608823..2dc891b7a 100644
--- a/target_explorer/features/org.eclipse.tm.te.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tm.te.feature/feature.xml
@@ -27,42 +27,56 @@
</requires>
<plugin
- id="org.eclipse.tm.te.core"
+ id="org.eclipse.tm.te.runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.te.ui"
+ id="org.eclipse.tm.te.runtime.concurrent"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.te.ui.views"
+ id="org.eclipse.tm.te.runtime.model"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.te.ui.controls"
+ id="org.eclipse.tm.te.runtime.persistence"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.tm.te.runtime.statushandler"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.tm.te.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.te.core.statushandler"
+ id="org.eclipse.tm.te.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.te.core.persistence"
+ id="org.eclipse.tm.te.ui.controls"
download-size="0"
install-size="0"
version="0.0.0"
@@ -82,4 +96,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.tm.te.ui.views"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/target_explorer/features/org.eclipse.tm.te.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tm.te.sdk.feature/feature.xml
index f0c7428fc..79ba18bc7 100644
--- a/target_explorer/features/org.eclipse.tm.te.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tm.te.sdk.feature/feature.xml
@@ -22,42 +22,42 @@
</requires>
<plugin
- id="org.eclipse.tm.te.core.source"
+ id="org.eclipse.tm.te.runtime.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.te.core.persistence.source"
+ id="org.eclipse.tm.te.runtime.concurrent.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.te.core.statushandler.source"
+ id="org.eclipse.tm.te.runtime.model.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.te.ui.controls.source"
+ id="org.eclipse.tm.te.runtime.persistence.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.te.ui.forms.source"
+ id="org.eclipse.tm.te.runtime.statushandler.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.te.ui.swt.source"
+ id="org.eclipse.tm.te.core.source"
download-size="0"
install-size="0"
version="0.0.0"
@@ -71,6 +71,27 @@
unpack="false"/>
<plugin
+ id="org.eclipse.tm.te.ui.controls.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.tm.te.ui.forms.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.tm.te.ui.swt.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.tm.te.ui.views.source"
download-size="0"
install-size="0"
diff --git a/target_explorer/features/org.eclipse.tm.te.tcf.feature/feature.xml b/target_explorer/features/org.eclipse.tm.te.tcf.feature/feature.xml
index 235a9727e..228e84c10 100644
--- a/target_explorer/features/org.eclipse.tm.te.tcf.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tm.te.tcf.feature/feature.xml
@@ -22,20 +22,10 @@
<import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.forms" version="3.5.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.navigator" version="3.5.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.te.tcf.core" version="1.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.te.ui" version="1.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.te.ui.swt" version="1.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.te.ui.views" version="1.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.te.tcf.locator" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions" version="3.4.300" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.te.core" version="1.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.te.core.persistence" version="1.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.te.ui.controls" version="1.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.tm.tcf.feature" version="0.5.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.tm.te.feature" version="1.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.tcf.core" version="0.5.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/target_explorer/features/org.eclipse.tm.te.tcf.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tm.te.tcf.sdk.feature/feature.xml
index ec50703ec..249242620 100644
--- a/target_explorer/features/org.eclipse.tm.te.tcf.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tm.te.tcf.sdk.feature/feature.xml
@@ -20,7 +20,6 @@
<requires>
<import feature="org.eclipse.tm.te.sdk.feature" version="1.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.tm.te.tcf.feature" version="1.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.tm.tcf.sdk.feature" version="0.5.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.core.persistence/META-INF/MANIFEST.MF
deleted file mode 100644
index 2ecf001dd..000000000
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.te.core.persistence;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.tm.te.core.persistence.activator.CoreBundleActivator
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.tm.te.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Export-Package: org.eclipse.tm.te.core.persistence,
- org.eclipse.tm.te.core.persistence.activator;x-internal:=true,
- org.eclipse.tm.te.core.persistence.interfaces,
- org.eclipse.tm.te.core.persistence.properties
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.core.persistence/plugin.xml
deleted file mode 100644
index b11ede1f3..000000000
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension-point id="delegates" name="%ExtensionPoint.delegates.name" schema="schema/delegates.exsd"/>
- <extension
- point="org.eclipse.tm.te.core.persistence.delegates">
- <delegate
- class="org.eclipse.tm.te.core.persistence.properties.PropertiesFilePersistenceDelegate"
- id="org.eclipse.tm.te.core.persistence.properties"
- label="%PropertiesFilePersistenceDelegate.label">
- </delegate>
- </extension>
-
-</plugin>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/META-INF/MANIFEST.MF
deleted file mode 100644
index 6cfdf857b..000000000
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.te.core.statushandler;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.tm.te.core.statushandler.activator.CoreBundleActivator
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.core.expressions;bundle-version="3.4.300",
- org.eclipse.tm.te.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Export-Package: org.eclipse.tm.te.core.statushandler,
- org.eclipse.tm.te.core.statushandler.activator;x-internal:=true,
- org.eclipse.tm.te.core.statushandler.interfaces,
- org.eclipse.tm.te.core.statushandler.internal;x-internal:=true,
- org.eclipse.tm.te.core.statushandler.nls
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/nls/Messages.properties
deleted file mode 100644
index affd6edc9..000000000
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/nls/Messages.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# org.eclipse.tm.te.core.statushandler
-# Externalized Strings.
-#
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/.classpath b/target_explorer/plugins/org.eclipse.tm.te.core/.classpath
index 2d1a4302f..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/.options b/target_explorer/plugins/org.eclipse.tm.te.core/.options
index 0623f2629..252182123 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/.options
+++ b/target_explorer/plugins/org.eclipse.tm.te.core/.options
@@ -1,3 +1 @@
org.eclipse.tm.te.core/debugmode = 0
-org.eclipse.tm.te.core/trace/events = false
-org.eclipse.tm.te.core/trace/callbacks = false \ No newline at end of file
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.core/.settings/org.eclipse.jdt.core.prefs
index 2c8455c4e..b484f2c47 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Fri Sep 30 17:33:42 CEST 2011
+#Mon Oct 03 09:45:17 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.core/META-INF/MANIFEST.MF
index b771fe5d1..c99e506a2 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.core/META-INF/MANIFEST.MF
@@ -6,22 +6,9 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.tm.te.core.activator.CoreBundleActivator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.core.expressions;bundle-version="3.4.300"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.core.activator;x-internal:=true,
- org.eclipse.tm.te.core.callback,
- org.eclipse.tm.te.core.events,
- org.eclipse.tm.te.core.extensions,
- org.eclipse.tm.te.core.interfaces,
- org.eclipse.tm.te.core.interfaces.callback,
- org.eclipse.tm.te.core.interfaces.events,
- org.eclipse.tm.te.core.interfaces.nodes,
- org.eclipse.tm.te.core.internal;x-internal:=true,
- org.eclipse.tm.te.core.internal.tracing;x-internal:=true,
- org.eclipse.tm.te.core.nls,
- org.eclipse.tm.te.core.nodes,
- org.eclipse.tm.te.core.preferences,
- org.eclipse.tm.te.core.progress,
- org.eclipse.tm.te.core.tracing
+ org.eclipse.tm.te.core.nls;x-internal:=true
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/build.properties b/target_explorer/plugins/org.eclipse.tm.te.core/build.properties
index 73a5119ed..f4ae97015 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/build.properties
+++ b/target_explorer/plugins/org.eclipse.tm.te.core/build.properties
@@ -2,5 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.properties,\
- plugin.xml
+ plugin.properties
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.core/plugin.xml
deleted file mode 100644
index ab10c4a69..000000000
--- a/target_explorer/plugins/org.eclipse.tm.te.core/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension-point id="eventListeners" name="Event Listener Contributions" schema="schema/eventListeners.exsd"/>
-
-<!-- Eclipse core expressions property tester -->
- <extension point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- class="org.eclipse.tm.te.core.internal.PreferencesPropertyTester"
- id="org.eclipse.tm.te.core.PreferencesPropertyTester"
- namespace="org.eclipse.tm.te.core"
- properties="preference"
- type="java.lang.Object">
- </propertyTester>
-
- <propertyTester
- class="org.eclipse.tm.te.core.internal.PropertiesContainerPropertyTester"
- id="org.eclipse.tm.te.core.PropertiesContainerPropertyTester"
- namespace="org.eclipse.tm.te.core"
- properties="isProperty"
- type="org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer">
- </propertyTester>
- </extension>
-
-<!-- Event listener contributions -->
- <extension point="org.eclipse.tm.te.core.eventListeners">
- <eventListener class="org.eclipse.tm.te.core.internal.DebugEventListener"/>
- </extension>
-
-</plugin>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/activator/CoreBundleActivator.java
index 1103fa48b..3a73659ed 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/activator/CoreBundleActivator.java
@@ -9,7 +9,7 @@
*******************************************************************************/
package org.eclipse.tm.te.core.activator;
-import org.eclipse.tm.te.core.tracing.TraceHandler;
+import org.eclipse.tm.te.runtime.tracing.TraceHandler;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -56,6 +56,7 @@ public class CoreBundleActivator implements BundleActivator {
/* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext bundleContext) throws Exception {
CoreBundleActivator.context = bundleContext;
}
@@ -63,6 +64,7 @@ public class CoreBundleActivator implements BundleActivator {
/* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext bundleContext) throws Exception {
CoreBundleActivator.context = null;
traceHandler = null;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nls/Messages.java b/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nls/Messages.java
index 06709eeb9..95f690144 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nls/Messages.java
@@ -29,9 +29,4 @@ public class Messages extends NLS {
// **** Declare externalized string id's down here *****
- public static String Extension_error_missingRequiredAttribute;
- public static String Extension_error_duplicateExtension;
- public static String Extension_error_invalidExtensionPoint;
-
- public static String PendingOperationModelNode_label;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nls/Messages.properties
index 1dadeb8c9..81d50476d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nls/Messages.properties
@@ -2,9 +2,3 @@
# org.eclipse.tm.te.core
# Externalized Strings.
#
-
-Extension_error_missingRequiredAttribute=Required attribute "{0}" missing for extension "{1}"!
-Extension_error_duplicateExtension=Duplicate extension with id ''{0}''. Ignoring duplicated contribution from contributor ''{1}''!
-Extension_error_invalidExtensionPoint=Failed to instantiate the executable extension from extension point ''{0}''.
-
-PendingOperationModelNode_label=Pending...
diff --git a/target_explorer/plugins/org.eclipse.tm.te.rcp/products/TargetExplorer.product b/target_explorer/plugins/org.eclipse.tm.te.rcp/products/TargetExplorer.product
index 6f5258561..a7dc724cb 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.rcp/products/TargetExplorer.product
+++ b/target_explorer/plugins/org.eclipse.tm.te.rcp/products/TargetExplorer.product
@@ -53,16 +53,13 @@
<plugin id="org.eclipse.core.databinding.property"/>
<plugin id="org.eclipse.core.expressions"/>
<plugin id="org.eclipse.core.filesystem"/>
+ <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true"/>
+ <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
<plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
- <plugin id="org.eclipse.ecf"/>
- <plugin id="org.eclipse.ecf.filetransfer"/>
- <plugin id="org.eclipse.ecf.identity"/>
- <plugin id="org.eclipse.ecf.provider.filetransfer"/>
- <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
- <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
<plugin id="org.eclipse.equinox.p2.core"/>
@@ -73,19 +70,25 @@
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.help"/>
<plugin id="org.eclipse.jface"/>
<plugin id="org.eclipse.jface.databinding"/>
<plugin id="org.eclipse.jface.text"/>
<plugin id="org.eclipse.osgi"/>
- <plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.swt"/>
+ <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
+ <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
<plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.text"/>
- <plugin id="org.eclipse.tm.te.core"/>
<plugin id="org.eclipse.tm.te.rcp"/>
<plugin id="org.eclipse.tm.te.rcp.application"/>
+ <plugin id="org.eclipse.tm.te.runtime"/>
<plugin id="org.eclipse.tm.te.ui"/>
+ <plugin id="org.eclipse.tm.te.ui.forms"/>
+ <plugin id="org.eclipse.tm.te.ui.swt"/>
<plugin id="org.eclipse.tm.te.ui.views"/>
<plugin id="org.eclipse.ui"/>
<plugin id="org.eclipse.ui.forms"/>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.rcp/products/TargetExplorer_TCF.product b/target_explorer/plugins/org.eclipse.tm.te.rcp/products/TargetExplorer_TCF.product
index e7dfd96e3..1f1194a46 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.rcp/products/TargetExplorer_TCF.product
+++ b/target_explorer/plugins/org.eclipse.tm.te.rcp/products/TargetExplorer_TCF.product
@@ -53,16 +53,13 @@
<plugin id="org.eclipse.core.databinding.property"/>
<plugin id="org.eclipse.core.expressions"/>
<plugin id="org.eclipse.core.filesystem"/>
+ <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true"/>
+ <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
<plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
- <plugin id="org.eclipse.ecf"/>
- <plugin id="org.eclipse.ecf.filetransfer"/>
- <plugin id="org.eclipse.ecf.identity"/>
- <plugin id="org.eclipse.ecf.provider.filetransfer"/>
- <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
- <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
<plugin id="org.eclipse.equinox.p2.core"/>
@@ -73,24 +70,32 @@
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.help"/>
<plugin id="org.eclipse.jface"/>
<plugin id="org.eclipse.jface.databinding"/>
<plugin id="org.eclipse.jface.text"/>
<plugin id="org.eclipse.osgi"/>
- <plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.swt"/>
+ <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
+ <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
<plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.text"/>
<plugin id="org.eclipse.tm.tcf.core"/>
- <plugin id="org.eclipse.tm.te.core"/>
<plugin id="org.eclipse.tm.te.rcp"/>
<plugin id="org.eclipse.tm.te.rcp.application"/>
+ <plugin id="org.eclipse.tm.te.runtime"/>
+ <plugin id="org.eclipse.tm.te.runtime.persistence"/>
<plugin id="org.eclipse.tm.te.tcf.core"/>
<plugin id="org.eclipse.tm.te.tcf.filesystem"/>
<plugin id="org.eclipse.tm.te.tcf.locator"/>
<plugin id="org.eclipse.tm.te.tcf.ui"/>
<plugin id="org.eclipse.tm.te.ui"/>
+ <plugin id="org.eclipse.tm.te.ui.controls"/>
+ <plugin id="org.eclipse.tm.te.ui.forms"/>
+ <plugin id="org.eclipse.tm.te.ui.swt"/>
<plugin id="org.eclipse.tm.te.ui.views"/>
<plugin id="org.eclipse.ui"/>
<plugin id="org.eclipse.ui.forms"/>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/.classpath b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.classpath
index 2d1a4302f..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.options b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.options
new file mode 100644
index 000000000..763cd5580
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.options
@@ -0,0 +1 @@
+org.eclipse.tm.te.runtime.concurrent/debugmode = 0
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.project b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.project
new file mode 100644
index 000000000..fc075fd30
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.tm.te.runtime.concurrent</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/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.settings/org.eclipse.jdt.core.prefs
index ba0f4bc1b..4310a0df3 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Mon Jul 04 14:58:13 CEST 2011
+#Mon Oct 03 09:52:17 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..46c4f0bc2
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.tm.te.runtime.concurrent;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.tm.te.runtime.concurrent.activator.CoreBundleActivator
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.eclipse.tm.te.runtime.concurrent,
+ org.eclipse.tm.te.runtime.concurrent.activator;x-internal:=true,
+ org.eclipse.tm.te.runtime.concurrent.event,
+ org.eclipse.tm.te.runtime.concurrent.executors,
+ org.eclipse.tm.te.runtime.concurrent.factories,
+ org.eclipse.tm.te.runtime.concurrent.interfaces,
+ org.eclipse.tm.te.runtime.concurrent.nls;x-internal:=true,
+ org.eclipse.tm.te.runtime.concurrent.util
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/build.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/build.properties
index 73a5119ed..73a5119ed 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/build.properties
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/build.properties
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/plugin.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/plugin.properties
new file mode 100644
index 000000000..1cec4c8ab
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/plugin.properties
@@ -0,0 +1,15 @@
+##################################################################################
+# Copyright (c) 2011 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
+##################################################################################
+
+pluginName = Target Explorer, Concurrent Runtime plug-in
+providerName = Eclipse.org
+
+ExtensionPoint.executorServices.name=Executor Services
+ExtensionPoint.executorUtilDelegates.name=Executor Utility Wait and Dispatch Delegates
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/plugin.xml
new file mode 100644
index 000000000..7ca9c1168
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/plugin.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+<!-- Extension point contributions -->
+ <extension-point id="executorServices" name="%ExtensionPoint.executorServices.name" schema="schema/executorServices.exsd"/>
+ <extension-point id="executorUtilDelegates" name="%ExtensionPoint.executorUtilDelegates.name" schema="schema/executorUtilDelegates.exsd"/>
+
+<!-- Executor service contributions -->
+ <extension point="org.eclipse.tm.te.runtime.concurrent.executorServices">
+ <executorService
+ id="org.eclipse.tm.te.runtime.concurrent.executors.singleThreaded"
+ label="Single Threaded Executor">
+ <class
+ class="org.eclipse.tm.te.runtime.concurrent.executors.SingleThreadedExecutorService">
+ <parameter
+ name="threadPoolNamePrefix"
+ value="Target Explorer Single Thread Executor">
+ </parameter>
+ </class>
+ </executorService>
+ </extension>
+
+</plugin>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/pom.xml b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/pom.xml
index d4a4c8613..580047150 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/pom.xml
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/pom.xml
@@ -12,6 +12,6 @@
</parent>
<version>1.0.0.qualifier</version>
- <artifactId>org.eclipse.tm.te.core.statushandler</artifactId>
+ <artifactId>org.eclipse.tm.te.runtime.concurrent</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/schema/executorServices.exsd b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/schema/executorServices.exsd
new file mode 100644
index 000000000..2a6643d53
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/schema/executorServices.exsd
@@ -0,0 +1,200 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.tm.te.runtime.concurrent" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.eclipse.tm.te.runtime.concurrent" id="executorServices" name="Executor Services"/>
+ </appinfo>
+ <documentation>
+ This extension point is used to contribute executor services.
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="executorService" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="executorService">
+ <annotation>
+ <documentation>
+ Declares a Wind River executor service contribution.
+ </documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="class" minOccurs="0" maxOccurs="1"/>
+ <element ref="description" minOccurs="0" maxOccurs="1"/>
+ </sequence>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+ The unique id of the executor service contribution.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="label" type="string" use="required">
+ <annotation>
+ <documentation>
+ The label representing the executor service within the UI.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="class" type="string">
+ <annotation>
+ <documentation>
+ The class that implements &lt;code&gt;com.windriver.core.runtime.concurrent.interfaces.IWRExecutor&lt;/code&gt; or extends &lt;code&gt;com.windriver.core.runtime.concurrent.executors.AbstractDelegatingExecutorService&lt;/code&gt;.
+&lt;p&gt;
+The executor service implementation class must be specified either by the class attribute or the class child element!
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="java" basedOn=":com.windriver.core.runtime.concurrent.interfaces.IWRExecutor"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="description" type="string">
+ <annotation>
+ <documentation>
+ A short description of the executor service to be presented in the UI.
+ </documentation>
+ </annotation>
+ </element>
+
+ <element name="class">
+ <annotation>
+ <documentation>
+ &lt;p&gt;Used when creating an &lt;code&gt;IExecutableExtension&lt;/code&gt; with a named parameter, or more than one.&lt;/p&gt;
+ </documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="parameter" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="class" type="string">
+ <annotation>
+ <documentation>
+ The class that implements &lt;code&gt;com.windriver.core.runtime.concurrent.interfaces.IWRExecutor&lt;/code&gt; or extends &lt;code&gt;com.windriver.core.runtime.concurrent.executors.AbstractDelegatingExecutorService&lt;/code&gt;.
+&lt;p&gt;
+The executor service implementation class must be specified either by the class attribute or the class child element!
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="java" basedOn=":com.windriver.core.runtime.concurrent.interfaces.IWRExecutor"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="parameter">
+ <annotation>
+ <documentation>
+ &lt;p&gt;A parameter for an &lt;code&gt;IExecutableExtension&lt;/code&gt;.&lt;/p&gt;
+ </documentation>
+ </annotation>
+ <complexType>
+ <attribute name="name" type="string" use="required">
+ <annotation>
+ <documentation>
+ &lt;p&gt;The parameter name.&lt;/p&gt;
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="value" type="string" use="required">
+ <annotation>
+ <documentation>
+ &lt;p&gt;The parameter value.&lt;/p&gt;
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ Target Explorer 1.0.0
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ This is an example of the extension point usage:
+&lt;p&gt;
+&lt;pre&gt;&lt;code&gt;
+ &lt;extension point=&quot;org.eclipse.tm.te.runtime.concurrent.executorServices&quot;&gt;
+ &lt;executorService
+ id=&quot;org.eclipse.tm.te.runtime.concurrent.executors.singleThreaded&quot;
+ class=&quot;org.eclipse.tm.te.runtime.concurrent.executors.SingleThreadedExecutorService&quot;
+ label=&quot;Single Threaded Executor Service&quot;&gt;
+ &lt;/exectorService&gt;
+ &lt;/extension&gt;
+&lt;/code&gt;&lt;/pre&gt;
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ The provider of a executor service must implement &lt;samp&gt;org.eclipse.tm.te.runtime.concurrent.interfaces.IExecutor&lt;/samp&gt;.
+ </documentation>
+ </annotation>
+
+
+ <annotation>
+ <appinfo>
+ <meta.section type="copyright"/>
+ </appinfo>
+ <documentation>
+ Copyright (c) 2011 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.
+ </documentation>
+ </annotation>
+
+</schema>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/schema/executorUtilDelegates.exsd b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/schema/executorUtilDelegates.exsd
new file mode 100644
index 000000000..4ff64843d
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/schema/executorUtilDelegates.exsd
@@ -0,0 +1,200 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.tm.te.runtime.concurrent" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.eclipse.tm.te.runtime.concurrent" id="executorUtilDelegates" name="Executor Utility Delegates"/>
+ </appinfo>
+ <documentation>
+ This extension point is used to contribute executor utility delegates.
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="executorUtilDelegate" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="executorUtilDelegate">
+ <annotation>
+ <documentation>
+ Declares a Wind River executor utility delegate contribution.
+ </documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="class" minOccurs="0" maxOccurs="1"/>
+ <element ref="description" minOccurs="0" maxOccurs="1"/>
+ </sequence>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+ The unique id of the executor utility delegate contribution.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="label" type="string" use="required">
+ <annotation>
+ <documentation>
+ The label representing the executor utility delegate within the UI.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="class" type="string">
+ <annotation>
+ <documentation>
+ The class that implements &lt;code&gt;com.windriver.core.runtime.concurrent.interfaces.IWRExecutorUtilDelegate&lt;/code&gt;.
+&lt;p&gt;
+The executor utility delegate implementation class must be specified either by the class attribute or the class child element!
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="java" basedOn=":com.windriver.core.runtime.concurrent.interfaces.IWRExecutorUtilDelegate"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="description" type="string">
+ <annotation>
+ <documentation>
+ A short description of the executor utility delegate to be presented in the UI.
+ </documentation>
+ </annotation>
+ </element>
+
+ <element name="class">
+ <annotation>
+ <documentation>
+ &lt;p&gt;Used when creating an &lt;code&gt;IExecutableExtension&lt;/code&gt; with a named parameter, or more than one.&lt;/p&gt;
+ </documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="parameter" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="class" type="string">
+ <annotation>
+ <documentation>
+ The class that implements &lt;code&gt;com.windriver.core.runtime.concurrent.interfaces.IWRExecutorUtilDelegate&lt;/code&gt;.
+&lt;p&gt;
+The executor utility delegate implementation class must be specified either by the class attribute or the class child element!
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="java" basedOn=":com.windriver.core.runtime.concurrent.interfaces.IWRExecutorUtilDelegate"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="parameter">
+ <annotation>
+ <documentation>
+ &lt;p&gt;A parameter for an &lt;code&gt;IExecutableExtension&lt;/code&gt;.&lt;/p&gt;
+ </documentation>
+ </annotation>
+ <complexType>
+ <attribute name="name" type="string" use="required">
+ <annotation>
+ <documentation>
+ &lt;p&gt;The parameter name.&lt;/p&gt;
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="value" type="string" use="required">
+ <annotation>
+ <documentation>
+ &lt;p&gt;The parameter value.&lt;/p&gt;
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ Target Explorer 1.0.0
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ This is an example of the extension point usage:
+&lt;p&gt;
+&lt;pre&gt;&lt;code&gt;
+ &lt;extension point=&quot;org.eclipse.tm.te.runtime.concurrent.executorUtilDelegates&quot;&gt;
+ &lt;executorUtilDelegate
+ id=&quot;org.eclipse.tm.te.runtime.concurrent.executor.delegates.swt&quot;
+ class=&quot;org.eclipse.tm.te.ui.swt.executor.delegates.SWTExecutorUtilDelegate&quot;
+ label=&quot;SWT Executor Utility Delegate&quot;&gt;
+ &lt;/exectorUtilDelegate&gt;
+ &lt;/extension&gt;
+&lt;/code&gt;&lt;/pre&gt;
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ The provider of a executor utility delegates must implement &lt;samp&gt;org.eclipse.tm.te.runtime.concurrent.interfaces.IExecutorUtilDelegate&lt;/samp&gt;.
+ </documentation>
+ </annotation>
+
+
+ <annotation>
+ <appinfo>
+ <meta.section type="copyright"/>
+ </appinfo>
+ <documentation>
+ Copyright (c) 2011 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.
+ </documentation>
+ </annotation>
+
+</schema>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/Executors.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/Executors.java
new file mode 100644
index 000000000..75ab9318c
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/Executors.java
@@ -0,0 +1,141 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.IExecutor;
+import org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtensionProxy;
+
+
+/**
+ * Class is providing the entry points to create or query the executor service
+ * instances.
+ */
+public final class Executors {
+
+ /**
+ * Execution service extension point manager.
+ */
+ protected static class ExecutorServiceExtensionPointManager extends AbstractExtensionPointManager<IExecutor> {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getExtensionPointId()
+ */
+ @Override
+ protected String getExtensionPointId() {
+ return "org.eclipse.tm.te.runtime.concurrent.executorServices"; //$NON-NLS-1$
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getConfigurationElementName()
+ */
+ @Override
+ protected String getConfigurationElementName() {
+ return "executorService"; //$NON-NLS-1$
+ }
+
+ /**
+ * Returns the list of all contributed executors.
+ *
+ * @return The list of contributed executors, or an empty array.
+ */
+ public IExecutor[] getExecutors() {
+ List<IExecutor> contributions = new ArrayList<IExecutor>();
+ Collection<ExecutableExtensionProxy<IExecutor>> proxies = getExtensions().values();
+ for (ExecutableExtensionProxy<IExecutor> proxy : proxies)
+ if (proxy.getInstance() != null
+ && !contributions.contains(proxy.getInstance()))
+ contributions.add(proxy.getInstance());
+
+ return contributions.toArray(new IExecutor[contributions.size()]);
+ }
+
+ /**
+ * Returns the executor identified by its unique id. If no executor with
+ * the specified id is registered, <code>null</code> is returned.
+ *
+ * @param id
+ * The unique id of the executor. Must not be
+ * <code>null</code>
+ * @param newInstance
+ * Specify <code>true</code> to get a new executor service
+ * instance, <code>false</code> otherwise.
+ *
+ * @return The executor instance or <code>null</code>.
+ */
+ public IExecutor getExecutor(String id, boolean newInstance) {
+ Assert.isNotNull(id);
+
+ IExecutor executorService = null;
+ if (getExtensions().containsKey(id)) {
+ ExecutableExtensionProxy<IExecutor> proxy = getExtensions().get(id);
+ // Get the extension instance
+ executorService = newInstance ? proxy.newInstance() : proxy.getInstance();
+ }
+
+ return executorService;
+ }
+ }
+
+ // Reference to the executor service extension point manager
+ private final static ExecutorServiceExtensionPointManager EXTENSION_POINT_MANAGER = new ExecutorServiceExtensionPointManager();
+
+ /**
+ * Constructor.
+ * <p>
+ * <b>Note:</b> The class cannot be instantiated.
+ */
+ private Executors() {
+ }
+
+ /**
+ * Creates an instance of the executor registered with the specified id. If
+ * no executor is registered under the given id, the method will return
+ * <code>null</code>.
+ *
+ * @param id
+ * The id of the executor. Must not be <code>null</code>.
+ * @return The new executor instance or <code>null</code>.
+ */
+ public static IExecutor newExecutor(String id) {
+ Assert.isNotNull(id);
+ return EXTENSION_POINT_MANAGER.getExecutor(id, true);
+ }
+
+ /**
+ * Returns the shared instance of the executor registered with the specified
+ * id. If the shared instance hasn't been created yet, the instance will be
+ * created and saved. Subsequent calls to this method with the same id will
+ * return always the same executor instance. If no executor is registered
+ * under the given id, the method will return <code>null</code>.
+ *
+ * @param id
+ * The id of the executor. Must not be <code>null</code>.
+ * @return The new executor instance or <code>null</code>.
+ */
+ public static IExecutor getSharedExecutor(String id) {
+ Assert.isNotNull(id);
+ return EXTENSION_POINT_MANAGER.getExecutor(id, false);
+ }
+
+ /**
+ * Returns the shared instances of all registered executors.
+ *
+ * @return All executor instances or an empty array.
+ */
+ public static IExecutor[] getAllSharedExecutors() {
+ return EXTENSION_POINT_MANAGER.getExecutors();
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/activator/CoreBundleActivator.java
new file mode 100644
index 000000000..f97644d9f
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/activator/CoreBundleActivator.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.activator;
+
+import org.eclipse.tm.te.runtime.tracing.TraceHandler;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class CoreBundleActivator implements BundleActivator {
+ // The bundle context
+ private static BundleContext context;
+ // The trace handler instance
+ private static TraceHandler traceHandler;
+
+ /**
+ * Returns the bundle context
+ *
+ * @return the bundle context
+ */
+ public static BundleContext getContext() {
+ return context;
+ }
+
+ /**
+ * Convenience method which returns the unique identifier of this plugin.
+ */
+ public static String getUniqueIdentifier() {
+ if (getContext() != null && getContext().getBundle() != null) {
+ return getContext().getBundle().getSymbolicName();
+ }
+ return null;
+ }
+
+ /**
+ * Returns the bundles trace handler.
+ *
+ * @return The bundles trace handler.
+ */
+ public static TraceHandler getTraceHandler() {
+ if (traceHandler == null) {
+ traceHandler = new TraceHandler(getUniqueIdentifier());
+ }
+ return traceHandler;
+ }
+
+ /* (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void start(BundleContext bundleContext) throws Exception {
+ CoreBundleActivator.context = bundleContext;
+ }
+
+ /* (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void stop(BundleContext bundleContext) throws Exception {
+ CoreBundleActivator.context = null;
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/event/ExecutorThreadNotificationListener.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/event/ExecutorThreadNotificationListener.java
new file mode 100644
index 000000000..07d7ec279
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/event/ExecutorThreadNotificationListener.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.event;
+
+import org.eclipse.core.runtime.PlatformObject;
+import org.eclipse.tm.te.runtime.concurrent.util.ExecutorsUtil;
+import org.eclipse.tm.te.runtime.interfaces.events.IEventFireDelegate;
+import org.eclipse.tm.te.runtime.interfaces.events.IEventListener;
+
+/**
+ * Abstract notification listener implementation executing the
+ * notifications within the shared executor thread.
+ */
+public abstract class ExecutorThreadNotificationListener extends PlatformObject implements IEventListener, IEventFireDelegate {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.interfaces.events.IEventFireDelegate#fire(java.lang.Runnable)
+ */
+ @Override
+ public final void fire(Runnable runnable) {
+ // Force notification into the executor thread.
+ //
+ // Note: The executor thread is not identical with the display thread!
+ // Use ExecutorsUtil.executeInUI(runnable) to execute the runnable
+ // within the display thread.
+ ExecutorsUtil.execute(runnable);
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/executors/AbstractDelegatingExecutorService.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/executors/AbstractDelegatingExecutorService.java
new file mode 100644
index 000000000..240bf7e14
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/executors/AbstractDelegatingExecutorService.java
@@ -0,0 +1,219 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.executors;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.tm.te.runtime.concurrent.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.IExecutor;
+import org.eclipse.tm.te.runtime.concurrent.nls.Messages;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtension;
+
+/**
+ * Abstract delegating execution service implementation.
+ */
+public abstract class AbstractDelegatingExecutorService extends
+ ExecutableExtension implements IExecutor, ExecutorService {
+ // The executor service to delegate the API calls to
+ private ExecutorService delegate;
+
+ // The thread pool name prefix
+ private String threadPoolNamePrefix;
+
+ /**
+ * Constructor.
+ */
+ public AbstractDelegatingExecutorService() {
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.extensions.ExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+ */
+ @Override
+ public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
+ super.setInitializationData(config, propertyName, data);
+
+ if (config != null && data instanceof Map<?, ?>) {
+ Map<?, ?> params = (Map<?, ?>) data;
+ // Initialize the thread pool name prefix field by reading the
+ // "threadPoolNamePrefix" extension attribute if present.
+ threadPoolNamePrefix = (String) params.get("threadPoolNamePrefix"); //$NON-NLS-1$
+ if (threadPoolNamePrefix == null || threadPoolNamePrefix.trim().length() == 0) {
+ threadPoolNamePrefix = ""; //$NON-NLS-1$
+ }
+ }
+
+ // Create the executor service delegate
+ this.delegate = createExecutorServiceDelegate();
+ Assert.isNotNull(delegate);
+ }
+
+ /**
+ * Returns the thread pool name prefix if specified by the extension.
+ *
+ * @return The thread pool name prefix or an empty string.
+ */
+ public String getThreadPoolNamePrefix() {
+ return threadPoolNamePrefix != null ? threadPoolNamePrefix : ""; //$NON-NLS-1$
+ }
+
+ /**
+ * Invoked by the constructor exactly once to create the executor service
+ * delegate instance.
+ *
+ * @return The executor service instance and never <code>null</code>.
+ */
+ protected abstract ExecutorService createExecutorServiceDelegate();
+
+ /**
+ * Returns the executor service delegate instance.
+ *
+ * @return The executor service delegate instance.
+ */
+ protected final ExecutorService getExecutorServiceDelegate() {
+ return delegate;
+ }
+
+ /**
+ * Log the given exception as error to the error log.
+ *
+ * @param e
+ * The exception or <code>null</code>.
+ */
+ protected void logException(Throwable e) {
+ if (e != null) {
+ IStatus status = new Status(
+ IStatus.ERROR,
+ CoreBundleActivator.getUniqueIdentifier(),
+ NLS.bind(Messages.AbstractDelegatingExecutorService_unhandledException,
+ e.getLocalizedMessage()), e);
+ Platform.getLog(CoreBundleActivator.getContext().getBundle()).log(status);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.Executor#execute(java.lang.Runnable)
+ */
+ @Override
+ public void execute(Runnable command) {
+ delegate.execute(command);
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#shutdown()
+ */
+ @Override
+ public void shutdown() {
+ delegate.shutdown();
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#shutdownNow()
+ */
+ @Override
+ public List<Runnable> shutdownNow() {
+ return delegate.shutdownNow();
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#isShutdown()
+ */
+ @Override
+ public boolean isShutdown() {
+ return delegate.isShutdown();
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#isTerminated()
+ */
+ @Override
+ public boolean isTerminated() {
+ return delegate.isTerminated();
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#awaitTermination(long, java.util.concurrent.TimeUnit)
+ */
+ @Override
+ public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
+ return delegate.awaitTermination(timeout, unit);
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#submit(java.util.concurrent.Callable)
+ */
+ @Override
+ public <T> Future<T> submit(Callable<T> task) {
+ return delegate.submit(task);
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#submit(java.lang.Runnable, java.lang.Object)
+ */
+ @Override
+ public <T> Future<T> submit(Runnable task, T result) {
+ return delegate.submit(task, result);
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#submit(java.lang.Runnable)
+ */
+ @Override
+ public Future<?> submit(Runnable task) {
+ return delegate.submit(task);
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#invokeAll(java.util.Collection)
+ */
+ @Override
+ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
+ return delegate.invokeAll(tasks);
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#invokeAll(java.util.Collection, long, java.util.concurrent.TimeUnit)
+ */
+ @Override
+ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
+ return delegate.invokeAll(tasks, timeout, unit);
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#invokeAny(java.util.Collection)
+ */
+ @Override
+ public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException {
+ return delegate.invokeAny(tasks);
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ExecutorService#invokeAny(java.util.Collection, long, java.util.concurrent.TimeUnit)
+ */
+ @Override
+ public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+ return delegate.invokeAny(tasks, timeout, unit);
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/executors/SingleThreadedExecutorService.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/executors/SingleThreadedExecutorService.java
new file mode 100644
index 000000000..e9dbe05c5
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/executors/SingleThreadedExecutorService.java
@@ -0,0 +1,188 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.executors;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.eclipse.tm.te.runtime.concurrent.factories.SingleThreadThreadFactory;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.INestableExecutor;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.ISingleThreadedExecutor;
+
+/**
+ * A single threaded executor service implementation.
+ */
+public class SingleThreadedExecutorService extends AbstractDelegatingExecutorService implements ISingleThreadedExecutor, INestableExecutor {
+
+ /**
+ * A single threaded executor implementation.
+ */
+ protected class SingleThreadedExecutor extends ThreadPoolExecutor implements INestableExecutor {
+ // The current nesting depth
+ private final AtomicInteger currentNestingDepth = new AtomicInteger(0);
+
+ /**
+ * Constructor.
+ *
+ * @param threadFactory
+ * The thread factory instance. Must not be <code>null</code>.
+ *
+ * @throws NullPointerException
+ * if threadFactory is <code>null</code>.
+ */
+ public SingleThreadedExecutor(ThreadFactory threadFactory) {
+ this(threadFactory, new LinkedBlockingQueue<Runnable>());
+ }
+
+ /**
+ * Constructor.
+ * <p>
+ * Private constructor to catch the work queue instance passed into the
+ * {@link ThreadPoolExecutor} constructor.
+ *
+ * @param threadFactory
+ * The thread factory instance. Must not be <code>null</code>.
+ * @param workQueue
+ * The work queue instance. Must not be <code>null</code>.
+ */
+ private SingleThreadedExecutor(ThreadFactory threadFactory, BlockingQueue<Runnable> workQueue) {
+ super(1, 1, 0L, TimeUnit.NANOSECONDS, workQueue, threadFactory);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.INestableExecutor#getMaxDepth()
+ */
+ @Override
+ public int getMaxDepth() {
+ return 1;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.INestableExecutor#readAndExecute()
+ */
+ @Override
+ public boolean readAndExecute() {
+ // Method is callable from the executor thread only
+ if (!isExecutorThread()) {
+ throw new IllegalStateException("Must be called from within the executor thread!"); //$NON-NLS-1$
+ }
+
+ BlockingQueue<Runnable> queue = getQueue();
+
+ // If the work queue is empty, there is nothing to do
+ if (!queue.isEmpty()) {
+ // Work queue not empty, check if we reached the maximum nesting
+ // depth
+ if (currentNestingDepth.get() >= getMaxDepth()) {
+ throw new IllegalStateException("Maximum nesting depth exceeded!"); //$NON-NLS-1$
+ }
+
+ // Get the next work item to do
+ Runnable runnable = null;
+ try {
+ // Double check that the queue is not empty, we desire to
+ // avoid
+ // blocking here!
+ if (!queue.isEmpty()) {
+ runnable = queue.take();
+ }
+ } catch (InterruptedException e) { /* ignored on purpose */ }
+
+ if (runnable != null) {
+ // Increase the nesting depth
+ currentNestingDepth.incrementAndGet();
+ try {
+ // Execute the runnable
+ runnable.run();
+ } finally {
+ // Decrease nesting depth
+ currentNestingDepth.decrementAndGet();
+ }
+ }
+ }
+
+ return !queue.isEmpty();
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.ThreadPoolExecutor#afterExecute(java.lang.Runnable, java.lang.Throwable)
+ */
+ @Override
+ protected void afterExecute(Runnable r, Throwable t) {
+ super.afterExecute(r, t);
+ if (t != null)
+ logException(t);
+ }
+ }
+
+ // Internal reference to the one shot thread factory instance
+ private SingleThreadThreadFactory threadFactory;
+
+ /**
+ * Constructor.
+ */
+ public SingleThreadedExecutorService() {
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.executors.AbstractDelegatingExecutorService#createExecutorServiceDelegate()
+ */
+ @Override
+ protected ExecutorService createExecutorServiceDelegate() {
+ threadFactory = new SingleThreadThreadFactory(getThreadPoolNamePrefix());
+ return new SingleThreadedExecutor(threadFactory);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.ISingleThreadedExecutor#isExecutorThread()
+ */
+ @Override
+ public final boolean isExecutorThread() {
+ return isExecutorThread(Thread.currentThread());
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.ISingleThreadedExecutor#isExecutorThread(java.lang.Thread)
+ */
+ @Override
+ public final boolean isExecutorThread(Thread thread) {
+ if (thread != null && threadFactory != null) {
+ return thread.equals(threadFactory.getThread());
+ }
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.INestableExecutor#getMaxDepth()
+ */
+ @Override
+ public int getMaxDepth() {
+ if (!(getExecutorServiceDelegate() instanceof INestableExecutor)) {
+ throw new UnsupportedOperationException("Executor service delegate must implement INestableExecutor"); //$NON-NLS-1$
+ }
+ return ((INestableExecutor) getExecutorServiceDelegate()).getMaxDepth();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.INestableExecutor#readAndExecute()
+ */
+ @Override
+ public boolean readAndExecute() {
+ if (!(getExecutorServiceDelegate() instanceof INestableExecutor)) {
+ throw new UnsupportedOperationException("Executor service delegate must implement INestableExecutor"); //$NON-NLS-1$
+ }
+ return ((INestableExecutor) getExecutorServiceDelegate()).readAndExecute();
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/factories/SingleThreadThreadFactory.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/factories/SingleThreadThreadFactory.java
new file mode 100644
index 000000000..8789dbf85
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/factories/SingleThreadThreadFactory.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.factories;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.eclipse.core.runtime.Assert;
+
+/**
+ * A thread factory implementation creating a single thread only.
+ */
+public class SingleThreadThreadFactory implements ThreadFactory {
+ private final ThreadGroup threadGroup;
+ private final String threadName;
+ private Thread thread;
+
+ private final AtomicInteger threadNumber = new AtomicInteger(1);
+
+ /**
+ * Constructor.
+ *
+ * @param namePrefix
+ * The name prefix to name the created threads. Must not be
+ * <code>null</code>.
+ */
+ public SingleThreadThreadFactory(String namePrefix) {
+ Assert.isNotNull(namePrefix);
+
+ // Determine the thread group. Use the security manager if available.
+ this.threadGroup = (System.getSecurityManager() != null) ? System.getSecurityManager().getThreadGroup() : Thread.currentThread().getThreadGroup();
+ // Set the thread name prefix
+ this.threadName = ("".equals(namePrefix.trim()) ? "Executor" : namePrefix) + " - " + threadNumber.getAndIncrement(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.util.concurrent.ThreadFactory#newThread(java.lang.Runnable)
+ */
+ @Override
+ public Thread newThread(Runnable r) {
+ // The thread can be created on once. If called a second time,
+ // this factory cannot create any additional threads.
+ if (thread != null) return null;
+
+ // Create the thread with the desired name and the current thread number
+ thread = new Thread(threadGroup, r, threadName);
+ thread.setDaemon(false);
+ thread.setPriority(Thread.NORM_PRIORITY);
+
+ // Return the thread
+ return thread;
+ }
+
+ /**
+ * Returns the single created thread instance or <code>null</code> if
+ * {@link #newThread(Runnable)} have not been called yet.
+ *
+ * @return The single created thread instance or <code>null</code>.
+ */
+ public Thread getThread() {
+ return thread;
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/IExecutor.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/IExecutor.java
new file mode 100644
index 000000000..71e831321
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/IExecutor.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.interfaces;
+
+import java.util.concurrent.Executor;
+
+import org.eclipse.tm.te.runtime.interfaces.extensions.IExecutableExtension;
+
+/**
+ * Execution interface declaration.
+ */
+public interface IExecutor extends Executor, IExecutableExtension {
+
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/IExecutorUtilDelegate.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/IExecutorUtilDelegate.java
new file mode 100644
index 000000000..7846c2c9a
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/IExecutorUtilDelegate.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.interfaces;
+
+import org.eclipse.tm.te.runtime.interfaces.extensions.IExecutableExtension;
+
+/**
+ * Executor utility delegate interface declaration.
+ */
+public interface IExecutorUtilDelegate extends IExecutableExtension {
+
+ /**
+ * Returns if or if not the current thread is an executor thread handled by
+ * this executor utility wait and dispatch delegate.
+ *
+ * @return <code>True</code> if the current thread is handled,
+ * <code>false</code> otherwise.
+ */
+ public boolean isHandledExecutorThread();
+
+ /**
+ * Reads an event from the handled executors event queue, dispatches it
+ * appropriately, and returns <code>true</code> if there is potentially more
+ * work to do, or <code>false</code> if the caller can sleep until another
+ * event is placed on the event queue.
+ *
+ * @return <code>True</code> if there is potentially more work to do,
+ * <code>false</code> otherwise.
+ */
+ public boolean readAndDispatch();
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/INestableExecutor.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/INestableExecutor.java
new file mode 100644
index 000000000..5fd483e67
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/INestableExecutor.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.interfaces;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Nestable execution interface declaration.
+ */
+public interface INestableExecutor extends Executor {
+
+ /**
+ * Returns the maximum allowed nesting depth. If this methods returns an
+ * integer value <= 0, nesting is disabled.
+ *
+ * @return The maximum allowed nesting depth or 0 to disable nesting.
+ */
+ public int getMaxDepth();
+
+ /**
+ * Reads the next command from the task queue and execute it if the maximum
+ * allowed nesting depth has not been exceeded. If the maximum nesting depth
+ * has been reached, the method will throw an {@link IllegalStateException}.
+ *
+ * @return <code>True</code> if there is potentially more work to do, or
+ * <code>false</code> if the caller can sleep until another event is
+ * placed on the task queue.
+ */
+ public boolean readAndExecute();
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/ISingleThreadedExecutor.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/ISingleThreadedExecutor.java
new file mode 100644
index 000000000..046174156
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/interfaces/ISingleThreadedExecutor.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.interfaces;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Single threaded execution service interface declaration.
+ */
+public interface ISingleThreadedExecutor extends Executor {
+
+ /**
+ * Returns if or if not the current thread is identical to the executor
+ * thread.
+ *
+ * @return <code>True</code> if the current thread is the executor thread,
+ * <code>false</code> otherwise.
+ */
+ public boolean isExecutorThread();
+
+ /**
+ * Returns if or if not the given thread is identical to the executor
+ * thread.
+ *
+ * @param thread
+ * The thread or <code>null</code>.
+ * @return <code>True</code> if the current thread is the executor thread,
+ * <code>false</code> otherwise.
+ */
+ public boolean isExecutorThread(Thread thread);
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/nls/Messages.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/nls/Messages.java
new file mode 100644
index 000000000..69909d366
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/nls/Messages.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.nls;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Target Explorer Concurrent Runtime plugin externalized strings management.
+ */
+public class Messages extends NLS {
+
+ // The plug-in resource bundle name
+ private static final String BUNDLE_NAME = "org.eclipse.tm.te.runtime.concurrent.nls.Messages"; //$NON-NLS-1$
+
+ /**
+ * Static constructor.
+ */
+ static {
+ // Load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ // **** Declare externalized string id's down here *****
+
+ public static String AbstractDelegatingExecutorService_unhandledException;
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/nls/Messages.properties
new file mode 100644
index 000000000..ff4c85ee4
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/nls/Messages.properties
@@ -0,0 +1,8 @@
+#
+# org.eclipse.tm.te.runtime.concurrent
+# Externalized Strings.
+#
+
+PendingOperationModelNode_label=Pending...
+
+AbstractDelegatingExecutorService_unhandledException=Unhandled exception caught in executor: {0}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/util/ExecutorsUtil.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/util/ExecutorsUtil.java
new file mode 100644
index 000000000..e7a932046
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.concurrent/src/org/eclipse/tm/te/runtime/concurrent/util/ExecutorsUtil.java
@@ -0,0 +1,301 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.concurrent.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.tm.te.runtime.concurrent.Executors;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.IExecutorUtilDelegate;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.INestableExecutor;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.ISingleThreadedExecutor;
+import org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtensionProxy;
+import org.eclipse.tm.te.runtime.interfaces.IConditionTester;
+
+
+/**
+ * Utility class to provide helper methods to execute tasks at
+ * a executor service asynchronous and synchronous.
+ */
+public final class ExecutorsUtil {
+
+ /**
+ * Execution utility wait and dispatch utility extension point manager.
+ */
+ protected static class ExecutorUtilDelegateExtensionPointManager extends AbstractExtensionPointManager<IExecutorUtilDelegate> {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getExtensionPointId()
+ */
+ @Override
+ protected String getExtensionPointId() {
+ return "org.eclipse.tm.te.runtime.concurrent.executorUtilDelegates"; //$NON-NLS-1$
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getConfigurationElementName()
+ */
+ @Override
+ protected String getConfigurationElementName() {
+ return "executorUtilDelegate"; //$NON-NLS-1$
+ }
+
+ /**
+ * Returns the list of all contributed executor utility delegates.
+ *
+ * @return The list of contributed executor utility delegates, or an
+ * empty array.
+ */
+ public IExecutorUtilDelegate[] getExecutorUtilDelegates() {
+ List<IExecutorUtilDelegate> contributions = new ArrayList<IExecutorUtilDelegate>();
+ Collection<ExecutableExtensionProxy<IExecutorUtilDelegate>> proxies = getExtensions().values();
+ for (ExecutableExtensionProxy<IExecutorUtilDelegate> proxy : proxies) {
+ if (proxy.getInstance() != null&& !contributions.contains(proxy.getInstance())) {
+ contributions.add(proxy.getInstance());
+ }
+ }
+
+ return contributions.toArray(new IExecutorUtilDelegate[contributions.size()]);
+ }
+
+ /**
+ * Returns the executor utility delegate identified by its unique id. If
+ * no executor utility delegate with the specified id is registered,
+ * <code>null</code> is returned.
+ *
+ * @param id
+ * The unique id of the executor utility delegate. Must not
+ * be <code>null</code>
+ * @param newInstance
+ * Specify <code>true</code> to get a new executor utility
+ * delegate instance, <code>false</code> otherwise.
+ *
+ * @return The executor instance or <code>null</code>.
+ */
+ public IExecutorUtilDelegate getExecutorUtilDelegate(String id, boolean newInstance) {
+ Assert.isNotNull(id);
+
+ IExecutorUtilDelegate executorUtilDelegate = null;
+ if (getExtensions().containsKey(id)) {
+ ExecutableExtensionProxy<IExecutorUtilDelegate> proxy = getExtensions().get(id);
+ // Get the extension instance
+ executorUtilDelegate = newInstance ? proxy.newInstance() : proxy.getInstance();
+ }
+
+ return executorUtilDelegate;
+ }
+ }
+
+ // Reference to the executor service extension point manager
+ private final static ExecutorUtilDelegateExtensionPointManager EXTENSION_POINT_MANAGER = new ExecutorUtilDelegateExtensionPointManager();
+
+ // Reference to the used executor service.
+ private final static ISingleThreadedExecutor EXECUTOR;
+ // Reference to the used UI executor service (might be null if not available)
+ private final static ISingleThreadedExecutor UI_EXECUTOR;
+
+ /**
+ * Static constructor.
+ */
+ static {
+ EXECUTOR = (ISingleThreadedExecutor) Executors.getSharedExecutor("org.eclipse.tm.te.runtime.concurrent.executors.singleThreaded"); //$NON-NLS-1$
+ Assert.isNotNull(EXECUTOR);
+ UI_EXECUTOR = (ISingleThreadedExecutor) Executors.getSharedExecutor("org.eclipse.tm.te.ui.executors.platform.display"); //$NON-NLS-1$
+ }
+
+ /**
+ * Shutdown the executor service used.
+ */
+ public static void shutdown() {
+ if (EXECUTOR instanceof ExecutorService) {
+ ((ExecutorService) EXECUTOR).shutdown();
+ }
+ if (UI_EXECUTOR instanceof ExecutorService) {
+ ((ExecutorService) UI_EXECUTOR).shutdown();
+ }
+ }
+
+ /**
+ * Checks if the current thread is identical with the executor thread.
+ *
+ * @return <code>True</code> if the current thread is the executor thread,
+ * <code>false</code> otherwise.
+ */
+ public static boolean isExecutorThread() {
+ return EXECUTOR != null ? EXECUTOR.isExecutorThread() : false;
+ }
+
+ /**
+ * Checks if the current thread is identical with the UI executor thread.
+ *
+ * @return <code>True</code> if the current thread is the UI executor
+ * thread, <code>false</code> otherwise.
+ */
+ public static boolean isUIExecutorThread() {
+ return UI_EXECUTOR != null ? UI_EXECUTOR.isExecutorThread() : false;
+ }
+
+ /**
+ * Schedule the given {@link Runnable} for invocation within the used
+ * executor thread.
+ *
+ * @param runnable
+ * The <code>java.lang.Runnable</code> to execute within the
+ * executor thread.
+ */
+ public static void execute(Runnable runnable) {
+ if (runnable != null) {
+ if (EXECUTOR instanceof ExecutorService) {
+ if (!((ExecutorService) EXECUTOR).isShutdown()
+ && !((ExecutorService) EXECUTOR).isTerminated()) {
+ EXECUTOR.execute(runnable);
+ }
+ } else {
+ if (EXECUTOR != null) {
+ EXECUTOR.execute(runnable);
+ }
+ }
+ }
+ }
+
+ /**
+ * Schedule the given {@link Runnable} to run the current workbench display
+ * thread.
+ *
+ * @param runnable
+ * The runnable to execute.
+ */
+ public static void executeInUI(Runnable runnable) {
+ if (runnable != null) {
+ if (UI_EXECUTOR instanceof ExecutorService) {
+ if (!((ExecutorService) UI_EXECUTOR).isShutdown()
+ && !((ExecutorService) UI_EXECUTOR).isTerminated()) {
+ UI_EXECUTOR.execute(runnable);
+ }
+ } else {
+ if (UI_EXECUTOR != null) {
+ UI_EXECUTOR.execute(runnable);
+ }
+ }
+ }
+ }
+
+ /**
+ * Waits either for the given condition tester to signal that the condition,
+ * the caller want's to wait for, has been completely fulfilled or till the
+ * timeout runs out. If the specified condition tester is <code>null</code>,
+ * the method will always wait till the timeout occurs. In case
+ * <code>timeout == 0</code> and <code>conditionTester == null</code>, the
+ * method returns immediately with the return value <code>true</code>!
+ *
+ * @param timeout
+ * The timeout to wait in milliseconds. <code>0</code> means
+ * infinite wait time!
+ * @param conditionTester
+ * The condition tester to use for checking the interrupt
+ * condition.
+ *
+ * @return <code>false</code> if the exit reason if that the waiting
+ * condition has been fulfilled, <code>true</code> if the exit
+ * reason is the timeout!
+ */
+ public static boolean waitAndExecute(final long timeout, final IConditionTester conditionTester) {
+ // both parameter are null, return immediately!
+ if (conditionTester == null && timeout == 0)
+ return true;
+
+ // we assume that the exit reason will be the timeout
+ boolean exitReason = true;
+
+ // Remember the executors utility delegate down the road. As long
+ // we don't leave the waitAndExecute method, the thread cannot change.
+ IExecutorUtilDelegate lastDelegate = null;
+
+ // Remember the start time to calculate the timeout
+ final long startTime = System.currentTimeMillis();
+ // keep going till either the condition tester or the timeout will
+ // break the loop!
+ while (true) {
+ if (conditionTester != null && conditionTester.isConditionFulfilled()) {
+ // the exit reason is the condition tester!
+ exitReason = false;
+ break;
+ }
+ if (timeout != 0 && ((System.currentTimeMillis() - startTime) >= timeout)) {
+ // timeout occurred, just break the loop
+ break;
+ }
+ // none of the break conditions are fulfilled, so wait a little bit
+ // before testing again.
+ if (isExecutorThread()) {
+ // We are in the executor thread. Keep the command dispatching running.
+ if (EXECUTOR instanceof INestableExecutor) {
+ ((INestableExecutor) EXECUTOR).readAndExecute();
+ Thread.yield();
+ } else {
+ throw new IllegalStateException("waitAndExecute called from within a non-nestable executor service!"); //$NON-NLS-1$
+ }
+ }
+ // Check if we are in the UI executor thread
+ else if (isUIExecutorThread()) {
+ // We are in the executor thread. Keep the command dispatching
+ // running.
+ if (UI_EXECUTOR instanceof INestableExecutor) {
+ ((INestableExecutor) UI_EXECUTOR).readAndExecute();
+ Thread.yield();
+ } else {
+ throw new IllegalStateException("waitAndExecute called from within a non-nestable UI executor service!"); //$NON-NLS-1$
+ }
+ }
+ // Check if we have a delegate contribution which is handling
+ // the current thread.
+ else {
+ boolean foundHandlingDelegate = false;
+
+ if (lastDelegate == null) {
+ // Get all registered delegates
+ IExecutorUtilDelegate[] delegates = EXTENSION_POINT_MANAGER.getExecutorUtilDelegates();
+ for (IExecutorUtilDelegate delegate : delegates) {
+ // Does the delegate handles the current thread?
+ if (delegate.isHandledExecutorThread()) {
+ foundHandlingDelegate = true;
+ lastDelegate = delegate;
+ // Read and dispatch one event
+ delegate.readAndDispatch();
+ break;
+ }
+ }
+ } else {
+ foundHandlingDelegate = true;
+ // Read and dispatch one event
+ lastDelegate.readAndDispatch();
+ }
+
+ if (!foundHandlingDelegate) {
+ // Not in any executor thread, put the current thread to sleep
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) { /* ignored on purpose */ }
+ }
+ }
+ }
+
+ // give the condition tester the chance to cleanup
+ if (conditionTester != null) {
+ conditionTester.cleanup();
+ }
+
+ return exitReason;
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/.classpath b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/.classpath
index 2d1a4302f..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.model/.options b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/.options
new file mode 100644
index 000000000..93f91f555
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/.options
@@ -0,0 +1 @@
+org.eclipse.tm.te.runtime.model/debugmode = 0
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/.project b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/.project
index aa11ebd24..d3c870f8a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/.project
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.tm.te.core.persistence</name>
+ <name>org.eclipse.tm.te.runtime.model</name>
<comment></comment>
<projects>
</projects>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/.settings/org.eclipse.jdt.core.prefs
index 20453c431..48ac52c3f 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Sat Aug 06 10:37:03 CEST 2011
+#Mon Oct 03 10:14:43 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.model/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..62eccd344
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.tm.te.runtime.model;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.tm.te.runtime.model.activator.CoreBundleActivator
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.eclipse.tm.te.runtime.model,
+ org.eclipse.tm.te.runtime.model.activator;x-internal:=true,
+ org.eclipse.tm.te.runtime.model.interfaces,
+ org.eclipse.tm.te.runtime.model.nls;x-internal:=true
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.model/build.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/build.properties
new file mode 100644
index 000000000..f4ae97015
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.properties
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.model/plugin.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/plugin.properties
new file mode 100644
index 000000000..49eafce1b
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/plugin.properties
@@ -0,0 +1,12 @@
+##################################################################################
+# Copyright (c) 2011 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
+##################################################################################
+
+pluginName = Target Explorer, Model Runtime plug-in
+providerName = Eclipse.org
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.model/pom.xml b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/pom.xml
new file mode 100644
index 000000000..ab2f3105d
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.tcf</groupId>
+ <artifactId>tcf-parent</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
+ <version>1.0.0.qualifier</version>
+ <artifactId>org.eclipse.tm.te.runtime.model</artifactId>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/ContainerModelNode.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/ContainerModelNode.java
index f8f683dab..0189611d1 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/ContainerModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/ContainerModelNode.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.nodes;
+package org.eclipse.tm.te.runtime.model;
import java.util.ArrayList;
import java.util.EventObject;
@@ -17,9 +17,9 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.tm.te.core.events.EventManager;
-import org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode;
-import org.eclipse.tm.te.core.interfaces.nodes.IModelNode;
+import org.eclipse.tm.te.runtime.events.EventManager;
+import org.eclipse.tm.te.runtime.model.interfaces.IContainerModelNode;
+import org.eclipse.tm.te.runtime.model.interfaces.IModelNode;
/**
* A common (data) model container node implementation.
@@ -47,8 +47,9 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode#getChildren()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode#getChildren()
*/
+ @Override
public IModelNode[] getChildren() {
return internalGetChildren();
}
@@ -72,8 +73,9 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode#getChildren(java.lang.Class)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode#getChildren(java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> List<T> getChildren(Class<T> instanceOf) {
// Create the list that will hold the found children being
@@ -97,8 +99,9 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode#hasChildren()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode#hasChildren()
*/
+ @Override
public boolean hasChildren() {
boolean hasChildren = false;
try { childListLock.lock(); hasChildren = !childList.isEmpty(); } finally { childListLock.unlock(); }
@@ -106,8 +109,9 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode#add(org.eclipse.tm.te.core.interfaces.nodes.IModelNode)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode#add(org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode)
*/
+ @Override
public boolean add(IModelNode node) {
if (node != null) {
try {
@@ -133,8 +137,9 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode#remove(org.eclipse.tm.te.core.interfaces.nodes.IModelNode, boolean)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode#remove(org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode, boolean)
*/
+ @Override
public boolean remove(IModelNode node, boolean recursive) {
if (node instanceof IContainerModelNode && recursive) {
IContainerModelNode container = (IContainerModelNode)node;
@@ -154,8 +159,9 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode#removeAll(java.lang.Class)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode#removeAll(java.lang.Class)
*/
+ @Override
public <T> boolean removeAll(Class<T> nodeType) {
boolean removed = false;
List<T> children;
@@ -177,8 +183,9 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode#clear()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode#clear()
*/
+ @Override
public boolean clear() {
boolean removed = false;
@@ -200,15 +207,17 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode#size()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode#size()
*/
+ @Override
public int size() {
return childList.size();
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode#contains(org.eclipse.tm.te.core.interfaces.nodes.IModelNode)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode#contains(org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode)
*/
+ @Override
public boolean contains(IModelNode node) {
if (node != null) {
try {
@@ -234,7 +243,7 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.nodes.ModelNode#contains(org.eclipse.core.runtime.jobs.ISchedulingRule)
+ * @see org.eclipse.tm.te.runtime.nodes.ModelNode#contains(org.eclipse.core.runtime.jobs.ISchedulingRule)
*/
@Override
public boolean contains(ISchedulingRule rule) {
@@ -262,7 +271,7 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.nodes.ModelNode#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule)
+ * @see org.eclipse.tm.te.runtime.nodes.ModelNode#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule)
*/
@Override
public boolean isConflicting(ISchedulingRule rule) {
@@ -291,7 +300,7 @@ public class ContainerModelNode extends ModelNode implements IContainerModelNode
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.nodes.ModelNode#find(java.util.UUID)
+ * @see org.eclipse.tm.te.runtime.nodes.ModelNode#find(java.util.UUID)
*/
@Override
public IModelNode find(UUID uuid) {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/MessageModelNode.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/MessageModelNode.java
index 7642ffd9e..682f273b5 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/MessageModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/MessageModelNode.java
@@ -7,10 +7,10 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.nodes;
+package org.eclipse.tm.te.runtime.model;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.model.activator.CoreBundleActivator;
/**
* A common (data) model node representing a message.
@@ -69,7 +69,7 @@ public class MessageModelNode extends ModelNode {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.nodes.PropertiesContainer#setProperty(java.lang.String, java.lang.Object)
+ * @see org.eclipse.tm.te.runtime.nodes.PropertiesContainer#setProperty(java.lang.String, java.lang.Object)
*/
@Override
public boolean setProperty(String key, Object value) {
@@ -78,7 +78,7 @@ public class MessageModelNode extends ModelNode {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.nodes.ModelNode#getImageId()
+ * @see org.eclipse.tm.te.runtime.nodes.ModelNode#getImageId()
*/
@Override
public String getImageId() {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/ModelNode.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/ModelNode.java
index 5bc1fc4e0..910f1b642 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/ModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/ModelNode.java
@@ -7,18 +7,19 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.nodes;
+package org.eclipse.tm.te.runtime.model;
import java.util.UUID;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode;
-import org.eclipse.tm.te.core.interfaces.nodes.IModelNode;
-import org.eclipse.tm.te.core.interfaces.nodes.IModelNodeProvider;
-import org.eclipse.tm.te.core.internal.tracing.ITraceIds;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.interfaces.tracing.ITraceIds;
+import org.eclipse.tm.te.runtime.model.interfaces.IContainerModelNode;
+import org.eclipse.tm.te.runtime.model.interfaces.IModelNode;
+import org.eclipse.tm.te.runtime.model.interfaces.IModelNodeProvider;
+import org.eclipse.tm.te.runtime.properties.PropertiesContainer;
/**
* A common (data) model node implementation.
@@ -48,16 +49,18 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#getParent()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#getParent()
*/
+ @Override
public final IContainerModelNode getParent() {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
return parent;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#getParent(java.lang.Class)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#getParent(java.lang.Class)
*/
+ @Override
public final IContainerModelNode getParent(Class<?> nodeType) {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
if (this.parent != null) {
@@ -70,8 +73,9 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#setParent(org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#setParent(org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode)
*/
+ @Override
public final void setParent(IContainerModelNode parent) {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
if (this.parent != null) {
@@ -81,8 +85,9 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#move(org.eclipse.tm.te.core.interfaces.nodes.IContainerModelNode)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#move(org.eclipse.tm.te.runtime.interfaces.nodes.IContainerModelNode)
*/
+ @Override
public final void move(IContainerModelNode newParent) {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
Assert.isNotNull(newParent);
@@ -106,29 +111,32 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#isVisible()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#isVisible()
*/
+ @Override
public boolean isVisible() {
return getBooleanProperty(PROPERTY_IS_VISIBLE);
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#getError()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#getError()
*/
+ @Override
public String getError() {
return getStringProperty(PROPERTY_ERROR);
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#getName()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#getName()
*/
+ @Override
public String getName() {
String name = (String)super.getProperty(PROPERTY_NAME);
return name != null ? name : ""; //$NON-NLS-1$
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.nodes.PropertiesContainer#getProperty(java.lang.String)
+ * @see org.eclipse.tm.te.runtime.nodes.PropertiesContainer#getProperty(java.lang.String)
*/
@Override
public Object getProperty(String key) {
@@ -139,21 +147,23 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#getDescription()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#getDescription()
*/
+ @Override
public String[] getDescription() {
return new String[]{};
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#getImageId()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#getImageId()
*/
+ @Override
public String getImageId() {
return null;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.nodes.PropertiesContainer#toString()
+ * @see org.eclipse.tm.te.runtime.nodes.PropertiesContainer#toString()
*/
@Override
public String toString() {
@@ -167,7 +177,7 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.nodes.PropertiesContainer#dropEvent(java.lang.Object, java.lang.String, java.lang.Object, java.lang.Object)
+ * @see org.eclipse.tm.te.runtime.nodes.PropertiesContainer#dropEvent(java.lang.Object, java.lang.String, java.lang.Object, java.lang.Object)
*/
@Override
protected boolean dropEvent(Object source, String key, Object oldValue, Object newValue) {
@@ -188,8 +198,9 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNodeProvider#getModelNode()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNodeProvider#getModelNode()
*/
+ @Override
public final IModelNode getModelNode() {
return this;
}
@@ -197,6 +208,7 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
/* (non-Javadoc)
* @see org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse.core.runtime.jobs.ISchedulingRule)
*/
+ @Override
public boolean contains(ISchedulingRule rule) {
// We deal only with scheduling rules we know about (as the interface
// declaration of ISchedulingRule#contains requests).
@@ -213,6 +225,7 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
/* (non-Javadoc)
* @see org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule)
*/
+ @Override
public boolean isConflicting(ISchedulingRule rule) {
// We deal only with scheduling rules we know about (as the interface
// declaration of ISchedulingRule#contains requests).
@@ -227,40 +240,45 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#setDirty(boolean)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#setDirty(boolean)
*/
+ @Override
public final void setDirty(boolean dirty) {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
this.dirty = dirty;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#isDirty()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#isDirty()
*/
+ @Override
public final boolean isDirty() {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
return dirty;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#setPending(boolean)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#setPending(boolean)
*/
+ @Override
public final void setPending(boolean pending) {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
this.pending = pending;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#isPending()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#isPending()
*/
+ @Override
public final boolean isPending() {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
return pending;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IModelNode#find(java.util.UUID)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IModelNode#find(java.util.UUID)
*/
+ @Override
public IModelNode find(UUID uuid) {
if (getUUID().equals(uuid)) {
return this;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/PendingOperationModelNode.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/PendingOperationModelNode.java
index e4e8bf23a..d7de627ab 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/PendingOperationModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/PendingOperationModelNode.java
@@ -7,9 +7,9 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.nodes;
+package org.eclipse.tm.te.runtime.model;
-import org.eclipse.tm.te.core.nls.Messages;
+import org.eclipse.tm.te.runtime.model.nls.Messages;
/**
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/activator/CoreBundleActivator.java
new file mode 100644
index 000000000..5538009d3
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/activator/CoreBundleActivator.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.model.activator;
+
+import org.eclipse.tm.te.runtime.tracing.TraceHandler;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class CoreBundleActivator implements BundleActivator {
+ // The bundle context
+ private static BundleContext context;
+ // The trace handler instance
+ private static TraceHandler traceHandler;
+
+ /**
+ * Returns the bundle context
+ *
+ * @return the bundle context
+ */
+ public static BundleContext getContext() {
+ return context;
+ }
+
+ /**
+ * Convenience method which returns the unique identifier of this plugin.
+ */
+ public static String getUniqueIdentifier() {
+ if (getContext() != null && getContext().getBundle() != null) {
+ return getContext().getBundle().getSymbolicName();
+ }
+ return null;
+ }
+
+ /**
+ * Returns the bundles trace handler.
+ *
+ * @return The bundles trace handler.
+ */
+ public static TraceHandler getTraceHandler() {
+ if (traceHandler == null) {
+ traceHandler = new TraceHandler(getUniqueIdentifier());
+ }
+ return traceHandler;
+ }
+
+ /* (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void start(BundleContext bundleContext) throws Exception {
+ CoreBundleActivator.context = bundleContext;
+ }
+
+ /* (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void stop(BundleContext bundleContext) throws Exception {
+ CoreBundleActivator.context = null;
+ }
+
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IContainerModelNode.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/interfaces/IContainerModelNode.java
index bcd1c0095..c5afd1765 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IContainerModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/interfaces/IContainerModelNode.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.interfaces.nodes;
+package org.eclipse.tm.te.runtime.model.interfaces;
import java.util.List;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IModelNode.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/interfaces/IModelNode.java
index bf70774b5..93e596eac 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/interfaces/IModelNode.java
@@ -7,11 +7,12 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.interfaces.nodes;
+package org.eclipse.tm.te.runtime.model.interfaces;
import java.util.UUID;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
/**
* A common (data) model node.
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IModelNodeProvider.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/interfaces/IModelNodeProvider.java
index da4c8af21..64ee3ae77 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IModelNodeProvider.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/interfaces/IModelNodeProvider.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.interfaces.nodes;
+package org.eclipse.tm.te.runtime.model.interfaces;
import org.eclipse.core.runtime.IAdaptable;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/nls/Messages.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/nls/Messages.java
new file mode 100644
index 000000000..955297a79
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/nls/Messages.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.model.nls;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Target Explorer Model Runtime plugin externalized strings management.
+ */
+public class Messages extends NLS {
+
+ // The plug-in resource bundle name
+ private static final String BUNDLE_NAME = "org.eclipse.tm.te.runtime.model.nls.Messages"; //$NON-NLS-1$
+
+ /**
+ * Static constructor.
+ */
+ static {
+ // Load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ // **** Declare externalized string id's down here *****
+
+ public static String PendingOperationModelNode_label;
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/nls/Messages.properties
new file mode 100644
index 000000000..78a70ddeb
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.model/src/org/eclipse/tm/te/runtime/model/nls/Messages.properties
@@ -0,0 +1,6 @@
+#
+# org.eclipse.tm.te.runtime.model
+# Externalized Strings.
+#
+
+PendingOperationModelNode_label=Pending...
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.classpath b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.classpath
new file mode 100644
index 000000000..8a8f1668c
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.project b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.project
new file mode 100644
index 000000000..c11c85f41
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.tm.te.runtime.persistence</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/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..f723c5d88
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,82 @@
+#Mon Oct 03 10:18:08 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..82dd83e0e
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.tm.te.runtime.persistence;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.tm.te.runtime.persistence.activator.CoreBundleActivator
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.eclipse.tm.te.runtime.persistence,
+ org.eclipse.tm.te.runtime.persistence.activator;x-internal:=true,
+ org.eclipse.tm.te.runtime.persistence.interfaces,
+ org.eclipse.tm.te.runtime.persistence.properties
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/build.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/build.properties
new file mode 100644
index 000000000..73a5119ed
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.properties,\
+ plugin.xml
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/plugin.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/plugin.properties
index 6ca2cb314..ef6554b93 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/plugin.properties
@@ -8,7 +8,7 @@
# Wind River Systems - initial API and implementation
##################################################################################
-pluginName = Target Explorer, Persistence Core plug-in
+pluginName = Target Explorer, Persistence Runtime plug-in
providerName = Eclipse.org
# ***** Extension Points *****
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/plugin.xml
new file mode 100644
index 000000000..41e44687d
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/plugin.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+<!-- Extension points -->
+ <extension-point id="delegates" name="%ExtensionPoint.delegates.name" schema="schema/delegates.exsd"/>
+
+<!-- Persistence delegate contributions -->
+ <extension point="org.eclipse.tm.te.runtime.persistence.delegates">
+ <delegate
+ class="org.eclipse.tm.te.runtime.persistence.properties.PropertiesFilePersistenceDelegate"
+ id="org.eclipse.tm.te.runtime.persistence.properties"
+ label="%PropertiesFilePersistenceDelegate.label">
+ </delegate>
+ </extension>
+
+</plugin>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/pom.xml b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/pom.xml
index 6749c1b2f..e9ade5819 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/pom.xml
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/pom.xml
@@ -12,6 +12,6 @@
</parent>
<version>1.0.0.qualifier</version>
- <artifactId>org.eclipse.tm.te.core.persistence</artifactId>
+ <artifactId>org.eclipse.tm.te.runtime.persistence</artifactId>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/schema/delegates.exsd b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/schema/delegates.exsd
index c1d612448..e503a9fb2 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/schema/delegates.exsd
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/schema/delegates.exsd
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.tm.te.persistence.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.tm.te.runtime.persistence" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.tm.te.persistence.core" id="delegates" name="Target Explorer Persistence Delegates"/>
+ <meta.schema plugin="org.eclipse.tm.te.runtime.persistence" id="delegates" name="Target Explorer Persistence Delegates"/>
</appinfo>
<documentation>
This extension point is used to allow the contribution of new Target Explorer persistence delegates.
@@ -75,12 +75,12 @@
<attribute name="class" type="string">
<annotation>
<documentation>
- The class that implements &lt;code&gt;org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tm.te.core.persistence.AbstractPersistenceDelegate&lt;/code&gt;.
+ The class that implements &lt;code&gt;org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tm.te.runtime.persistence.AbstractPersistenceDelegate&lt;/code&gt;.
&lt;p&gt;
The persistence delegate implementation class must be specified either by the class attribute or the class child element!
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.tm.te.core.persistence.AbstractPersistenceDelegate:org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.tm.te.runtime.persistence.AbstractPersistenceDelegate:org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate"/>
</appinfo>
</annotation>
</attribute>
@@ -108,12 +108,12 @@ The persistence delegate implementation class must be specified either by the cl
<attribute name="class" type="string">
<annotation>
<documentation>
- The class that implements &lt;code&gt;org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tm.te.core.persistence.AbstractPersistenceDelegate&lt;/code&gt;.
+ The class that implements &lt;code&gt;org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tm.te.runtime.persistence.AbstractPersistenceDelegate&lt;/code&gt;.
&lt;p&gt;
The persistence delegate implementation class must be specified either by the class attribute or the class child element!
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.tm.te.core.persistence.AbstractPersistenceDelegate:org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.tm.te.runtime.persistence.AbstractPersistenceDelegate:org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate"/>
</appinfo>
</annotation>
</attribute>
@@ -159,10 +159,10 @@ The persistence delegate implementation class must be specified either by the cl
</appinfo>
<documentation>
&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.tm.te.core.persistence.delegates&quot;&gt;
+ &lt;extension point=&quot;org.eclipse.tm.te.runtime.persistence.delegates&quot;&gt;
&lt;delegate
- class=&quot;org.eclipse.tm.te.core.persistence.PropertiesFilePersistenceDelegate&quot;
- id=&quot;org.eclipse.tm.te.core.persistence.properties&quot;&gt;
+ class=&quot;org.eclipse.tm.te.runtime.persistence.PropertiesFilePersistenceDelegate&quot;
+ id=&quot;org.eclipse.tm.te.runtime.persistence.properties&quot;&gt;
&lt;/delegate&gt;
&lt;/extension&gt;
&lt;/pre&gt;
@@ -174,7 +174,7 @@ The persistence delegate implementation class must be specified either by the cl
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
- Plug-ins that want to extend this extension point, the referenced class must implement the &lt;samp&gt;org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate&lt;/samp&gt; interface.
+ Plug-ins that want to extend this extension point, the referenced class must implement the &lt;samp&gt;org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate&lt;/samp&gt; interface.
</documentation>
</annotation>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/AbstractPersistenceDelegate.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/AbstractPersistenceDelegate.java
index e4a112130..e53a9ec6d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/AbstractPersistenceDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/AbstractPersistenceDelegate.java
@@ -7,10 +7,10 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.persistence;
+package org.eclipse.tm.te.runtime.persistence;
-import org.eclipse.tm.te.core.extensions.ExecutableExtension;
-import org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate;
+import org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtension;
/**
* Target Explorer: Abstract persistence delegate implementation.
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/PersistenceDelegateManager.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/PersistenceDelegateManager.java
index 2ddc29aa7..4669fca81 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/PersistenceDelegateManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/PersistenceDelegateManager.java
@@ -7,15 +7,15 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.persistence;
+package org.eclipse.tm.te.runtime.persistence;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.eclipse.tm.te.core.extensions.AbstractExtensionPointManager;
-import org.eclipse.tm.te.core.extensions.ExecutableExtensionProxy;
-import org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate;
+import org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate;
+import org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtensionProxy;
/**
* Target Explorer: Persistence delegate manager implementation.
@@ -44,15 +44,15 @@ public class PersistenceDelegateManager extends AbstractExtensionPointManager<IP
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.extensions.AbstractExtensionPointManager#getExtensionPointId()
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getExtensionPointId()
*/
@Override
protected String getExtensionPointId() {
- return "org.eclipse.tm.te.core.persistence.delegates"; //$NON-NLS-1$
+ return "org.eclipse.tm.te.runtime.persistence.delegates"; //$NON-NLS-1$
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.extensions.AbstractExtensionPointManager#getConfigurationElementName()
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getConfigurationElementName()
*/
@Override
protected String getConfigurationElementName() {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/activator/CoreBundleActivator.java
index d0922dd91..38aeea65b 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/activator/CoreBundleActivator.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.persistence.activator;
+package org.eclipse.tm.te.runtime.persistence.activator;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -42,6 +42,7 @@ public class CoreBundleActivator implements BundleActivator {
* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext bundleContext) throws Exception {
CoreBundleActivator.context = bundleContext;
}
@@ -50,6 +51,7 @@ public class CoreBundleActivator implements BundleActivator {
* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext bundleContext) throws Exception {
CoreBundleActivator.context = null;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/interfaces/IPersistenceDelegate.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/interfaces/IPersistenceDelegate.java
index ba95d8eec..d71fe7dc8 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/interfaces/IPersistenceDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/interfaces/IPersistenceDelegate.java
@@ -7,13 +7,13 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.persistence.interfaces;
+package org.eclipse.tm.te.runtime.persistence.interfaces;
import java.io.IOException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.tm.te.core.interfaces.IExecutableExtension;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.interfaces.extensions.IExecutableExtension;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
/**
* Target Explorer: Persistence delegate API declaration
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/properties/PropertiesFilePersistenceDelegate.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/properties/PropertiesFilePersistenceDelegate.java
index a381a3c3c..246bf641d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.persistence/src/org/eclipse/tm/te/core/persistence/properties/PropertiesFilePersistenceDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.persistence/src/org/eclipse/tm/te/runtime/persistence/properties/PropertiesFilePersistenceDelegate.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.persistence.properties;
+package org.eclipse.tm.te.runtime.persistence.properties;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -27,9 +27,9 @@ import java.util.regex.Pattern;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
-import org.eclipse.tm.te.core.nodes.PropertiesContainer;
-import org.eclipse.tm.te.core.persistence.AbstractPersistenceDelegate;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.persistence.AbstractPersistenceDelegate;
+import org.eclipse.tm.te.runtime.properties.PropertiesContainer;
/**
* Target Explorer: Properties file persistence delegate implementation.
@@ -39,8 +39,9 @@ import org.eclipse.tm.te.core.persistence.AbstractPersistenceDelegate;
public class PropertiesFilePersistenceDelegate extends AbstractPersistenceDelegate {
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate#write(org.eclipse.core.runtime.IPath, org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer)
+ * @see org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate#write(org.eclipse.core.runtime.IPath, org.eclipse.tm.te.runtime.interfaces.nodes.IPropertiesContainer)
*/
+ @Override
public void write(IPath path, IPropertiesContainer data) throws IOException {
Assert.isNotNull(path);
Assert.isNotNull(data);
@@ -66,8 +67,9 @@ public class PropertiesFilePersistenceDelegate extends AbstractPersistenceDelega
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate#delete(org.eclipse.core.runtime.IPath)
+ * @see org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate#delete(org.eclipse.core.runtime.IPath)
*/
+ @Override
public boolean delete(IPath path) throws IOException {
Assert.isNotNull(path);
@@ -85,8 +87,9 @@ public class PropertiesFilePersistenceDelegate extends AbstractPersistenceDelega
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate#read(org.eclipse.core.runtime.IPath)
+ * @see org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate#read(org.eclipse.core.runtime.IPath)
*/
+ @Override
public IPropertiesContainer read(IPath path) throws IOException {
Assert.isNotNull(path);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.classpath b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.classpath
new file mode 100644
index 000000000..8a8f1668c
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/.project b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.project
index 8b3fca050..3bd96ec2d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/.project
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.tm.te.core.statushandler</name>
+ <name>org.eclipse.tm.te.runtime.statushandler</name>
<comment></comment>
<projects>
</projects>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..c2ad63c7c
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,82 @@
+#Mon Oct 03 10:21:11 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..ae2eaa9cb
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.tm.te.runtime.statushandler;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.tm.te.runtime.statushandler.activator.CoreBundleActivator
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.core.expressions;bundle-version="3.4.300",
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.eclipse.tm.te.runtime.statushandler,
+ org.eclipse.tm.te.runtime.statushandler.activator;x-internal:=true,
+ org.eclipse.tm.te.runtime.statushandler.interfaces,
+ org.eclipse.tm.te.runtime.statushandler.internal;x-internal:=true,
+ org.eclipse.tm.te.runtime.statushandler.nls
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/build.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/build.properties
index e35945197..e35945197 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/build.properties
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/build.properties
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/plugin.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/plugin.properties
index 4e5f1d667..3399d316b 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/plugin.properties
@@ -8,7 +8,7 @@
# Wind River Systems - initial API and implementation
##################################################################################
-pluginName = Target Explorer, Status Handler
+pluginName = Target Explorer, Status Handler Runtime plug-in
providerName = Eclipse.org
# ***** Extension Points *****
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/plugin.xml
index 9f405736b..7ab4a47d6 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/plugin.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
+
+<!-- Extension Points -->
<extension-point id="handlers" name="%ExtensionPoint.handlers.name" schema="schema/handlers.exsd"/>
<extension-point id="bindings" name="%ExtensionPoint.handlers.name" schema="schema/bindings.exsd"/>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/pom.xml b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/pom.xml
new file mode 100644
index 000000000..d876dd65a
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.tcf</groupId>
+ <artifactId>tcf-parent</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
+ <version>1.0.0.qualifier</version>
+ <artifactId>org.eclipse.tm.te.runtime.statushandler</artifactId>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/schema/bindings.exsd b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/schema/bindings.exsd
index e0ce2e542..fa47e63d5 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/schema/bindings.exsd
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/schema/bindings.exsd
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.tm.te.core.statushandler" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.tm.te.runtime.statushandler" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.tm.te.core.statushandler" id="bindings" name="%ExtensionPoint.handlers.name"/>
+ <meta.schema plugin="org.eclipse.tm.te.runtime.statushandler" id="bindings" name="%ExtensionPoint.handlers.name"/>
</appinfo>
<documentation>
This extension point is used to declare the Target Explorer status handler bindings.
@@ -74,7 +74,7 @@
The unique id of the referenced status handler.
</documentation>
<appinfo>
- <meta.attribute kind="identifier" basedOn="org.eclipse.tm.te.core.statushandler.handlers/handler/@id"/>
+ <meta.attribute kind="identifier" basedOn="org.eclipse.tm.te.runtime.statushandler.handlers/handler/@id"/>
</appinfo>
</annotation>
</attribute>
@@ -96,7 +96,7 @@
</appinfo>
<documentation>
&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.tm.te.core.statushandler.bindings&quot;&gt;
+ &lt;extension point=&quot;org.eclipse.tm.te.runtime.statushandler.bindings&quot;&gt;
&lt;binding
id=&quot;org.eclipse.tm.te.ui.statushandler.binding.NotificationPopupStatusHandler&quot;
pageId=&quot;org.eclipse.tm.te.ui.statushandler.NotificationPopupStatusHandler&quot;&gt;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/schema/handlers.exsd b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/schema/handlers.exsd
index bde84d302..27a909d9c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/schema/handlers.exsd
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/schema/handlers.exsd
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.tm.te.core.statushandler" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.tm.te.runtime.statushandler" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.tm.te.core.statushandler" id="handlers" name="Target Explorer Status Handler Extension Point"/>
+ <meta.schema plugin="org.eclipse.tm.te.runtime.statushandler" id="handlers" name="Target Explorer Status Handler Extension Point"/>
</appinfo>
<documentation>
This extension point is used to allow the contribution of new Target Explorer status handler.
@@ -75,12 +75,12 @@
<attribute name="class" type="string">
<annotation>
<documentation>
- The class that implements &lt;code&gt;org.eclipse.tm.te.core.statushandler.interfaces.IStatusHandler&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tm.te.core.statushandler.AbstractStatusHandler&lt;/code&gt;.
+ The class that implements &lt;code&gt;org.eclipse.tm.te.runtime.statushandler.interfaces.IStatusHandler&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tm.te.runtime.statushandler.AbstractStatusHandler&lt;/code&gt;.
&lt;p&gt;
The status handler implementation class must be specified either by the class attribute or the class child element!
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.tm.te.core.statushandler.AbstractStatusHandler:org.eclipse.tm.te.core.statushandler.interfaces.IStatusHandler"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.tm.te.runtime.statushandler.AbstractStatusHandler:org.eclipse.tm.te.runtime.statushandler.interfaces.IStatusHandler"/>
</appinfo>
</annotation>
</attribute>
@@ -108,12 +108,12 @@ The status handler implementation class must be specified either by the class at
<attribute name="class" type="string">
<annotation>
<documentation>
- The class that implements &lt;code&gt;org.eclipse.tm.te.core.statushandler.interfaces.IStatusHandler&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tm.te.core.statushandler.AbstractStatusHandler&lt;/code&gt;.
+ The class that implements &lt;code&gt;org.eclipse.tm.te.runtime.statushandler.interfaces.IStatusHandler&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tm.te.runtime.statushandler.AbstractStatusHandler&lt;/code&gt;.
&lt;p&gt;
The status handler implementation class must be specified either by the class attribute or the class child element!
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.tm.te.core.statushandler.AbstractStatusHandler:org.eclipse.tm.te.core.statushandler.interfaces.IStatusHandler"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.tm.te.runtime.statushandler.AbstractStatusHandler:org.eclipse.tm.te.runtime.statushandler.interfaces.IStatusHandler"/>
</appinfo>
</annotation>
</attribute>
@@ -159,7 +159,7 @@ The status handler implementation class must be specified either by the class at
</appinfo>
<documentation>
&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.tm.te.core.statushandler.handlers&quot;&gt;
+ &lt;extension point=&quot;org.eclipse.tm.te.runtime.statushandler.handlers&quot;&gt;
&lt;handler
class=&quot;org.eclipse.tm.te.ui.statushandler.NotificationPopupStatusHandler&quot;
id=&quot;org.eclipse.tm.te.ui.statushandler.NotificationPopupStatusHandler&quot;&gt;
@@ -174,7 +174,7 @@ The status handler implementation class must be specified either by the class at
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
- Plug-ins that want to extend this extension point, the referenced class must implement the &lt;samp&gt;org.eclipse.tm.te.core.statushandler.interfaces.IStatusHandler&lt;/samp&gt; interface.
+ Plug-ins that want to extend this extension point, the referenced class must implement the &lt;samp&gt;org.eclipse.tm.te.runtime.statushandler.interfaces.IStatusHandler&lt;/samp&gt; interface.
</documentation>
</annotation>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/AbstractStatusHandler.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/AbstractStatusHandler.java
index f75b9be1d..dd998e6f9 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/AbstractStatusHandler.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/AbstractStatusHandler.java
@@ -7,10 +7,10 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.statushandler;
+package org.eclipse.tm.te.runtime.statushandler;
-import org.eclipse.tm.te.core.extensions.ExecutableExtension;
-import org.eclipse.tm.te.core.statushandler.interfaces.IStatusHandler;
+import org.eclipse.tm.te.runtime.statushandler.interfaces.IStatusHandler;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtension;
/**
* Target Explorer: Abstract status handler implementation.
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/StatusHandlerManager.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/StatusHandlerManager.java
index 282511d6e..17f9455dd 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/StatusHandlerManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/StatusHandlerManager.java
@@ -7,18 +7,18 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.statushandler;
+package org.eclipse.tm.te.runtime.statushandler;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.tm.te.core.extensions.AbstractExtensionPointManager;
-import org.eclipse.tm.te.core.extensions.ExecutableExtensionProxy;
-import org.eclipse.tm.te.core.statushandler.interfaces.IStatusHandler;
-import org.eclipse.tm.te.core.statushandler.internal.StatusHandlerBinding;
-import org.eclipse.tm.te.core.statushandler.internal.StatusHandlerBindingExtensionPointManager;
+import org.eclipse.tm.te.runtime.statushandler.interfaces.IStatusHandler;
+import org.eclipse.tm.te.runtime.statushandler.internal.StatusHandlerBinding;
+import org.eclipse.tm.te.runtime.statushandler.internal.StatusHandlerBindingExtensionPointManager;
+import org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtensionProxy;
/**
* Target Explorer: Status handler manager implementation.
@@ -47,15 +47,15 @@ public final class StatusHandlerManager extends AbstractExtensionPointManager<IS
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.extensions.AbstractExtensionPointManager#getExtensionPointId()
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getExtensionPointId()
*/
@Override
protected String getExtensionPointId() {
- return "org.eclipse.tm.te.core.statushandler.handlers"; //$NON-NLS-1$
+ return "org.eclipse.tm.te.runtime.statushandler.handlers"; //$NON-NLS-1$
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.extensions.AbstractExtensionPointManager#getConfigurationElementName()
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getConfigurationElementName()
*/
@Override
protected String getConfigurationElementName() {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/activator/CoreBundleActivator.java
index 3e3d01e72..c92d8f248 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/activator/CoreBundleActivator.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.statushandler.activator;
+package org.eclipse.tm.te.runtime.statushandler.activator;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -42,6 +42,7 @@ public class CoreBundleActivator implements BundleActivator {
* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext bundleContext) throws Exception {
CoreBundleActivator.context = bundleContext;
}
@@ -50,6 +51,7 @@ public class CoreBundleActivator implements BundleActivator {
* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext bundleContext) throws Exception {
CoreBundleActivator.context = null;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/interfaces/IStatusHandler.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/interfaces/IStatusHandler.java
index dea732fd1..710e0df89 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/interfaces/IStatusHandler.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/interfaces/IStatusHandler.java
@@ -7,11 +7,11 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.statushandler.interfaces;
+package org.eclipse.tm.te.runtime.statushandler.interfaces;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.tm.te.core.interfaces.IExecutableExtension;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.interfaces.extensions.IExecutableExtension;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
/**
* Target Explorer: Status handler API declaration
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/internal/StatusHandlerBinding.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/internal/StatusHandlerBinding.java
index fb2cb120d..fda512511 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/internal/StatusHandlerBinding.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/internal/StatusHandlerBinding.java
@@ -7,13 +7,13 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.statushandler.internal;
+package org.eclipse.tm.te.runtime.statushandler.internal;
import org.eclipse.core.expressions.Expression;
import org.eclipse.core.expressions.ExpressionConverter;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.tm.te.core.extensions.ExecutableExtension;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtension;
/**
* Target Explorer: Status handler binding implementation.
@@ -25,7 +25,7 @@ public class StatusHandlerBinding extends ExecutableExtension {
private Expression expression;
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.ExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+ * @see org.eclipse.tm.te.runtime.extensions.ExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
*/
@Override
public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/internal/StatusHandlerBindingExtensionPointManager.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/internal/StatusHandlerBindingExtensionPointManager.java
index 5a9a9c6d2..2898d9fd2 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/internal/StatusHandlerBindingExtensionPointManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/internal/StatusHandlerBindingExtensionPointManager.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.statushandler.internal;
+package org.eclipse.tm.te.runtime.statushandler.internal;
import java.util.ArrayList;
import java.util.Collection;
@@ -21,9 +21,9 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.tm.te.core.extensions.AbstractExtensionPointManager;
-import org.eclipse.tm.te.core.extensions.ExecutableExtensionProxy;
-import org.eclipse.tm.te.core.statushandler.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.statushandler.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtensionProxy;
/**
@@ -53,15 +53,15 @@ public class StatusHandlerBindingExtensionPointManager extends AbstractExtension
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.AbstractExtensionPointManager#getExtensionPointId()
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getExtensionPointId()
*/
@Override
protected String getExtensionPointId() {
- return "org.eclipse.tm.te.core.statushandler.bindings"; //$NON-NLS-1$
+ return "org.eclipse.tm.te.runtime.statushandler.bindings"; //$NON-NLS-1$
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.AbstractExtensionPointManager#getConfigurationElementName()
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getConfigurationElementName()
*/
@Override
protected String getConfigurationElementName() {
@@ -69,13 +69,13 @@ public class StatusHandlerBindingExtensionPointManager extends AbstractExtension
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.AbstractExtensionPointManager#doCreateExtensionProxy(org.eclipse.core.runtime.IConfigurationElement)
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#doCreateExtensionProxy(org.eclipse.core.runtime.IConfigurationElement)
*/
@Override
protected ExecutableExtensionProxy<StatusHandlerBinding> doCreateExtensionProxy(IConfigurationElement element) throws CoreException {
return new ExecutableExtensionProxy<StatusHandlerBinding>(element) {
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.ExecutableExtensionProxy#newInstance()
+ * @see org.eclipse.tm.te.runtime.extensions.ExecutableExtensionProxy#newInstance()
*/
@Override
public StatusHandlerBinding newInstance() {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/nls/Messages.java b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/nls/Messages.java
index 7e12b548f..708ffd27a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core.statushandler/src/org/eclipse/tm/te/core/statushandler/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/nls/Messages.java
@@ -7,17 +7,17 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.statushandler.nls;
+package org.eclipse.tm.te.runtime.statushandler.nls;
import org.eclipse.osgi.util.NLS;
/**
- * Target Explorer Status Handler plugin externalized strings management.
+ * Target Explorer Status Handler Runtime plug-in externalized strings management.
*/
public class Messages extends NLS {
// The plug-in resource bundle name
- private static final String BUNDLE_NAME = "org.eclipse.tm.te.core.statushandler.nls.Messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.tm.te.runtime.statushandler.nls.Messages"; //$NON-NLS-1$
/**
* Static constructor.
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/nls/Messages.properties
new file mode 100644
index 000000000..14785571f
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime.statushandler/src/org/eclipse/tm/te/runtime/statushandler/nls/Messages.properties
@@ -0,0 +1,4 @@
+#
+# org.eclipse.tm.te.runtime.statushandler
+# Externalized Strings.
+#
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/.classpath b/target_explorer/plugins/org.eclipse.tm.te.runtime/.classpath
new file mode 100644
index 000000000..8a8f1668c
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/.options b/target_explorer/plugins/org.eclipse.tm.te.runtime/.options
new file mode 100644
index 000000000..5c97ca861
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/.options
@@ -0,0 +1,3 @@
+org.eclipse.tm.te.runtime/debugmode = 0
+org.eclipse.tm.te.runtime/trace/events = false
+org.eclipse.tm.te.runtime/trace/callbacks = false \ No newline at end of file
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/.project b/target_explorer/plugins/org.eclipse.tm.te.runtime/.project
new file mode 100644
index 000000000..192163a1f
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.tm.te.runtime</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/target_explorer/plugins/org.eclipse.tm.te.runtime/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.runtime/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..b8ae268b8
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,82 @@
+#Mon Oct 03 10:12:22 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.runtime/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..a52f1db39
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.tm.te.runtime;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.tm.te.runtime.activator.CoreBundleActivator
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.core.expressions;bundle-version="3.4.300"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.eclipse.tm.te.runtime.activator,
+ org.eclipse.tm.te.runtime.callback,
+ org.eclipse.tm.te.runtime.events,
+ org.eclipse.tm.te.runtime.extensions,
+ org.eclipse.tm.te.runtime.interfaces,
+ org.eclipse.tm.te.runtime.interfaces.callback,
+ org.eclipse.tm.te.runtime.interfaces.events,
+ org.eclipse.tm.te.runtime.interfaces.extensions,
+ org.eclipse.tm.te.runtime.interfaces.properties,
+ org.eclipse.tm.te.runtime.interfaces.tracing,
+ org.eclipse.tm.te.runtime.nls,
+ org.eclipse.tm.te.runtime.preferences,
+ org.eclipse.tm.te.runtime.progress,
+ org.eclipse.tm.te.runtime.properties,
+ org.eclipse.tm.te.runtime.tracing
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/build.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime/build.properties
new file mode 100644
index 000000000..73a5119ed
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.properties,\
+ plugin.xml
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/plugin.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime/plugin.properties
new file mode 100644
index 000000000..9c7916135
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/plugin.properties
@@ -0,0 +1,12 @@
+##################################################################################
+# Copyright (c) 2011 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
+##################################################################################
+
+pluginName = Target Explorer, Runtime plug-in
+providerName = Eclipse.org
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.runtime/plugin.xml
new file mode 100644
index 000000000..4608bc294
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/plugin.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+<!-- Extension points -->
+ <extension-point id="eventListeners" name="Event Listener Contributions" schema="schema/eventListeners.exsd"/>
+
+<!-- Eclipse core expressions property tester -->
+ <extension point="org.eclipse.core.expressions.propertyTesters">
+ <propertyTester
+ class="org.eclipse.tm.te.runtime.internal.PreferencesPropertyTester"
+ id="org.eclipse.tm.te.runtime.PreferencesPropertyTester"
+ namespace="org.eclipse.tm.te.runtime"
+ properties="preference"
+ type="java.lang.Object">
+ </propertyTester>
+
+ <propertyTester
+ class="org.eclipse.tm.te.runtime.internal.PropertiesContainerPropertyTester"
+ id="org.eclipse.tm.te.runtime.PropertiesContainerPropertyTester"
+ namespace="org.eclipse.tm.te.runtime"
+ properties="isProperty"
+ type="org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer">
+ </propertyTester>
+ </extension>
+
+<!-- Event listener contributions -->
+ <extension point="org.eclipse.tm.te.runtime.eventListeners">
+ <eventListener class="org.eclipse.tm.te.runtime.internal.DebugEventListener"/>
+ </extension>
+
+</plugin>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/pom.xml b/target_explorer/plugins/org.eclipse.tm.te.runtime/pom.xml
new file mode 100644
index 000000000..2062c5d7b
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.tcf</groupId>
+ <artifactId>tcf-parent</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
+ <version>1.0.0.qualifier</version>
+ <artifactId>org.eclipse.tm.te.runtime</artifactId>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/schema/eventListeners.exsd b/target_explorer/plugins/org.eclipse.tm.te.runtime/schema/eventListeners.exsd
index 22ec93396..a0db136e1 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/schema/eventListeners.exsd
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/schema/eventListeners.exsd
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.tm.te.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.tm.te.runtime" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.tm.te.core" id="eventListeners" name="Event Listeners"/>
+ <meta.schema plugin="org.eclipse.tm.te.runtime" id="eventListeners" name="Event Listeners"/>
</appinfo>
<documentation>
This extension point is used to contribute event listeners.
@@ -56,10 +56,10 @@
<attribute name="class" type="string" use="required">
<annotation>
<documentation>
- A fully qualified name of the Java class implementing &lt;code&gt;org.eclipse.tm.te.core.interfaces.events.IEventListener&lt;/code&gt;.
+ A fully qualified name of the Java class implementing &lt;code&gt;org.eclipse.tm.te.runtime.interfaces.events.IEventListener&lt;/code&gt;.
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.tm.te.core.interfaces.events.IEventListener"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.tm.te.runtime.interfaces.events.IEventListener"/>
</appinfo>
</annotation>
</attribute>
@@ -134,11 +134,11 @@
The following is an example of this extension point&apos;s usage:
&lt;p&gt;
&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.tm.te.core.eventListeners&quot;&gt;
+ &lt;extension point=&quot;org.eclipse.tm.te.runtime.eventListeners&quot;&gt;
&lt;eventListener
class=&quot;org.eclipse.tm.te.ui.MyEventListener&quot;
forcePluginActivation=&quot;false&quot;&gt;
- &lt;eventType class=&quot;org.eclipse.tme.te.core.events.PropertyChangeEvent&quot;/&gt;
+ &lt;eventType class=&quot;org.eclipse.tme.te.runtime.events.PropertyChangeEvent&quot;/&gt;
&lt;/eventListener&gt;
&lt;/extension&gt;
&lt;/pre&gt;
@@ -150,7 +150,7 @@
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
- The provider of a event listener must implement &lt;samp&gt;org.eclipse.tm.te.core.interfaces.events.IEventListener&lt;/samp&gt;.
+ The provider of a event listener must implement &lt;samp&gt;org.eclipse.tm.te.runtime.interfaces.events.IEventListener&lt;/samp&gt;.
</documentation>
</annotation>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/activator/CoreBundleActivator.java
new file mode 100644
index 000000000..a8ca3f56e
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/activator/CoreBundleActivator.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.activator;
+
+import org.eclipse.tm.te.runtime.tracing.TraceHandler;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class CoreBundleActivator implements BundleActivator {
+ // The bundle context
+ private static BundleContext context;
+ // The trace handler instance
+ private static TraceHandler traceHandler;
+
+ /**
+ * Returns the bundle context
+ *
+ * @return the bundle context
+ */
+ public static BundleContext getContext() {
+ return context;
+ }
+
+ /**
+ * Convenience method which returns the unique identifier of this plugin.
+ */
+ public static String getUniqueIdentifier() {
+ if (getContext() != null && getContext().getBundle() != null) {
+ return getContext().getBundle().getSymbolicName();
+ }
+ return null;
+ }
+
+ /**
+ * Returns the bundles trace handler.
+ *
+ * @return The bundles trace handler.
+ */
+ public static TraceHandler getTraceHandler() {
+ if (traceHandler == null) {
+ traceHandler = new TraceHandler(getUniqueIdentifier());
+ }
+ return traceHandler;
+ }
+
+ /* (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void start(BundleContext bundleContext) throws Exception {
+ CoreBundleActivator.context = bundleContext;
+ }
+
+ /* (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void stop(BundleContext bundleContext) throws Exception {
+ CoreBundleActivator.context = null;
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/callback/Callback.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/callback/Callback.java
index 346a59414..97d5b011a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/callback/Callback.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/callback/Callback.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.callback;
+package org.eclipse.tm.te.runtime.callback;
import java.util.Arrays;
import java.util.List;
@@ -17,11 +17,11 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.interfaces.IConditionTester;
-import org.eclipse.tm.te.core.interfaces.callback.ICallback;
-import org.eclipse.tm.te.core.nodes.PropertiesContainer;
-import org.eclipse.tm.te.core.progress.ProgressHelper;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.interfaces.IConditionTester;
+import org.eclipse.tm.te.runtime.interfaces.callback.ICallback;
+import org.eclipse.tm.te.runtime.progress.ProgressHelper;
+import org.eclipse.tm.te.runtime.properties.PropertiesContainer;
/**
* Default implementation of the <code>ICallback</code> interface.
@@ -63,8 +63,9 @@ public class Callback extends PropertiesContainer implements ICallback {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IConditionTester#isConditionFulfilled()
+ * @see org.eclipse.tm.te.runtime.interfaces.IConditionTester#isConditionFulfilled()
*/
+ @Override
public boolean isConditionFulfilled() {
if (monitor == null) {
return callback.isDone();
@@ -73,8 +74,9 @@ public class Callback extends PropertiesContainer implements ICallback {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IConditionTester#cleanup()
+ * @see org.eclipse.tm.te.runtime.interfaces.IConditionTester#cleanup()
*/
+ @Override
public void cleanup() {
}
}
@@ -137,8 +139,9 @@ public class Callback extends PropertiesContainer implements ICallback {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.callback.ICallback#done(java.lang.Object, org.eclipse.core.runtime.IStatus)
+ * @see org.eclipse.tm.te.runtime.interfaces.callback.ICallback#done(java.lang.Object, org.eclipse.core.runtime.IStatus)
*/
+ @Override
public final void done(Object caller, IStatus status) {
assert status != null;
@@ -270,15 +273,17 @@ public class Callback extends PropertiesContainer implements ICallback {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.callback.ICallback#isDone()
+ * @see org.eclipse.tm.te.runtime.interfaces.callback.ICallback#isDone()
*/
+ @Override
public final boolean isDone() {
return getBooleanProperty(PROPERTY_IS_DONE);
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.callback.ICallback#addParentCallback(org.eclipse.tm.te.core.interfaces.callback.ICallback)
+ * @see org.eclipse.tm.te.runtime.interfaces.callback.ICallback#addParentCallback(org.eclipse.tm.te.runtime.interfaces.callback.ICallback)
*/
+ @Override
public void addParentCallback(ICallback callback) {
if (getProperty(PROPERTY_PARENT_CALLBACK) instanceof ICallback) {
ICallback parentCallback = (ICallback) getProperty(PROPERTY_PARENT_CALLBACK);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/events/EventManager.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/events/EventManager.java
index 2fec1dc71..d38686eee 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/events/EventManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/events/EventManager.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.events;
+package org.eclipse.tm.te.runtime.events;
import java.util.ArrayList;
import java.util.EventListener;
@@ -20,10 +20,10 @@ import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.interfaces.events.IEventFireDelegate;
-import org.eclipse.tm.te.core.interfaces.events.IEventListener;
-import org.eclipse.tm.te.core.internal.tracing.ITraceIds;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.interfaces.events.IEventFireDelegate;
+import org.eclipse.tm.te.runtime.interfaces.events.IEventListener;
+import org.eclipse.tm.te.runtime.interfaces.tracing.ITraceIds;
import org.osgi.framework.Bundle;
@@ -59,6 +59,7 @@ public final class EventManager {
/* (non-Javadoc)
* @see java.lang.Runnable#run()
*/
+ @Override
public void run() {
listener.eventFired(event);
}
@@ -335,7 +336,7 @@ public final class EventManager {
* Register change listeners defined by extension.
*/
private void addExtensionPointNotificationListeners() {
- IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.tm.te.core.eventListeners"); //$NON-NLS-1$
+ IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.tm.te.runtime.eventListeners"); //$NON-NLS-1$
if (ep != null) {
IExtension[] extensions = ep.getExtensions();
if (extensions != null && extensions.length > 0) {
@@ -494,8 +495,9 @@ public final class EventManager {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.events.IEventListener#eventFired(java.util.EventObject)
+ * @see org.eclipse.tm.te.runtime.interfaces.events.IEventListener#eventFired(java.util.EventObject)
*/
+ @Override
public void eventFired(EventObject event) {
Assert.isNotNull(event);
// Get the delegate (may force instantiation)
@@ -505,8 +507,9 @@ public final class EventManager {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.events.IEventFireDelegate#fire(java.lang.Runnable)
+ * @see org.eclipse.tm.te.runtime.interfaces.events.IEventFireDelegate#fire(java.lang.Runnable)
*/
+ @Override
public void fire(Runnable runnable) {
Assert.isNotNull(runnable);
// Pass on to the delegate if the delegate itself is an fire delegate,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/events/PropertyChangeEvent.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/events/PropertyChangeEvent.java
index 947390d07..8f79ea0f9 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/events/PropertyChangeEvent.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/events/PropertyChangeEvent.java
@@ -7,12 +7,12 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.events;
+package org.eclipse.tm.te.runtime.events;
import java.util.EventObject;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.internal.tracing.ITraceIds;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.interfaces.tracing.ITraceIds;
/**
* Property change event implementation.
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/extensions/AbstractExtensionPointManager.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/extensions/AbstractExtensionPointManager.java
index 40b36b8fa..1c0bc7554 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/extensions/AbstractExtensionPointManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/extensions/AbstractExtensionPointManager.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.extensions;
+package org.eclipse.tm.te.runtime.extensions;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.nls.Messages;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.nls.Messages;
/**
* Target Explorer: Abstract extension point manager implementation.
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/extensions/ExecutableExtension.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/extensions/ExecutableExtension.java
index 52d643c5f..7d789d6b6 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/extensions/ExecutableExtension.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/extensions/ExecutableExtension.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.extensions;
+package org.eclipse.tm.te.runtime.extensions;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
@@ -16,9 +16,9 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.PlatformObject;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.interfaces.IExecutableExtension;
-import org.eclipse.tm.te.core.nls.Messages;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.interfaces.extensions.IExecutableExtension;
+import org.eclipse.tm.te.runtime.nls.Messages;
/**
* Target Explorer: Executable extension implementation.
@@ -44,6 +44,7 @@ public class ExecutableExtension extends PlatformObject implements IExecutableEx
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
*/
+ @Override
public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
// Remember the configuration element
configElement = config;
@@ -77,8 +78,9 @@ public class ExecutableExtension extends PlatformObject implements IExecutableEx
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IExecutableExtension#getId()
+ * @see org.eclipse.tm.te.runtime.interfaces.extensions.IExecutableExtension#getId()
*/
+ @Override
public String getId() {
return id;
}
@@ -95,8 +97,9 @@ public class ExecutableExtension extends PlatformObject implements IExecutableEx
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IExecutableExtension#getLabel()
+ * @see org.eclipse.tm.te.runtime.interfaces.extensions.IExecutableExtension#getLabel()
*/
+ @Override
public String getLabel() {
// Try the "label" attribute first
String label = configElement != null ? configElement.getAttribute("label") : null; //$NON-NLS-1$
@@ -108,8 +111,9 @@ public class ExecutableExtension extends PlatformObject implements IExecutableEx
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IExecutableExtension#getDescription()
+ * @see org.eclipse.tm.te.runtime.interfaces.extensions.IExecutableExtension#getDescription()
*/
+ @Override
public String getDescription() {
// Read the description text from the "<description>" child element
IConfigurationElement[] children = configElement != null ? configElement.getChildren("description") : null; //$NON-NLS-1$
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/extensions/ExecutableExtensionProxy.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/extensions/ExecutableExtensionProxy.java
index c7614680a..d6cfe1330 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/extensions/ExecutableExtensionProxy.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/extensions/ExecutableExtensionProxy.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.extensions;
+package org.eclipse.tm.te.runtime.extensions;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
@@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.nls.Messages;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.nls.Messages;
/**
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/IConditionTester.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/IConditionTester.java
index 79fb7e27b..4b200a9ff 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/IConditionTester.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/IConditionTester.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.interfaces;
+package org.eclipse.tm.te.runtime.interfaces;
/**
* This interface must be implemented by callers of the executors utilities
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/callback/ICallback.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/callback/ICallback.java
index c0f26d2b9..ce0d9855e 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/callback/ICallback.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/callback/ICallback.java
@@ -7,12 +7,12 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.interfaces.callback;
+package org.eclipse.tm.te.runtime.interfaces.callback;
import javax.security.auth.callback.Callback;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
/**
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/events/IEventFireDelegate.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/events/IEventFireDelegate.java
index 7d2b9f02e..3eb6d5938 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/events/IEventFireDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/events/IEventFireDelegate.java
@@ -8,7 +8,7 @@
* of this software may be licensed only pursuant to the terms
* of an applicable Wind River license agreement.
*/
-package org.eclipse.tm.te.core.interfaces.events;
+package org.eclipse.tm.te.runtime.interfaces.events;
/**
* Common interface for notification fire delegate listeners.<br>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/events/IEventListener.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/events/IEventListener.java
index 05adff799..c5c9135f7 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/events/IEventListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/events/IEventListener.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.interfaces.events;
+package org.eclipse.tm.te.runtime.interfaces.events;
import java.util.EventListener;
import java.util.EventObject;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/IExecutableExtension.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/extensions/IExecutableExtension.java
index be11a4a61..56773775b 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/IExecutableExtension.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/extensions/IExecutableExtension.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.interfaces;
+package org.eclipse.tm.te.runtime.interfaces.extensions;
/**
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IPropertiesContainer.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/properties/IPropertiesContainer.java
index cf7fcb764..cc4a2b8af 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/interfaces/nodes/IPropertiesContainer.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/properties/IPropertiesContainer.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.interfaces.nodes;
+package org.eclipse.tm.te.runtime.interfaces.properties;
import java.util.Map;
import java.util.UUID;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/tracing/ITraceIds.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/tracing/ITraceIds.java
index 849e13995..b613177d5 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/tracing/ITraceIds.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/interfaces/tracing/ITraceIds.java
@@ -7,10 +7,10 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.internal.tracing;
+package org.eclipse.tm.te.runtime.interfaces.tracing;
/**
- * Target Explorer: Core plug-in trace slot identifiers.
+ * Target Explorer: Runtime plug-in trace slot identifiers.
*/
public interface ITraceIds {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/DebugEventListener.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/internal/DebugEventListener.java
index 1c0eddf2e..ca4b43121 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/DebugEventListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/internal/DebugEventListener.java
@@ -7,14 +7,14 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.internal;
+package org.eclipse.tm.te.runtime.internal;
import java.util.EventObject;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.interfaces.events.IEventListener;
-import org.eclipse.tm.te.core.internal.tracing.ITraceIds;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.interfaces.events.IEventListener;
+import org.eclipse.tm.te.runtime.interfaces.tracing.ITraceIds;
/**
* Event listener for internal debugging purpose.
@@ -22,8 +22,9 @@ import org.eclipse.tm.te.core.internal.tracing.ITraceIds;
public class DebugEventListener implements IEventListener {
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.events.IEventListener#eventFired(java.util.EventObject)
+ * @see org.eclipse.tm.te.runtime.interfaces.events.IEventListener#eventFired(java.util.EventObject)
*/
+ @Override
public void eventFired(EventObject event) {
if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITraceIds.TRACE_EVENTS))
CoreBundleActivator.getTraceHandler().trace("thread=[" + Thread.currentThread().getName() + "]\n\t" + event.toString(), //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/PreferencesPropertyTester.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/internal/PreferencesPropertyTester.java
index ee61b32e1..a119f4e9f 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/PreferencesPropertyTester.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/internal/PreferencesPropertyTester.java
@@ -3,16 +3,16 @@
* 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.te.core.internal;
+package org.eclipse.tm.te.runtime.internal;
import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.preferences.ScopedEclipsePreferences;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.preferences.ScopedEclipsePreferences;
/**
* Preferences property tester implementation.
@@ -22,6 +22,7 @@ public class PreferencesPropertyTester extends PropertyTester {
/* (non-Javadoc)
* @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
*/
+ @Override
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
// The preferences property tester is not extending a specific object type.
// The tester ignores the given receiver object.
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/PropertiesContainerPropertyTester.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/internal/PropertiesContainerPropertyTester.java
index 0b0e8fe60..bfbc8ae6e 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/internal/PropertiesContainerPropertyTester.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/internal/PropertiesContainerPropertyTester.java
@@ -7,10 +7,10 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.internal;
+package org.eclipse.tm.te.runtime.internal;
import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
/**
* Property tester implementation for objects of type {@link IPropertiesContainer}.
@@ -20,6 +20,7 @@ public class PropertiesContainerPropertyTester extends PropertyTester {
/* (non-Javadoc)
* @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
*/
+ @Override
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
// The receiver is expected to be a properties container
if (receiver instanceof IPropertiesContainer) {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/nls/Messages.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/nls/Messages.java
new file mode 100644
index 000000000..7763b0a82
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/nls/Messages.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.runtime.nls;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Target Explorer Runtime plugin externalized strings management.
+ */
+public class Messages extends NLS {
+
+ // The plug-in resource bundle name
+ private static final String BUNDLE_NAME = "org.eclipse.tm.te.runtime.nls.Messages"; //$NON-NLS-1$
+
+ /**
+ * Static constructor.
+ */
+ static {
+ // Load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ // **** Declare externalized string id's down here *****
+
+ public static String Extension_error_missingRequiredAttribute;
+ public static String Extension_error_duplicateExtension;
+ public static String Extension_error_invalidExtensionPoint;
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/nls/Messages.properties
new file mode 100644
index 000000000..0867746ba
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/nls/Messages.properties
@@ -0,0 +1,8 @@
+#
+# org.eclipse.tm.te.runtime
+# Externalized Strings.
+#
+
+Extension_error_missingRequiredAttribute=Required attribute "{0}" missing for extension "{1}"!
+Extension_error_duplicateExtension=Duplicate extension with id ''{0}''. Ignoring duplicated contribution from contributor ''{1}''!
+Extension_error_invalidExtensionPoint=Failed to instantiate the executable extension from extension point ''{0}''.
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/preferences/ScopedEclipsePreferences.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/preferences/ScopedEclipsePreferences.java
index 13dcf3e06..7d3c9ff20 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/preferences/ScopedEclipsePreferences.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/preferences/ScopedEclipsePreferences.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.preferences;
+package org.eclipse.tm.te.runtime.preferences;
import java.io.OutputStream;
import java.util.Map;
@@ -109,12 +109,14 @@ public class ScopedEclipsePreferences {
/* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.IPreferenceFilter#getScopes()
*/
+ @Override
public String[] getScopes() {
return new String[] { InstanceScope.SCOPE };
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.IPreferenceFilter#getMapping(java.lang.String)
*/
+ @Override
public Map getMapping(String scope) {
return null;
}
@@ -440,10 +442,12 @@ public class ScopedEclipsePreferences {
for (int i = 0; i < l.length; i++) {
final IPreferenceChangeListener listener = (IPreferenceChangeListener) l[i];
ISafeRunnable job = new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// already logged in Platform#run()
}
+ @Override
public void run() throws Exception {
listener.preferenceChange(event);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/progress/ProgressHelper.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/progress/ProgressHelper.java
index f7d588aa9..26fdaafb4 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/progress/ProgressHelper.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/progress/ProgressHelper.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.progress;
+package org.eclipse.tm.te.runtime.progress;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -16,10 +16,10 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.callback.Callback;
-import org.eclipse.tm.te.core.interfaces.callback.ICallback;
-import org.eclipse.tm.te.core.internal.tracing.ITraceIds;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.callback.Callback;
+import org.eclipse.tm.te.runtime.interfaces.callback.ICallback;
+import org.eclipse.tm.te.runtime.interfaces.tracing.ITraceIds;
/**
* Helper implementation to deal with progress monitors and callbacks.
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/PropertiesContainer.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/properties/PropertiesContainer.java
index 76db971cc..675de2c8c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/nodes/PropertiesContainer.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/properties/PropertiesContainer.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.nodes;
+package org.eclipse.tm.te.runtime.properties;
import java.util.Collections;
import java.util.EventObject;
@@ -19,11 +19,11 @@ import java.util.UUID;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.tm.te.core.activator.CoreBundleActivator;
-import org.eclipse.tm.te.core.events.EventManager;
-import org.eclipse.tm.te.core.events.PropertyChangeEvent;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
-import org.eclipse.tm.te.core.internal.tracing.ITraceIds;
+import org.eclipse.tm.te.runtime.activator.CoreBundleActivator;
+import org.eclipse.tm.te.runtime.events.EventManager;
+import org.eclipse.tm.te.runtime.events.PropertyChangeEvent;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.interfaces.tracing.ITraceIds;
/**
* A generic properties container implementation.
@@ -66,8 +66,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#getUUID()
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#getUUID()
*/
+ @Override
public final UUID getUUID() {
return uniqueId;
}
@@ -125,8 +126,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer#setChangeEventsEnabled(boolean)
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IPropertiesContainer#setChangeEventsEnabled(boolean)
*/
+ @Override
public final boolean setChangeEventsEnabled(boolean enabled) {
boolean changed = changeEventsEnabled != enabled;
if (changed) changeEventsEnabled = enabled;
@@ -134,8 +136,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer#changeEventsEnabled()
+ * @see org.eclipse.tm.te.runtime.interfaces.nodes.IPropertiesContainer#changeEventsEnabled()
*/
+ @Override
public final boolean changeEventsEnabled() {
return changeEventsEnabled;
}
@@ -224,24 +227,27 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#getProperties()
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#getProperties()
*/
+ @Override
public Map<String, Object> getProperties() {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
return Collections.unmodifiableMap(new HashMap<String, Object>(properties));
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#getProperty(java.lang.String)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#getProperty(java.lang.String)
*/
+ @Override
public Object getProperty(String key) {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
return properties.get(key);
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#getBooleanProperty(java.lang.String)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#getBooleanProperty(java.lang.String)
*/
+ @Override
public final boolean getBooleanProperty(String key) {
Object value = getProperty(key);
if (value instanceof Boolean) {
@@ -256,8 +262,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#getLongProperty(java.lang.String)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#getLongProperty(java.lang.String)
*/
+ @Override
public final long getLongProperty(String key) {
Object value = getProperty(key);
if (value instanceof Long) {
@@ -276,8 +283,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#getIntProperty(java.lang.String)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#getIntProperty(java.lang.String)
*/
+ @Override
public final int getIntProperty(String key) {
Object value = getProperty(key);
try {
@@ -290,8 +298,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#getStringProperty(java.lang.String)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#getStringProperty(java.lang.String)
*/
+ @Override
public final String getStringProperty(String key) {
Object value = getProperty(key);
return value instanceof String ? (String)value :
@@ -299,8 +308,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#getFloatProperty(java.lang.String)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#getFloatProperty(java.lang.String)
*/
+ @Override
public final float getFloatProperty(String key) {
Object value = getProperty(key);
try {
@@ -313,8 +323,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#getDoubleProperty(java.lang.String)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#getDoubleProperty(java.lang.String)
*/
+ @Override
public final double getDoubleProperty(String key) {
Object value = getProperty(key);
try {
@@ -328,8 +339,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#setProperties(java.util.Map)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#setProperties(java.util.Map)
*/
+ @Override
public final void setProperties(Map<String, Object> properties) {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
Assert.isNotNull(properties);
@@ -342,8 +354,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#setProperty(java.lang.String, boolean)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#setProperty(java.lang.String, boolean)
*/
+ @Override
public final boolean setProperty(String key, boolean value) {
boolean oldValue = getBooleanProperty(key);
if (oldValue != value) {
@@ -353,8 +366,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#setProperty(java.lang.String, long)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#setProperty(java.lang.String, long)
*/
+ @Override
public final boolean setProperty(String key, long value) {
long oldValue = getLongProperty(key);
if (oldValue != value) {
@@ -364,8 +378,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#setProperty(java.lang.String, int)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#setProperty(java.lang.String, int)
*/
+ @Override
public final boolean setProperty(String key, int value) {
int oldValue = getIntProperty(key);
if (oldValue != value) {
@@ -375,8 +390,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#setProperty(java.lang.String, float)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#setProperty(java.lang.String, float)
*/
+ @Override
public final boolean setProperty(String key, float value) {
float oldValue = getFloatProperty(key);
if (oldValue != value) {
@@ -386,8 +402,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#setProperty(java.lang.String, double)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#setProperty(java.lang.String, double)
*/
+ @Override
public final boolean setProperty(String key, double value) {
double oldValue = getDoubleProperty(key);
if (oldValue != value) {
@@ -397,8 +414,9 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#setProperty(java.lang.String, java.lang.Object)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#setProperty(java.lang.String, java.lang.Object)
*/
+ @Override
public boolean setProperty(String key, Object value) {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
Assert.isNotNull(key);
@@ -418,59 +436,67 @@ public class PropertiesContainer extends PlatformObject implements IPropertiesCo
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#clearProperties()
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#clearProperties()
*/
+ @Override
public final void clearProperties() {
Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$
properties.clear();
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#isProperty(java.lang.String, long)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#isProperty(java.lang.String, long)
*/
+ @Override
public final boolean isProperty(String key, long value) {
return getLongProperty(key) == value;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#isProperty(java.lang.String, boolean)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#isProperty(java.lang.String, boolean)
*/
+ @Override
public final boolean isProperty(String key, boolean value) {
return getBooleanProperty(key) == value;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#isProperty(java.lang.String, int)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#isProperty(java.lang.String, int)
*/
+ @Override
public final boolean isProperty(String key, int value) {
return getIntProperty(key) == value;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#isProperty(java.lang.String, float)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#isProperty(java.lang.String, float)
*/
+ @Override
public final boolean isProperty(String key, float value) {
return getFloatProperty(key) == value;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#isProperty(java.lang.String, double)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#isProperty(java.lang.String, double)
*/
+ @Override
public final boolean isProperty(String key, double value) {
return getDoubleProperty(key) == value;
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#isPropertyIgnoreCase(java.lang.String, java.lang.String)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#isPropertyIgnoreCase(java.lang.String, java.lang.String)
*/
+ @Override
public final boolean isPropertyIgnoreCase(String key, String value) {
String property = getStringProperty(key);
return (property == null && value == null) || (property != null && property.equalsIgnoreCase(value));
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.IPropertiesContainer#isProperty(java.lang.String, java.lang.Object)
+ * @see org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer#isProperty(java.lang.String, java.lang.Object)
*/
+ @Override
public final boolean isProperty(String key, Object value) {
Object property = getProperty(key);
return (property == null && value == null) || (property != null && property.equals(value));
diff --git a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/tracing/TraceHandler.java b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/tracing/TraceHandler.java
index f50081ba0..b322c4585 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.core/src/org/eclipse/tm/te/core/tracing/TraceHandler.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.runtime/src/org/eclipse/tm/te/runtime/tracing/TraceHandler.java
@@ -7,7 +7,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
-package org.eclipse.tm.te.core.tracing;
+package org.eclipse.tm.te.runtime.tracing;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/.classpath b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/.classpath
index 64c5e31b7..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/.settings/org.eclipse.jdt.core.prefs
index aa23f5f68..7053b194e 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,82 +1,82 @@
-#Thu Mar 17 14:57:00 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+#Mon Oct 03 10:23:50 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/META-INF/MANIFEST.MF
index cd491a139..2b1b09c8f 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.tm.te.tcf.core.activator.CoreBundleActivator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.tm.tcf.core;bundle-version="0.5.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.tcf.core,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/Tcf.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/Tcf.java
index 2a8c63c4a..dd59470aa 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/Tcf.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/Tcf.java
@@ -196,6 +196,7 @@ public final class Tcf {
final IProtocolStateChangeListener[] listeners = tcf.protocolStateChangeListeners.toArray(new IProtocolStateChangeListener[tcf.protocolStateChangeListeners.size()]);
if (listeners.length > 0) {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
for (IProtocolStateChangeListener listener : listeners) {
listener.stateChanged(true);
@@ -231,6 +232,7 @@ public final class Tcf {
// Catch IllegalStateException: TCF event dispatcher might have been shut down already
try {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
for (IProtocolStateChangeListener listener : listeners) {
listener.stateChanged(false);
@@ -254,6 +256,7 @@ public final class Tcf {
Assert.isNotNull(tcf);
runSafe(new Runnable() {
+ @Override
public void run() {
Assert.isTrue(Protocol.isDispatchThread());
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/activator/CoreBundleActivator.java
index d4b0a2f2e..eb00a7ff3 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/activator/CoreBundleActivator.java
@@ -3,7 +3,7 @@
* 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
*******************************************************************************/
@@ -43,6 +43,7 @@ public class CoreBundleActivator implements BundleActivator {
/* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext bundleContext) throws Exception {
CoreBundleActivator.context = bundleContext;
}
@@ -50,6 +51,7 @@ public class CoreBundleActivator implements BundleActivator {
/* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext bundleContext) throws Exception {
CoreBundleActivator.context = null;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/ChannelManager.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/ChannelManager.java
index 15d7f8504..80fb53861 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/ChannelManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/ChannelManager.java
@@ -36,11 +36,13 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.core.interfaces.IChannelManager#openChannel(org.eclipse.tm.tcf.protocol.IPeer, org.eclipse.tm.te.tcf.core.interfaces.IChannelManager.DoneOpenChannel)
*/
+ @Override
public void openChannel(final IPeer peer, final DoneOpenChannel done) {
if (Protocol.isDispatchThread()) {
internalOpenChannel(peer, done);
} else {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
internalOpenChannel(peer, done);
}
@@ -67,6 +69,7 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
if (channel != null) {
channel.addChannelListener(new IChannel.IChannelListener() {
+ @Override
public void onChannelOpened() {
// Remove ourself as listener from the channel
channel.removeChannelListener(this);
@@ -74,6 +77,7 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
done.doneOpenChannel(null, channel);
}
+ @Override
public void onChannelClosed(Throwable error) {
// Remove ourself as listener from the channel
channel.removeChannelListener(this);
@@ -81,6 +85,7 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
done.doneOpenChannel(error, channel);
}
+ @Override
public void congestionLevel(int level) {
// ignored
}
@@ -95,11 +100,13 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.core.interfaces.IChannelManager#openChannel(java.util.Map, org.eclipse.tm.te.tcf.core.interfaces.IChannelManager.DoneOpenChannel)
*/
+ @Override
public void openChannel(final Map<String, String> peerAttributes, final DoneOpenChannel done) {
if (Protocol.isDispatchThread()) {
internalOpenChannel(peerAttributes, done);
} else {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
internalOpenChannel(peerAttributes, done);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/Startup.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/Startup.java
index b72727cd5..3927b4786 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/Startup.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/Startup.java
@@ -35,6 +35,7 @@ public class Startup {
// runnable to execute and be invoked once the framework
// is fully up and usable.
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
// Core framework is scheduling the runnables, means it is started.
setStarted(true);
@@ -56,6 +57,7 @@ public class Startup {
// Catch IllegalStateException: TCF event dispatcher has shut down
try {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
if (STARTED.get()) Tcf.start(); else Tcf.stop();
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/listener/InternalChannelListener.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/listener/InternalChannelListener.java
index 78b6e93a6..585a0b992 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/listener/InternalChannelListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/listener/InternalChannelListener.java
@@ -48,12 +48,14 @@ public class InternalChannelListener implements IChannel.IChannelListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.protocol.IChannel.IChannelListener#congestionLevel(int)
*/
+ @Override
public void congestionLevel(int level) {
}
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.protocol.IChannel.IChannelListener#onChannelClosed(java.lang.Throwable)
*/
+ @Override
public void onChannelClosed(Throwable error) {
Assert.isTrue(Protocol.isDispatchThread());
@@ -92,6 +94,7 @@ public class InternalChannelListener implements IChannel.IChannelListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.protocol.IChannel.IChannelListener#onChannelOpened()
*/
+ @Override
public void onChannelOpened() {
}
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/listener/InternalChannelOpenListener.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/listener/InternalChannelOpenListener.java
index 4b07a11ab..ed8855580 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/listener/InternalChannelOpenListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.core/src/org/eclipse/tm/te/tcf/core/internal/listener/InternalChannelOpenListener.java
@@ -33,6 +33,7 @@ public class InternalChannelOpenListener implements IChannelOpenListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.protocol.Protocol.ChannelOpenListener#onChannelOpen(org.eclipse.tm.tcf.protocol.IChannel)
*/
+ @Override
public void onChannelOpen(IChannel channel) {
Assert.isNotNull(channel);
Assert.isTrue(Protocol.isDispatchThread());
@@ -57,6 +58,7 @@ public class InternalChannelOpenListener implements IChannelOpenListener {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.core.internal.interfaces.IChannelOpenListener#setChannelListener(org.eclipse.tm.tcf.protocol.IChannel, org.eclipse.tm.tcf.protocol.IChannel.IChannelListener)
*/
+ @Override
public void setChannelListener(IChannel channel, IChannelListener listener) {
Assert.isNotNull(channel);
if (listener != null) channelListeners.put(channel, listener);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/.classpath b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/.classpath
index 64c5e31b7..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/.settings/org.eclipse.jdt.core.prefs
index cd7a916c6..0788181a4 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/.settings/org.eclipse.jdt.core.prefs
@@ -1,82 +1,82 @@
-#Wed Apr 06 15:35:33 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+#Mon Oct 03 10:25:04 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/META-INF/MANIFEST.MF
index 34e9212c6..072f96b99 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.filesystem;bundle-version="1.3.100",
org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.core.expressions;bundle-version="3.4.300"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.tcf.filesystem.activator;x-internal:=true,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/plugin.xml
index ea71283ee..6efc5e071 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/plugin.xml
@@ -76,7 +76,7 @@
<test property="org.eclipse.tm.te.tcf.locator.hasRemoteService" value="FileSystem"/>
</adapt>
<test
- property="org.eclipse.tm.te.core.preference"
+ property="org.eclipse.tm.te.runtime.preference"
args="bundleId=org.eclipse.tm.te.tcf.filesystem,key=tcf.filesystem.core.feature.editor.content.enable"
value="true">
</test>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeContentProvider.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeContentProvider.java
index e37d8d015..d35287e12 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeContentProvider.java
@@ -56,6 +56,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
this.viewer = viewer;
}
@@ -63,6 +64,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
model.dispose();
}
@@ -76,6 +78,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
channel.close();
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
channel.close();
}
@@ -87,6 +90,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return getChildren(inputElement);
}
@@ -94,6 +98,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
*/
+ @Override
public Object getParent(Object element) {
if (element instanceof FSTreeNode) {
FSTreeNode parent = ((FSTreeNode)element).parent;
@@ -109,6 +114,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
*/
+ @Override
public Object[] getChildren(Object parentElement) {
Assert.isNotNull(parentElement);
@@ -125,6 +131,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
root[0] = model.getRoot(peerId);
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
root[0] = model.getRoot(peerId);
}
@@ -137,6 +144,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
IPeer peer = peerNode.getPeer();
final int[] state = new int[1];
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
state[0] = peerNode.getIntProperty(IPeerModelProperties.PROP_STATE);
}
@@ -146,6 +154,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
// Create the root node and the initial pending node.
// This must happen in the TCF dispatch thread.
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
// The root node
FSTreeNode rootNode = new FSTreeNode();
@@ -170,6 +179,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
children = candidates.toArray();
Tcf.getChannelManager().openChannel(peer, new IChannelManager.DoneOpenChannel() {
+ @Override
public void doneOpenChannel(final Throwable error, final IChannel channel) {
Assert.isTrue(Protocol.isDispatchThread());
@@ -178,8 +188,10 @@ public class FSTreeContentProvider implements ITreeContentProvider {
if (service != null) {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
service.roots(new IFileSystem.DoneRoots() {
+ @Override
public void doneRoots(IToken token, FileSystemException error, DirEntry[] entries) {
// Close the channel, not needed anymore
closeOpenChannel(channel);
@@ -212,6 +224,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
}
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
if (viewer != null) viewer.refresh();
}
@@ -222,6 +235,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
});
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
if (viewer != null) viewer.refresh();
}
@@ -240,6 +254,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
// This must happen in the TCF dispatch thread.
final List<FSTreeNode> candidates = new ArrayList<FSTreeNode>();
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
candidates.addAll(root[0].getChildren());
}
@@ -253,6 +268,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
// This must happen in the TCF dispatch thread.
final List<FSTreeNode> candidates = new ArrayList<FSTreeNode>();
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
candidates.addAll(node.getChildren());
}
@@ -264,6 +280,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
// Add a special "Pending..." node
// This must happen in the TCF dispatch thread.
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
FSTreeNode pendingNode = new FSTreeNode();
pendingNode.name = Messages.PendingOperation_label;
@@ -284,6 +301,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
if (absName != null) {
// Open a channel to the peer and query the children
Tcf.getChannelManager().openChannel(node.peerNode.getPeer(), new IChannelManager.DoneOpenChannel() {
+ @Override
public void doneOpenChannel(final Throwable error, final IChannel channel) {
Assert.isTrue(Protocol.isDispatchThread());
@@ -292,8 +310,10 @@ public class FSTreeContentProvider implements ITreeContentProvider {
if (service != null) {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
service.opendir(absName, new IFileSystem.DoneOpen() {
+ @Override
public void doneOpen(IToken token, FileSystemException error, final IFileHandle handle) {
if (error == null) {
// Read the directory content until finished
@@ -347,13 +367,16 @@ public class FSTreeContentProvider implements ITreeContentProvider {
Assert.isNotNull(parentNode);
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
service.readdir(handle, new IFileSystem.DoneReadDir() {
+ @Override
public void doneReadDir(IToken token, FileSystemException error, DirEntry[] entries, boolean eof) {
// Close the handle and channel if EOF is signaled or an error occurred.
if (eof) {
service.close(handle, new IFileSystem.DoneClose() {
+ @Override
public void doneClose(IToken token, FileSystemException error) {
closeOpenChannel(channel);
}
@@ -392,6 +415,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
}
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
if (viewer instanceof StructuredViewer) ((StructuredViewer)viewer).refresh(parentNode);
}
@@ -476,6 +500,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
*/
+ @Override
public boolean hasChildren(final Object element) {
Assert.isNotNull(element);
@@ -489,6 +514,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
} else if (node.childrenQueried) {
final boolean[] result = new boolean[1];
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
result[0] = node.getChildren().size() > 0;
}
@@ -503,6 +529,7 @@ public class FSTreeContentProvider implements ITreeContentProvider {
peerId[0] = ((IPeerModel)element).getPeer().getID();
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
peerId[0] = ((IPeerModel)element).getPeer().getID();
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeControl.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeControl.java
index a1e686929..7385574da 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeControl.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeControl.java
@@ -134,6 +134,7 @@ public class FSTreeControl extends AbstractTreeControl implements ISelectionChan
* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
IWorkbenchPart parent = getParentPart();
if (parent != null) {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeLabelProvider.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeLabelProvider.java
index f7a2a8fe3..1b843dc4c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeLabelProvider.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/controls/FSTreeLabelProvider.java
@@ -136,6 +136,7 @@ public class FSTreeLabelProvider extends LabelProvider implements ITableLabelPro
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
*/
+ @Override
public Image getColumnImage(Object element, int columnIndex) {
if (columnIndex == 0) return getImage(element);
return null;
@@ -144,6 +145,7 @@ public class FSTreeLabelProvider extends LabelProvider implements ITableLabelPro
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
*/
+ @Override
public String getColumnText(Object element, int columnIndex) {
if (columnIndex == 0) return getText(element);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/dialogs/FSOpenFileDialog.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/dialogs/FSOpenFileDialog.java
index c72d130bc..f53b5ccb1 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/dialogs/FSOpenFileDialog.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/dialogs/FSOpenFileDialog.java
@@ -80,6 +80,7 @@ public class FSOpenFileDialog extends CustomTrayDialog {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
@SuppressWarnings("synthetic-access")
public void selectionChanged(SelectionChangedEvent event) {
selection = event.getSelection();
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/CacheManager.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/CacheManager.java
index 5df9a5380..2332963d1 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/CacheManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/CacheManager.java
@@ -170,8 +170,8 @@ public class CacheManager {
*/
public boolean download(final FSTreeNode node, Shell parent) {
IRunnableWithProgress runnable = new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor)
- throws InvocationTargetException, InterruptedException {
+ @Override
+ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
monitor.beginTask(NLS.bind(Messages.CacheManager_DowloadingFile, node.name), 100);
try {
boolean canceled = downloadFile(node, monitor);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/FSTreeNodePropertyTester.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/FSTreeNodePropertyTester.java
index 907c19c1f..0e23f0a1b 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/FSTreeNodePropertyTester.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/FSTreeNodePropertyTester.java
@@ -22,14 +22,12 @@ import org.eclipse.tm.te.tcf.filesystem.model.FSTreeNode;
* it is writable and "isExecutable" if it is executable.
*/
public class FSTreeNodePropertyTester extends PropertyTester {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object,
- * java.lang.String, java.lang.Object[], java.lang.Object)
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
*/
- public boolean test(Object receiver, String property, Object[] args,
- Object expectedValue) {
+ @Override
+ public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
assert receiver != null && receiver instanceof FSTreeNode;
FSTreeNode node = (FSTreeNode) receiver;
if (property.equals("isFile")) { //$NON-NLS-1$
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/OpenFileHandler.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/OpenFileHandler.java
index 9a63fb47e..00214c396 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/OpenFileHandler.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/OpenFileHandler.java
@@ -32,9 +32,9 @@ import org.eclipse.ui.ide.IDE;
public class OpenFileHandler extends AbstractHandler {
/* (non-Javadoc)
- *
* @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getActiveMenuSelectionChecked(event);
final FSTreeNode node = (FSTreeNode) selection.getFirstElement();
@@ -82,6 +82,7 @@ public class OpenFileHandler extends AbstractHandler {
private void openEditor(final IWorkbenchPage page, final FSTreeNode node) {
Display display = page.getWorkbenchWindow().getWorkbench().getDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
IPath path = CacheManager.getInstance().getCachePath(node);
IFileStore fileStore = EFS.getLocalFileSystem().getStore(path);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/TimeTriggeredProgressMonitorDialog.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/TimeTriggeredProgressMonitorDialog.java
index 960e1ca19..5a3d85b37 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/TimeTriggeredProgressMonitorDialog.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/TimeTriggeredProgressMonitorDialog.java
@@ -81,6 +81,7 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog {
* @see
* org.eclipse.core.runtime.IProgressMonitor#beginTask(java.lang.String, int)
*/
+ @Override
public void beginTask(String name, int totalWork) {
superMonitor.beginTask(name, totalWork);
checkTicking();
@@ -104,6 +105,7 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog {
*
* @see org.eclipse.core.runtime.IProgressMonitor#done()
*/
+ @Override
public void done() {
superMonitor.done();
checkTicking();
@@ -115,6 +117,7 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog {
* @see
* org.eclipse.core.runtime.IProgressMonitor#internalWorked(double)
*/
+ @Override
public void internalWorked(double work) {
superMonitor.internalWorked(work);
checkTicking();
@@ -125,6 +128,7 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog {
*
* @see org.eclipse.core.runtime.IProgressMonitor#isCanceled()
*/
+ @Override
public boolean isCanceled() {
return superMonitor.isCanceled();
}
@@ -135,6 +139,7 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog {
* @see
* org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean)
*/
+ @Override
public void setCanceled(boolean value) {
superMonitor.setCanceled(value);
@@ -147,6 +152,7 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog {
* org.eclipse.core.runtime.IProgressMonitor#setTaskName(java.lang
* .String)
*/
+ @Override
public void setTaskName(String name) {
superMonitor.setTaskName(name);
checkTicking();
@@ -160,6 +166,7 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog {
* org.eclipse.core.runtime.IProgressMonitor#subTask(java.lang.String
* )
*/
+ @Override
public void subTask(String name) {
superMonitor.subTask(name);
checkTicking();
@@ -170,6 +177,7 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog {
*
* @see org.eclipse.core.runtime.IProgressMonitor#worked(int)
*/
+ @Override
public void worked(int work) {
superMonitor.worked(work);
checkTicking();
@@ -204,6 +212,7 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog {
final InvocationTargetException[] invokes = new InvocationTargetException[1];
final InterruptedException[] interrupt = new InterruptedException[1];
Runnable dialogWaitRunnable = new Runnable() {
+ @Override
@SuppressWarnings("synthetic-access")
public void run() {
try {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/url/TcfInputStream.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/url/TcfInputStream.java
index 9cd49721c..f446ef585 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/url/TcfInputStream.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/url/TcfInputStream.java
@@ -153,15 +153,18 @@ public class TcfInputStream extends InputStream {
// Open the channel
channel = peer.openChannel();
channel.addChannelListener(new IChannelListener() {
+ @Override
public void onChannelOpened() {
Assert.isTrue(Protocol.isDispatchThread());
service = channel.getRemoteService(IFileSystem.class);
rendezvous.arrive();
}
+ @Override
public void onChannelClosed(Throwable error) {
}
+ @Override
public void congestionLevel(int level) {
}
});
@@ -176,6 +179,7 @@ public class TcfInputStream extends InputStream {
final FileSystemException[] errors = new FileSystemException[1];
// Open the file.
service.open(path, IFileSystem.TCF_O_READ, null, new DoneOpen() {
+ @Override
public void doneOpen(IToken token, FileSystemException error,
IFileHandle hdl) {
errors[0] = error;
@@ -250,6 +254,7 @@ public class TcfInputStream extends InputStream {
private void readBlock() {
final Rendezvous rendezvous = new Rendezvous();
service.read(handle, position, chunk_size, new DoneRead() {
+ @Override
public void doneRead(IToken token, FileSystemException error,
byte[] data, boolean eof) {
if (error != null) {
@@ -285,6 +290,7 @@ public class TcfInputStream extends InputStream {
if (connected && !closed) {
final Rendezvous rendezvous = new Rendezvous();
service.close(handle, new DoneClose() {
+ @Override
public void doneClose(IToken token, FileSystemException error) {
rendezvous.arrive();
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/model/FSTreeNode.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/model/FSTreeNode.java
index 685b10d94..203a87963 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/model/FSTreeNode.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/model/FSTreeNode.java
@@ -314,13 +314,16 @@ public final class FSTreeNode extends PlatformObject {
final Rendezvous rendezvous = new Rendezvous();
IChannel channel = peerNode.getPeer().openChannel();
channel.addChannelListener(new IChannelListener() {
+ @Override
public void onChannelOpened() {
rendezvous.arrive();
}
+ @Override
public void onChannelClosed(Throwable error) {
}
+ @Override
public void congestionLevel(int level) {
}
});
@@ -333,6 +336,7 @@ public final class FSTreeNode extends PlatformObject {
IFileSystem service = channel.getRemoteService(IFileSystem.class);
final UserAccount[] accounts = new UserAccount[1];
service.user(new DoneUser() {
+ @Override
public void doneUser(IToken token, FileSystemException error,
int real_uid, int effective_uid, int real_gid,
int effective_gid, String home) {
@@ -371,6 +375,7 @@ public final class FSTreeNode extends PlatformObject {
} else {
final UserAccount[] accounts = new UserAccount[1];
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
accounts[0] = (UserAccount) peer
.getProperty(USER_ACCOUNT_KEY);
@@ -394,6 +399,7 @@ public final class FSTreeNode extends PlatformObject {
peer.setProperty(USER_ACCOUNT_KEY, account);
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
peer.setProperty(USER_ACCOUNT_KEY, account);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/.classpath b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/.classpath
index 64c5e31b7..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/.settings/org.eclipse.jdt.core.prefs
index 2ad9c1ae7..5334d720a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/.settings/org.eclipse.jdt.core.prefs
@@ -1,82 +1,82 @@
-#Wed Apr 06 16:34:47 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+#Mon Oct 03 10:28:00 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/META-INF/MANIFEST.MF
index af6fe40d7..25fdb89f5 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.expressions;bundle-version="3.4.300",
org.eclipse.tm.tcf.core;bundle-version="0.5.0",
org.eclipse.tm.te.tcf.core;bundle-version="1.0.0",
- org.eclipse.tm.te.core;bundle-version="1.0.0",
- org.eclipse.tm.te.core.persistence;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0",
+ org.eclipse.tm.te.runtime.persistence;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.tcf.locator,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/plugin.xml
index 4bc118b1e..e1a057057 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/plugin.xml
@@ -21,7 +21,7 @@
</extension>
<!-- Target Explorer persistence delegate contributions -->
- <extension point="org.eclipse.tm.te.core.persistence.delegates">
+ <extension point="org.eclipse.tm.te.runtime.persistence.delegates">
<delegate
id="org.eclipse.tm.te.tcf.locator.persistence"
class="org.eclipse.tm.te.tcf.locator.internal.PeersPersistenceDelegate">
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/Scanner.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/Scanner.java
index b564b18ac..b6a2a899d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/Scanner.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/Scanner.java
@@ -62,6 +62,7 @@ public class Scanner extends Job implements IScanner {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.IScanner#setConfiguration(java.util.Map)
*/
+ @Override
public void setConfiguration(Map<String, Object> configuration) {
Assert.isNotNull(configuration);
this.configuration.clear();
@@ -71,6 +72,7 @@ public class Scanner extends Job implements IScanner {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.IScanner#getConfiguration()
*/
+ @Override
public Map<String, Object> getConfiguration() {
return configuration;
}
@@ -89,6 +91,7 @@ public class Scanner extends Job implements IScanner {
// The first runnable is setting the thread which will finish
// the job at the end
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
Scanner.this.setThread(Thread.currentThread());
}
@@ -106,6 +109,7 @@ public class Scanner extends Job implements IScanner {
// scanner runnable's are processed and will reschedule the job
final IStatus result = monitor.isCanceled() ? Status.CANCEL_STATUS : Status.OK_STATUS;
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
Scanner.this.done(result);
@@ -123,6 +127,7 @@ public class Scanner extends Job implements IScanner {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.IScanner#terminate()
*/
+ @Override
public void terminate() {
terminated.set(true);
}
@@ -130,6 +135,7 @@ public class Scanner extends Job implements IScanner {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.IScanner#isTerminated()
*/
+ @Override
public final boolean isTerminated() {
return terminated.get();
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/ScannerRunnable.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/ScannerRunnable.java
index b7372cdad..f9dea0b6e 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/ScannerRunnable.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/ScannerRunnable.java
@@ -73,6 +73,7 @@ public class ScannerRunnable implements Runnable, IChannel.IChannelListener {
/* (non-Javadoc)
* @see java.lang.Runnable#run()
*/
+ @Override
public void run() {
if (peerNode != null && peerNode.getPeer() != null) {
// Open the channel
@@ -91,6 +92,7 @@ public class ScannerRunnable implements Runnable, IChannel.IChannelListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.protocol.IChannel.IChannelListener#onChannelOpened()
*/
+ @Override
public void onChannelOpened() {
// Peer is reachable
if (channel != null) {
@@ -129,6 +131,7 @@ public class ScannerRunnable implements Runnable, IChannel.IChannelListener {
if (peers != null && !peers.isEmpty()) {
// Execute asynchronously within the TCF dispatch thread
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
for (String peerId : peers.keySet()) {
// Try to find an existing peer node first
@@ -154,6 +157,7 @@ public class ScannerRunnable implements Runnable, IChannel.IChannelListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.protocol.IChannel.IChannelListener#onChannelClosed(java.lang.Throwable)
*/
+ @Override
public void onChannelClosed(Throwable error) {
// Peer is not reachable
@@ -175,6 +179,7 @@ public class ScannerRunnable implements Runnable, IChannel.IChannelListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.protocol.IChannel.IChannelListener#congestionLevel(int)
*/
+ @Override
public void congestionLevel(int level) {
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/activator/CoreBundleActivator.java
index 917c213e7..944a04ba1 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/activator/CoreBundleActivator.java
@@ -10,7 +10,7 @@
package org.eclipse.tm.te.tcf.locator.activator;
import org.eclipse.core.runtime.Plugin;
-import org.eclipse.tm.te.core.tracing.TraceHandler;
+import org.eclipse.tm.te.runtime.tracing.TraceHandler;
import org.osgi.framework.BundleContext;
/**
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/internal/MyPropertyTester.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/internal/MyPropertyTester.java
index 75556cbd5..ccdf3eab8 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/internal/MyPropertyTester.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/internal/MyPropertyTester.java
@@ -25,6 +25,7 @@ public class MyPropertyTester extends PropertyTester {
/* (non-Javadoc)
* @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
*/
+ @Override
public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {
// The receiver is expected to be a peer model node
if (receiver instanceof IPeerModel) {
@@ -33,6 +34,7 @@ public class MyPropertyTester extends PropertyTester {
result[0] = Boolean.valueOf(testPeerModel((IPeerModel)receiver, property, args, expectedValue));
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
result[0] = Boolean.valueOf(testPeerModel((IPeerModel)receiver, property, args, expectedValue));
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/internal/PeersPersistenceDelegate.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/internal/PeersPersistenceDelegate.java
index 4de9be53f..09c2402fe 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/internal/PeersPersistenceDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/internal/PeersPersistenceDelegate.java
@@ -17,8 +17,8 @@ import java.io.OutputStreamWriter;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
-import org.eclipse.tm.te.core.persistence.AbstractPersistenceDelegate;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.persistence.AbstractPersistenceDelegate;
import org.eclipse.tm.te.tcf.locator.activator.CoreBundleActivator;
import org.eclipse.tm.te.tcf.locator.internal.nls.Messages;
@@ -28,8 +28,9 @@ import org.eclipse.tm.te.tcf.locator.internal.nls.Messages;
public class PeersPersistenceDelegate extends AbstractPersistenceDelegate {
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate#write(org.eclipse.core.runtime.IPath, org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer)
+ * @see org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate#write(org.eclipse.core.runtime.IPath, org.eclipse.tm.te.runtime.interfaces.nodes.IPropertiesContainer)
*/
+ @Override
public void write(IPath path, IPropertiesContainer data) throws IOException {
Assert.isNotNull(path);
Assert.isNotNull(data);
@@ -61,8 +62,9 @@ public class PeersPersistenceDelegate extends AbstractPersistenceDelegate {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate#delete(org.eclipse.core.runtime.IPath)
+ * @see org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate#delete(org.eclipse.core.runtime.IPath)
*/
+ @Override
public boolean delete(IPath path) throws IOException {
Assert.isNotNull(path);
@@ -82,8 +84,9 @@ public class PeersPersistenceDelegate extends AbstractPersistenceDelegate {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate#read(org.eclipse.core.runtime.IPath)
+ * @see org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate#read(org.eclipse.core.runtime.IPath)
*/
+ @Override
public IPropertiesContainer read(IPath path) throws IOException {
return null;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/ChannelStateChangeListener.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/ChannelStateChangeListener.java
index 969cb6bb8..f67bd5c2f 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/ChannelStateChangeListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/ChannelStateChangeListener.java
@@ -42,6 +42,7 @@ public class ChannelStateChangeListener implements IChannelStateChangeListener {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.tcf.core.interfaces.listeners.IChannelStateChangeListener#stateChanged(org.eclipse.tm.tcf.protocol.IChannel, int)
*/
+ @Override
public void stateChanged(IChannel channel, int state) {
Assert.isNotNull(channel);
Assert.isTrue(Protocol.isDispatchThread());
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/LocatorListener.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/LocatorListener.java
index c4a2b9e64..3ed1e3264 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/LocatorListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/LocatorListener.java
@@ -46,6 +46,7 @@ public class LocatorListener implements ILocator.LocatorListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.services.ILocator.LocatorListener#peerAdded(org.eclipse.tm.tcf.protocol.IPeer)
*/
+ @Override
public void peerAdded(IPeer peer) {
if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITracing.ID_TRACE_LOCATOR_LISTENER)) {
CoreBundleActivator.getTraceHandler().trace("LocatorListener.peerAdded( " + (peer != null ? peer.getID() : null) + " )", ITracing.ID_TRACE_LOCATOR_LISTENER, this); //$NON-NLS-1$ //$NON-NLS-2$
@@ -76,6 +77,7 @@ public class LocatorListener implements ILocator.LocatorListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.services.ILocator.LocatorListener#peerChanged(org.eclipse.tm.tcf.protocol.IPeer)
*/
+ @Override
public void peerChanged(IPeer peer) {
if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITracing.ID_TRACE_LOCATOR_LISTENER)) {
CoreBundleActivator.getTraceHandler().trace("LocatorListener.peerChanged( " + (peer != null ? peer.getID() : null) + " )", ITracing.ID_TRACE_LOCATOR_LISTENER, this); //$NON-NLS-1$ //$NON-NLS-2$
@@ -92,6 +94,7 @@ public class LocatorListener implements ILocator.LocatorListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.services.ILocator.LocatorListener#peerRemoved(java.lang.String)
*/
+ @Override
public void peerRemoved(String id) {
if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITracing.ID_TRACE_LOCATOR_LISTENER)) {
CoreBundleActivator.getTraceHandler().trace("LocatorListener.peerRemoved( " + id + " )", ITracing.ID_TRACE_LOCATOR_LISTENER, this); //$NON-NLS-1$ //$NON-NLS-2$
@@ -110,6 +113,7 @@ public class LocatorListener implements ILocator.LocatorListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.services.ILocator.LocatorListener#peerHeartBeat(java.lang.String)
*/
+ @Override
public void peerHeartBeat(String id) {
if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITracing.ID_TRACE_LOCATOR_LISTENER)) {
CoreBundleActivator.getTraceHandler().trace("LocatorListener.peerHeartBeat( " + id + " )", ITracing.ID_TRACE_LOCATOR_LISTENER, this); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/ModelAdapter.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/ModelAdapter.java
index 6fe42522d..79ed8c3d8 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/ModelAdapter.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/listener/ModelAdapter.java
@@ -3,7 +3,7 @@
* 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
*******************************************************************************/
@@ -21,18 +21,21 @@ public class ModelAdapter implements IModelListener {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.IModelListener#locatorModelChanged(org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel)
*/
+ @Override
public void locatorModelChanged(ILocatorModel model) {
}
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.IModelListener#locatorModelDisposed(org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel)
*/
+ @Override
public void locatorModelDisposed(ILocatorModel model) {
}
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.IModelListener#peerModelChanged(org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel, org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel)
*/
+ @Override
public void peerModelChanged(ILocatorModel model, IPeerModel peer) {
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/nodes/LocatorModel.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/nodes/LocatorModel.java
index e214ab39e..c8772924f 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/nodes/LocatorModel.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/nodes/LocatorModel.java
@@ -88,6 +88,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel#addListener(org.eclipse.tm.te.tcf.locator.core.interfaces.IModelListener)
*/
+ @Override
public void addListener(IModelListener listener) {
Assert.isNotNull(listener);
Assert.isTrue(Protocol.isDispatchThread());
@@ -102,6 +103,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel#removeListener(org.eclipse.tm.te.tcf.locator.core.interfaces.IModelListener)
*/
+ @Override
public void removeListener(IModelListener listener) {
Assert.isNotNull(listener);
Assert.isTrue(Protocol.isDispatchThread());
@@ -116,6 +118,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.interfaces.nodes.ILocatorModel#getListener()
*/
+ @Override
public IModelListener[] getListener() {
return modelListener.toArray(new IModelListener[modelListener.size()]);
}
@@ -123,6 +126,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel#dispose()
*/
+ @Override
public void dispose() {
Assert.isTrue(Protocol.isDispatchThread());
@@ -138,6 +142,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
final IModelListener[] listeners = getListener();
if (listeners.length > 0) {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
for (IModelListener listener : listeners) {
listener.locatorModelDisposed(LocatorModel.this);
@@ -168,6 +173,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel#isDisposed()
*/
+ @Override
public boolean isDisposed() {
return disposed;
}
@@ -175,6 +181,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel#getPeers()
*/
+ @Override
public IPeerModel[] getPeers() {
return peers.values().toArray(new IPeerModel[peers.values().size()]);
}
@@ -220,6 +227,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel#getService(java.lang.Class)
*/
+ @Override
@SuppressWarnings("unchecked")
public <V extends ILocatorModelService> V getService(Class<V> serviceInterface) {
Assert.isNotNull(serviceInterface);
@@ -256,6 +264,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel#getScanner()
*/
+ @Override
public IScanner getScanner() {
if (scanner == null) scanner = new Scanner(this);
return scanner;
@@ -264,6 +273,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel#startScanner(long, long)
*/
+ @Override
public void startScanner(long delay, long schedule) {
if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITracing.ID_TRACE_LOCATOR_MODEL)) {
CoreBundleActivator.getTraceHandler().trace("LocatorModel.startScanner( " + delay + ", " + schedule + " )", ITracing.ID_TRACE_LOCATOR_MODEL, this); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -291,6 +301,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel#stopScanner()
*/
+ @Override
public void stopScanner() {
if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITracing.ID_TRACE_LOCATOR_MODEL)) {
CoreBundleActivator.getTraceHandler().trace("LocatorModel.stopScanner()", ITracing.ID_TRACE_LOCATOR_MODEL, this); //$NON-NLS-1$
@@ -307,6 +318,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.ILocatorModel#validatePeerNodeForAdd(org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel)
*/
+ @Override
public IPeerModel validatePeerNodeForAdd(IPeerModel node) {
Assert.isNotNull(node);
Assert.isTrue(Protocol.isDispatchThread());
@@ -410,6 +422,7 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
final IModelListener[] listeners = getListener();
if (listeners.length > 0) {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
for (IModelListener listener : listeners) {
listener.locatorModelChanged(LocatorModel.this);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/nodes/PeerModel.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/nodes/PeerModel.java
index 5008db28b..b47689b73 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/nodes/PeerModel.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/nodes/PeerModel.java
@@ -71,6 +71,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#getModel()
*/
+ @Override
public ILocatorModel getModel() {
return (ILocatorModel)getAdapter(ILocatorModel.class);
}
@@ -78,6 +79,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#getPeer()
*/
+ @Override
public IPeer getPeer() {
return (IPeer)getAdapter(IPeer.class);
}
@@ -95,6 +97,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
object[0] = doGetAdapter(adapter);
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
object[0] = doGetAdapter(adapter);
}
@@ -151,6 +154,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
buffer.append(", name=" + peer.getName()); //$NON-NLS-1$
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
IPeer peer = getPeer();
buffer.append(": id=" + peer.getID()); //$NON-NLS-1$
@@ -166,6 +170,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#getProperties()
*/
+ @Override
public Map<String, Object> getProperties() {
Assert.isTrue(Protocol.isDispatchThread());
return Collections.unmodifiableMap(new HashMap<String, Object>(properties));
@@ -174,6 +179,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#getProperty(java.lang.String)
*/
+ @Override
public Object getProperty(String key) {
Assert.isTrue(Protocol.isDispatchThread());
@@ -188,6 +194,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#getBooleanProperty(java.lang.String)
*/
+ @Override
public final boolean getBooleanProperty(String key) {
Object value = getProperty(key);
if (value instanceof Boolean) {
@@ -204,6 +211,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#getLongProperty(java.lang.String)
*/
+ @Override
public final long getLongProperty(String key) {
Object value = getProperty(key);
if (value instanceof Long) {
@@ -224,6 +232,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#getIntProperty(java.lang.String)
*/
+ @Override
public final int getIntProperty(String key) {
Object value = getProperty(key);
try {
@@ -238,6 +247,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#getStringProperty(java.lang.String)
*/
+ @Override
public final String getStringProperty(String key) {
Object value = getProperty(key);
return value instanceof String ? (String)value :
@@ -247,6 +257,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#getFloatProperty(java.lang.String)
*/
+ @Override
public final float getFloatProperty(String key) {
Object value = getProperty(key);
try {
@@ -261,6 +272,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#getDoubleProperty(java.lang.String)
*/
+ @Override
public final double getDoubleProperty(String key) {
Object value = getProperty(key);
try {
@@ -276,6 +288,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#setProperties(java.util.Map)
*/
+ @Override
public final void setProperties(Map<String, Object> properties) {
Assert.isNotNull(properties);
Assert.isTrue(Protocol.isDispatchThread());
@@ -286,6 +299,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
final IModelListener[] listeners = parentModel.getListener();
if (listeners.length > 0) {
Protocol.invokeLater(new Runnable() {
+ @Override
@SuppressWarnings("synthetic-access")
public void run() {
for (IModelListener listener : listeners) {
@@ -299,6 +313,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#setProperty(java.lang.String, boolean)
*/
+ @Override
public final boolean setProperty(String key, boolean value) {
boolean oldValue = getBooleanProperty(key);
if (oldValue != value) {
@@ -310,6 +325,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#setProperty(java.lang.String, long)
*/
+ @Override
public final boolean setProperty(String key, long value) {
long oldValue = getLongProperty(key);
if (oldValue != value) {
@@ -321,6 +337,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#setProperty(java.lang.String, int)
*/
+ @Override
public final boolean setProperty(String key, int value) {
int oldValue = getIntProperty(key);
if (oldValue != value) {
@@ -332,6 +349,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#setProperty(java.lang.String, float)
*/
+ @Override
public final boolean setProperty(String key, float value) {
float oldValue = getFloatProperty(key);
if (oldValue != value) {
@@ -343,6 +361,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#setProperty(java.lang.String, double)
*/
+ @Override
public final boolean setProperty(String key, double value) {
double oldValue = getDoubleProperty(key);
if (oldValue != value) {
@@ -354,6 +373,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#setProperty(java.lang.String, java.lang.Object)
*/
+ @Override
public boolean setProperty(String key, Object value) {
Assert.isNotNull(key);
Assert.isTrue(Protocol.isDispatchThread());
@@ -372,6 +392,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
final IModelListener[] listeners = parentModel.getListener();
if (listeners.length > 0) {
Protocol.invokeLater(new Runnable() {
+ @Override
@SuppressWarnings("synthetic-access")
public void run() {
for (IModelListener listener : listeners) {
@@ -390,6 +411,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#clearProperties()
*/
+ @Override
public final void clearProperties() {
Assert.isTrue(Protocol.isDispatchThread());
properties.clear();
@@ -398,6 +420,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#isProperty(java.lang.String, long)
*/
+ @Override
public final boolean isProperty(String key, long value) {
return getLongProperty(key) == value;
}
@@ -405,6 +428,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#isProperty(java.lang.String, boolean)
*/
+ @Override
public final boolean isProperty(String key, boolean value) {
return getBooleanProperty(key) == value;
}
@@ -412,6 +436,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#isProperty(java.lang.String, int)
*/
+ @Override
public final boolean isProperty(String key, int value) {
return getIntProperty(key) == value;
}
@@ -419,6 +444,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#isProperty(java.lang.String, float)
*/
+ @Override
public final boolean isProperty(String key, float value) {
return getFloatProperty(key) == value;
}
@@ -426,6 +452,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#isProperty(java.lang.String, double)
*/
+ @Override
public final boolean isProperty(String key, double value) {
return getDoubleProperty(key) == value;
}
@@ -433,6 +460,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#isPropertyIgnoreCase(java.lang.String, java.lang.String)
*/
+ @Override
public final boolean isPropertyIgnoreCase(String key, String value) {
String property = getStringProperty(key);
return (property == null && value == null) || (property != null && property.equalsIgnoreCase(value));
@@ -441,6 +469,7 @@ public class PeerModel extends PlatformObject implements IPeerModel {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel#isProperty(java.lang.String, java.lang.Object)
*/
+ @Override
public final boolean isProperty(String key, Object value) {
Object property = getProperty(key);
return (property == null && value == null) || (property != null && property.equals(value));
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/AbstractLocatorModelService.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/AbstractLocatorModelService.java
index 8e9829b2d..8e439cec0 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/AbstractLocatorModelService.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/AbstractLocatorModelService.java
@@ -35,6 +35,7 @@ public abstract class AbstractLocatorModelService extends PlatformObject impleme
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.interfaces.services.ILocatorModelService#getLocatorModel()
*/
+ @Override
public final ILocatorModel getLocatorModel() {
return locatorModel;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelLookupService.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelLookupService.java
index 6cd42cfbd..1226f7f57 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelLookupService.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelLookupService.java
@@ -37,6 +37,7 @@ public class LocatorModelLookupService extends AbstractLocatorModelService imple
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.services.ILocatorModelLookupService#lkupPeerModelById(java.lang.String)
*/
+ @Override
public IPeerModel lkupPeerModelById(String id) {
Assert.isNotNull(id);
Assert.isTrue(Protocol.isDispatchThread());
@@ -56,6 +57,7 @@ public class LocatorModelLookupService extends AbstractLocatorModelService imple
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.interfaces.services.ILocatorModelLookupService#lkupPeerModelByAgentId(java.lang.String)
*/
+ @Override
public IPeerModel[] lkupPeerModelByAgentId(String agentId) {
Assert.isNotNull(agentId);
Assert.isTrue(Protocol.isDispatchThread());
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelRefreshService.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelRefreshService.java
index 4c6565b4d..38216331a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelRefreshService.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelRefreshService.java
@@ -59,6 +59,7 @@ public class LocatorModelRefreshService extends AbstractLocatorModelService impl
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.services.ILocatorModelRefreshService#refresh()
*/
+ @Override
public void refresh() {
Assert.isTrue(Protocol.isDispatchThread());
@@ -143,6 +144,7 @@ public class LocatorModelRefreshService extends AbstractLocatorModelService impl
for (File root : roots) {
// List all "*.ini" files within the root location
File[] candidates = root.listFiles(new FileFilter() {
+ @Override
public boolean accept(File pathname) {
IPath path = new Path(pathname.getAbsolutePath());
return path.getFileExtension() != null && path.getFileExtension().toLowerCase().equals("ini"); //$NON-NLS-1$
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelUpdateService.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelUpdateService.java
index ab66f396b..7a4158859 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelUpdateService.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelUpdateService.java
@@ -38,6 +38,7 @@ public class LocatorModelUpdateService extends AbstractLocatorModelService imple
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.services.ILocatorModelUpdateService#add(org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel)
*/
+ @Override
public void add(IPeerModel peer) {
Assert.isNotNull(peer);
Assert.isTrue(Protocol.isDispatchThread());
@@ -49,6 +50,7 @@ public class LocatorModelUpdateService extends AbstractLocatorModelService imple
final IModelListener[] listeners = getLocatorModel().getListener();
if (listeners.length > 0) {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
for (IModelListener listener : listeners) {
listener.locatorModelChanged(getLocatorModel());
@@ -61,6 +63,7 @@ public class LocatorModelUpdateService extends AbstractLocatorModelService imple
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.services.ILocatorModelUpdateService#remove(org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel)
*/
+ @Override
public void remove(IPeerModel peer) {
Assert.isNotNull(peer);
Assert.isTrue(Protocol.isDispatchThread());
@@ -72,6 +75,7 @@ public class LocatorModelUpdateService extends AbstractLocatorModelService imple
final IModelListener[] listeners = getLocatorModel().getListener();
if (listeners.length > 0) {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
for (IModelListener listener : listeners) {
listener.locatorModelChanged(getLocatorModel());
@@ -84,6 +88,7 @@ public class LocatorModelUpdateService extends AbstractLocatorModelService imple
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.locator.core.interfaces.services.ILocatorModelUpdateService#updatePeerServices(org.eclipse.tm.te.tcf.locator.core.interfaces.nodes.IPeerModel, java.util.Collection, java.util.Collection)
*/
+ @Override
public void updatePeerServices(IPeerModel peerNode, Collection<String> localServices, Collection<String> remoteServices) {
Assert.isNotNull(peerNode);
Assert.isTrue(Protocol.isDispatchThread());
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/.classpath b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/.classpath
index 2d1a4302f..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/.settings/org.eclipse.jdt.core.prefs
index 9108d97ec..b248bbabc 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Tue May 24 14:07:28 CEST 2011
+#Mon Oct 03 10:29:59 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/META-INF/MANIFEST.MF
index 9c5ecb98c..19527f4cc 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.tm.te.tcf.log.core.activator.CoreBundleActivator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.tm.te.core;bundle-version="1.0.0",
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0",
org.eclipse.tm.tcf.core;bundle-version="0.5.0",
org.eclipse.tm.te.tcf.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.tcf.log.core.activator;x-internal:=true,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/activator/CoreBundleActivator.java
index 1fe89324d..36cd57062 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/activator/CoreBundleActivator.java
@@ -10,7 +10,7 @@
package org.eclipse.tm.te.tcf.log.core.activator;
import org.eclipse.core.runtime.Plugin;
-import org.eclipse.tm.te.core.tracing.TraceHandler;
+import org.eclipse.tm.te.runtime.tracing.TraceHandler;
import org.osgi.framework.BundleContext;
/**
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/LogManager.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/LogManager.java
index 17fed225b..634c66a1e 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/LogManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/LogManager.java
@@ -155,6 +155,7 @@ public final class LogManager implements IProtocolStateChangeListener {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.core.interfaces.listeners.IProtocolStateChangeListener#stateChanged(boolean)
*/
+ @Override
public void stateChanged(boolean state) {
Assert.isTrue(Protocol.isDispatchThread());
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/Startup.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/Startup.java
index 06230039d..190d75def 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/Startup.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/Startup.java
@@ -28,6 +28,7 @@ public class Startup {
if (Protocol.getEventQueue() != null) {
// Execute the listener registration within the TCF dispatch thread
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
LogManager.getInstance().initListeners();
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelStateChangeListener.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelStateChangeListener.java
index a03833749..542311bf3 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelStateChangeListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelStateChangeListener.java
@@ -21,6 +21,7 @@ public class ChannelStateChangeListener implements IChannelStateChangeListener {
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.core.interfaces.listeners.IChannelStateChangeListener#stateChanged(org.eclipse.tm.tcf.protocol.IChannel, int)
*/
+ @Override
public void stateChanged(IChannel channel, int state) {
Assert.isNotNull(channel);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelTraceListener.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelTraceListener.java
index 08264b80f..4ae8c1ca7 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelTraceListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelTraceListener.java
@@ -67,6 +67,7 @@ public class ChannelTraceListener implements TraceListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.core.AbstractChannel.TraceListener#onChannelClosed(java.lang.Throwable)
*/
+ @Override
public void onChannelClosed(Throwable error) {
if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITracing.ID_TRACE_CHANNEL_TRACE_LISTENER)) {
CoreBundleActivator.getTraceHandler().trace("TraceListener.onChannelClosed ( " + error + " )", //$NON-NLS-1$ //$NON-NLS-2$
@@ -89,6 +90,7 @@ public class ChannelTraceListener implements TraceListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.core.AbstractChannel.TraceListener#onMessageReceived(char, java.lang.String, java.lang.String, java.lang.String, byte[])
*/
+ @Override
public void onMessageReceived(char type, String token, String service, String name, byte[] data) {
if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITracing.ID_TRACE_CHANNEL_TRACE_LISTENER)) {
CoreBundleActivator.getTraceHandler().trace("TraceListener.onMessageReceived ( " + type //$NON-NLS-1$
@@ -102,6 +104,7 @@ public class ChannelTraceListener implements TraceListener {
/* (non-Javadoc)
* @see org.eclipse.tm.tcf.core.AbstractChannel.TraceListener#onMessageSent(char, java.lang.String, java.lang.String, java.lang.String, byte[])
*/
+ @Override
public void onMessageSent(final char type, String token, String service, String name, byte[] data) {
if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITracing.ID_TRACE_CHANNEL_TRACE_LISTENER)) {
CoreBundleActivator.getTraceHandler().trace("TraceListener.onMessageSent ( " + type //$NON-NLS-1$
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelTraceListenerManager.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelTraceListenerManager.java
index 22e112a62..fcde2a55d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelTraceListenerManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.log.core/src/org/eclipse/tm/te/tcf/log/core/internal/listener/ChannelTraceListenerManager.java
@@ -127,6 +127,7 @@ public class ChannelTraceListenerManager {
final AbstractChannel.TraceListener traceListener = listeners.remove(channel);
if (traceListener != null) {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
((AbstractChannel)channel).removeTraceListener(traceListener);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/.classpath b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/.classpath
index 64c5e31b7..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/.settings/org.eclipse.jdt.core.prefs
index 63779e5ba..64a98a8b0 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Tue Aug 09 14:37:30 CEST 2011
+#Mon Oct 03 10:31:10 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/META-INF/MANIFEST.MF
index e1c797a61..0bfe08225 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/META-INF/MANIFEST.MF
@@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.tm.te.ui.forms;bundle-version="1.0.0",
org.eclipse.tm.te.ui.swt;bundle-version="1.0.0",
org.eclipse.tm.te.ui.views;bundle-version="1.0.0",
- org.eclipse.tm.te.core;bundle-version="1.0.0",
- org.eclipse.tm.te.core.persistence;bundle-version="1.0.0",
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0",
+ org.eclipse.tm.te.runtime.persistence;bundle-version="1.0.0",
org.eclipse.tm.te.tcf.core;bundle-version="1.0.0",
org.eclipse.tm.te.tcf.locator;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.tcf.ui.activator;x-internal:=true,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/PeersPersistenceManager.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/PeersPersistenceManager.java
index d1d0299cb..65e775fea 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/PeersPersistenceManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/PeersPersistenceManager.java
@@ -16,10 +16,10 @@ import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.Path;
import org.eclipse.tm.tcf.protocol.IPeer;
import org.eclipse.tm.tcf.protocol.Protocol;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
-import org.eclipse.tm.te.core.nodes.PropertiesContainer;
-import org.eclipse.tm.te.core.persistence.PersistenceDelegateManager;
-import org.eclipse.tm.te.core.persistence.interfaces.IPersistenceDelegate;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.persistence.PersistenceDelegateManager;
+import org.eclipse.tm.te.runtime.persistence.interfaces.IPersistenceDelegate;
+import org.eclipse.tm.te.runtime.properties.PropertiesContainer;
import org.eclipse.tm.te.tcf.locator.interfaces.nodes.IPeerModel;
@@ -88,6 +88,7 @@ public class PeersPersistenceManager {
path[0] = peer.getPeer().getAttributes().get("Path"); //$NON-NLS-1$
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
path[0] = peer.getPeer().getAttributes().get("Path"); //$NON-NLS-1$
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/filter/UnreachablePeersFilter.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/filter/UnreachablePeersFilter.java
index c7e00ed57..af8c2bea0 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/filter/UnreachablePeersFilter.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/filter/UnreachablePeersFilter.java
@@ -36,6 +36,7 @@ public class UnreachablePeersFilter extends ViewerFilter {
state[0] = peerModel.getIntProperty(IPeerModelProperties.PROP_STATE);
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
state[0] = peerModel.getIntProperty(IPeerModelProperties.PROP_STATE);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/handler/DeleteCommandHandler.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/handler/DeleteCommandHandler.java
index a27c6a24a..fe1d85166 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/handler/DeleteCommandHandler.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/handler/DeleteCommandHandler.java
@@ -33,6 +33,7 @@ public class DeleteCommandHandler extends AbstractHandler {
/* (non-Javadoc)
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
@@ -45,7 +46,7 @@ public class DeleteCommandHandler extends AbstractHandler {
} catch (IOException e) {
// Ignore it for now, we will have to pass it to the status handler later
}
-
+
// Get the locator model
final ILocatorModel model = Model.getModel();
if (model != null) {
@@ -53,6 +54,7 @@ public class DeleteCommandHandler extends AbstractHandler {
final ILocatorModelRefreshService service = model.getService(ILocatorModelRefreshService.class);
if (service != null) {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
// Refresh the model now (must be executed within the TCF dispatch thread)
service.refresh();
@@ -60,7 +62,7 @@ public class DeleteCommandHandler extends AbstractHandler {
});
}
}
-
+
}
}
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/handler/RefreshCommandHandler.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/handler/RefreshCommandHandler.java
index 00f944a4b..d773e1fe5 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/handler/RefreshCommandHandler.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/handler/RefreshCommandHandler.java
@@ -33,6 +33,7 @@ public class RefreshCommandHandler extends AbstractHandler {
/* (non-Javadoc)
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
@@ -47,6 +48,7 @@ public class RefreshCommandHandler extends AbstractHandler {
model.getService(ILocatorModelRefreshService.class).refresh();
} else {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
model.getService(ILocatorModelRefreshService.class).refresh();
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/model/Model.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/model/Model.java
index 68d4c1eb4..91c0c9ee3 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/model/Model.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/model/Model.java
@@ -36,6 +36,7 @@ public final class Model {
initialize();
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
initialize();
}
@@ -69,6 +70,7 @@ public final class Model {
locatorModel.dispose();
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
locatorModel.dispose();
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/ContentProviderDelegate.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/ContentProviderDelegate.java
index 0db13178d..64b325199 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/ContentProviderDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/ContentProviderDelegate.java
@@ -29,6 +29,7 @@ public class ContentProviderDelegate implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
*/
+ @Override
public Object[] getChildren(Object parentElement) {
Object[] children = NO_ELEMENTS;
@@ -48,6 +49,7 @@ public class ContentProviderDelegate implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
*/
+ @Override
public Object getParent(Object element) {
// If it is a peer model node, return the parent locator model
if (element instanceof IPeerModel) {
@@ -59,6 +61,7 @@ public class ContentProviderDelegate implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
*/
+ @Override
public boolean hasChildren(Object element) {
boolean hasChildren = false;
@@ -72,6 +75,7 @@ public class ContentProviderDelegate implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
return getChildren(inputElement);
}
@@ -79,6 +83,7 @@ public class ContentProviderDelegate implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
Model.dispose();
}
@@ -86,6 +91,7 @@ public class ContentProviderDelegate implements ITreeContentProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (newInput instanceof IRoot) {
final ILocatorModel model = Model.getModel();
@@ -94,6 +100,7 @@ public class ContentProviderDelegate implements ITreeContentProvider {
model.getService(ILocatorModelRefreshService.class).refresh();
} else {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
model.getService(ILocatorModelRefreshService.class).refresh();
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/LabelProviderDelegate.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/LabelProviderDelegate.java
index d81d07616..4c8cf3f4d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/LabelProviderDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/LabelProviderDelegate.java
@@ -41,6 +41,7 @@ public class LabelProviderDelegate extends LabelProvider implements ILabelDecora
peerName[0] = peer.getName();
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
peerName[0] = peer.getName();
}
@@ -73,6 +74,7 @@ public class LabelProviderDelegate extends LabelProvider implements ILabelDecora
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)
*/
+ @Override
public Image decorateImage(Image image, Object element) {
Image decoratedImage = null;
@@ -90,6 +92,7 @@ public class LabelProviderDelegate extends LabelProvider implements ILabelDecora
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object)
*/
+ @Override
public String decorateText(String text, Object element) {
if (element instanceof IPeerModel) {
String label = text;
@@ -100,6 +103,7 @@ public class LabelProviderDelegate extends LabelProvider implements ILabelDecora
doDecorateText(builder, peer);
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
doDecorateText(builder, peer);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/ModelListener.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/ModelListener.java
index e9b99a84f..e4fd06c46 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/ModelListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/ModelListener.java
@@ -43,6 +43,7 @@ public class ModelListener extends ModelAdapter {
public void locatorModelChanged(final ILocatorModel model) {
if (parentModel.equals(model)) {
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
CommonViewer viewer = getViewer();
if (viewer != null) viewer.refresh();
@@ -58,6 +59,7 @@ public class ModelListener extends ModelAdapter {
public void peerModelChanged(final ILocatorModel model, final IPeerModel peer) {
if (parentModel.equals(model)) {
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
CommonViewer viewer = getViewer();
if (viewer != null) viewer.refresh(peer);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/images/PeerImageDescriptor.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/images/PeerImageDescriptor.java
index 9035b38f5..b2d610eb9 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/images/PeerImageDescriptor.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/navigator/images/PeerImageDescriptor.java
@@ -46,6 +46,7 @@ public class PeerImageDescriptor extends AbstractImageDescriptor {
initialize(node);
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
initialize(node);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/wizards/NewTargetWizard.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/wizards/NewTargetWizard.java
index e331e638a..47ad97fda 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/wizards/NewTargetWizard.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/wizards/NewTargetWizard.java
@@ -41,6 +41,7 @@ public class NewTargetWizard extends AbstractWizard implements INewWizard {
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
// Set the window title
setWindowTitle(Messages.NewTargetWizard_windowTitle);
@@ -77,6 +78,7 @@ public class NewTargetWizard extends AbstractWizard implements INewWizard {
final ILocatorModelRefreshService service = model.getService(ILocatorModelRefreshService.class);
if (service != null) {
Protocol.invokeLater(new Runnable() {
+ @Override
public void run() {
// Refresh the model now (must be executed within the TCF dispatch thread)
service.refresh();
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/wizards/pages/NewTargetWizardPage.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/wizards/pages/NewTargetWizardPage.java
index dc341585b..138bc4eed 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/wizards/pages/NewTargetWizardPage.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/internal/wizards/pages/NewTargetWizardPage.java
@@ -61,6 +61,7 @@ public class NewTargetWizardPage extends AbstractValidatableWizardPage {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
// Setup title and description
setTitle(Messages.NewTargetWizardPage_title);
@@ -112,6 +113,7 @@ public class NewTargetWizardPage extends AbstractValidatableWizardPage {
addressControl = new Text(panel, SWT.SINGLE | SWT.BORDER);
addressControl.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
addressControl.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
updatePeerId();
}
@@ -124,6 +126,7 @@ public class NewTargetWizardPage extends AbstractValidatableWizardPage {
portControl.setText("1534"); //$NON-NLS-1$
portControl.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
portControl.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
updatePeerId();
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/tables/NodePropertiesContentProvider.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/tables/NodePropertiesContentProvider.java
index f117aca29..310dabdbd 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/tables/NodePropertiesContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/tables/NodePropertiesContentProvider.java
@@ -61,12 +61,14 @@ public class NodePropertiesContentProvider implements IStructuredContentProvider
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(final Object inputElement) {
List<TableNode> nodes = new ArrayList<TableNode>();
@@ -81,6 +83,7 @@ public class NodePropertiesContentProvider implements IStructuredContentProvider
properties.putAll(((IPeerModel)inputElement).getPeer().getAttributes());
} else {
Protocol.invokeAndWait(new Runnable() {
+ @Override
public void run() {
properties.putAll(((IPeerModel)inputElement).getProperties());
properties.putAll(((IPeerModel)inputElement).getPeer().getAttributes());
@@ -151,6 +154,7 @@ public class NodePropertiesContentProvider implements IStructuredContentProvider
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
// Do nothing if we shall not update the section title
if (!updateParentSectionTitle) return;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/tables/NodePropertiesLabelProvider.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/tables/NodePropertiesLabelProvider.java
index 02f0966ae..7a82041e2 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/tables/NodePropertiesLabelProvider.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.ui/src/org/eclipse/tm/te/tcf/ui/tables/NodePropertiesLabelProvider.java
@@ -51,6 +51,7 @@ public class NodePropertiesLabelProvider extends LabelProvider implements ITable
/* (non-Javadoc)
* @see org.eclipse.tm.te.tcf.vtl.ui.datasource.controls.tables.TableLabelProvider#getColumnText(org.eclipse.tm.te.tcf.core.runtime.model.interfaces.IModelNode, int)
*/
+ @Override
public String getColumnText(Object element, int columnIndex) {
Assert.isNotNull(element);
@@ -87,6 +88,7 @@ public class NodePropertiesLabelProvider extends LabelProvider implements ITable
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
*/
+ @Override
public Image getColumnImage(Object element, int columnIndex) {
return null;
}
@@ -94,6 +96,7 @@ public class NodePropertiesLabelProvider extends LabelProvider implements ITable
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableColorProvider#getForeground(java.lang.Object, int)
*/
+ @Override
public Color getForeground(Object element, int columnIndex) {
if (element instanceof TableNode && IPeerModelProperties.PROP_LAST_SCANNER_ERROR.equals(((TableNode)element).name)) {
return getParentViewer().getControl().getDisplay().getSystemColor(SWT.COLOR_RED);
@@ -104,6 +107,7 @@ public class NodePropertiesLabelProvider extends LabelProvider implements ITable
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableColorProvider#getBackground(java.lang.Object, int)
*/
+ @Override
public Color getBackground(Object element, int columnIndex) {
return null;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tests/.classpath b/target_explorer/plugins/org.eclipse.tm.te.tests/.classpath
index 2d1a4302f..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tests/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tests/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.tests/.settings/org.eclipse.jdt.core.prefs
index 71083061f..6b9da440d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Thu Jul 07 16:46:03 CEST 2011
+#Mon Oct 03 10:33:20 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tests/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.tests/META-INF/MANIFEST.MF
index 211f03926..bd37534c6 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tests/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.tests/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.ui;bundle-version="3.7.0",
org.junit;bundle-version="4.8.2",
org.eclipse.tm.te.ui.views;bundle-version="1.0.0",
- org.eclipse.tm.te.core;bundle-version="1.0.0",
- org.eclipse.tm.te.core.statushandler;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0",
+ org.eclipse.tm.te.runtime.statushandler;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.tests,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tests/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.tests/plugin.xml
index 4fef8fa87..28d9e9da1 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tests/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tm.te.tests/plugin.xml
@@ -3,7 +3,7 @@
<plugin>
<!-- Test status handler contributions -->
- <extension point="org.eclipse.tm.te.core.statushandler.handlers">
+ <extension point="org.eclipse.tm.te.runtime.statushandler.handlers">
<handler
id="org.eclipse.tm.te.tests.handler1"
class="org.eclipse.tm.te.tests.statushandler.TestStatusHandler">
@@ -15,7 +15,7 @@
</handler>
</extension>
- <extension point="org.eclipse.tm.te.core.statushandler.bindings">
+ <extension point="org.eclipse.tm.te.runtime.statushandler.bindings">
<binding
handlerId="org.eclipse.tm.te.tests.handler1"
id="org.eclipse.tm.te.tests.binding1">
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/CoreTestCase.java b/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/CoreTestCase.java
index 772dccf76..87922ef8d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/CoreTestCase.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/CoreTestCase.java
@@ -72,12 +72,14 @@ public class CoreTestCase extends TestCase {
/* (non-Javadoc)
* @see junit.framework.TestListener#startTest(junit.framework.Test)
*/
+ @Override
public void startTest(Test test) {
}
/* (non-Javadoc)
* @see junit.framework.TestListener#addError(junit.framework.Test, java.lang.Throwable)
*/
+ @Override
public synchronized void addError(Test test, Throwable error) {
if (test != null && error != null) {
// Log the error to the error log.
@@ -94,6 +96,7 @@ public class CoreTestCase extends TestCase {
/* (non-Javadoc)
* @see junit.framework.TestListener#addFailure(junit.framework.Test, junit.framework.AssertionFailedError)
*/
+ @Override
public synchronized void addFailure(Test test, AssertionFailedError failure) {
if (test != null && failure != null) {
// Log the failure to the error log.
@@ -110,6 +113,7 @@ public class CoreTestCase extends TestCase {
/* (non-Javadoc)
* @see junit.framework.TestListener#endTest(junit.framework.Test)
*/
+ @Override
public void endTest(Test test) {
// nothing to do on end test
}
@@ -325,6 +329,7 @@ public class CoreTestCase extends TestCase {
final Exception[] ex = new Exception[1];
display = Display.getDefault();
display.syncExec(new Runnable() {
+ @Override
public void run() {
try {
flushEventQueue();
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/statushandler/StatusHandlerTestCase.java b/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/statushandler/StatusHandlerTestCase.java
index eea069967..2d98c240c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/statushandler/StatusHandlerTestCase.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/statushandler/StatusHandlerTestCase.java
@@ -15,8 +15,8 @@ import java.util.List;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.tm.te.core.statushandler.StatusHandlerManager;
-import org.eclipse.tm.te.core.statushandler.interfaces.IStatusHandler;
+import org.eclipse.tm.te.runtime.statushandler.StatusHandlerManager;
+import org.eclipse.tm.te.runtime.statushandler.interfaces.IStatusHandler;
import org.eclipse.tm.te.tests.CoreTestCase;
import org.eclipse.tm.te.tests.interfaces.IInterruptCondition;
@@ -78,10 +78,12 @@ public class StatusHandlerTestCase extends CoreTestCase {
IInterruptCondition context = new IInterruptCondition() {
+ @Override
public boolean isTrue() {
return false;
}
+ @Override
public void dispose() {
}
};
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/statushandler/TestStatusHandler.java b/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/statushandler/TestStatusHandler.java
index 6a748f4ef..594976b92 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/statushandler/TestStatusHandler.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tests/src/org/eclipse/tm/te/tests/statushandler/TestStatusHandler.java
@@ -10,8 +10,8 @@
package org.eclipse.tm.te.tests.statushandler;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
-import org.eclipse.tm.te.core.statushandler.AbstractStatusHandler;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.statushandler.AbstractStatusHandler;
/**
* Target Explorer: Test status handler implementation.
@@ -19,8 +19,9 @@ import org.eclipse.tm.te.core.statushandler.AbstractStatusHandler;
public class TestStatusHandler extends AbstractStatusHandler {
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.statushandler.interfaces.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, org.eclipse.tm.te.core.interfaces.IPropertiesContainer, org.eclipse.tm.te.core.statushandler.interfaces.IStatusHandler.DoneHandleStatus)
+ * @see org.eclipse.tm.te.runtime.statushandler.interfaces.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, org.eclipse.tm.te.runtime.interfaces.IPropertiesContainer, org.eclipse.tm.te.runtime.statushandler.interfaces.IStatusHandler.DoneHandleStatus)
*/
+ @Override
public void handleStatus(IStatus status, IPropertiesContainer data, DoneHandleStatus done) {
}
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/.classpath b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/.classpath
index 64c5e31b7..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/.settings/org.eclipse.jdt.core.prefs
index 279dcd87c..142926a03 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/.settings/org.eclipse.jdt.core.prefs
@@ -1,82 +1,82 @@
-#Fri Jan 28 10:20:54 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+#Mon Oct 03 10:35:35 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/META-INF/MANIFEST.MF
index f2c14b99e..e17fab28f 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/META-INF/MANIFEST.MF
@@ -9,10 +9,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.resources;bundle-version="3.7.100";resolution:=optional,
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.forms;bundle-version="3.5.100",
- org.eclipse.tm.te.core;bundle-version="1.0.0",
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0",
org.eclipse.tm.te.ui;bundle-version="1.0.0",
org.eclipse.tm.te.ui.swt;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.ui.controls,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseControl.java b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseControl.java
index d2b37c4a5..7b4883bb3 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseControl.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseControl.java
@@ -151,6 +151,7 @@ public class BaseControl extends PlatformObject implements IMessageProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IMessageProvider#getMessage()
*/
+ @Override
public final String getMessage() {
return message;
}
@@ -158,6 +159,7 @@ public class BaseControl extends PlatformObject implements IMessageProvider {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IMessageProvider#getMessageType()
*/
+ @Override
public final int getMessageType() {
return messageType;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseDialogPageControl.java b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseDialogPageControl.java
index ad77bc7ec..630def2ce 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseDialogPageControl.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseDialogPageControl.java
@@ -93,6 +93,7 @@ public class BaseDialogPageControl extends BaseControl implements IRunnableConte
/* (non-Javadoc)
* @see org.eclipse.tm.te.ui.controls.interfaces.IRunnableContextProvider#getRunnableContext()
*/
+ @Override
public IRunnableContext getRunnableContext() {
return getParentPage() instanceof IRunnableContextProvider ? ((IRunnableContextProvider)getParentPage()).getRunnableContext() : null;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseEditBrowseTextControl.java b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseEditBrowseTextControl.java
index 99ee02eb2..65f2438a5 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseEditBrowseTextControl.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/BaseEditBrowseTextControl.java
@@ -782,6 +782,7 @@ public class BaseEditBrowseTextControl extends BaseDialogPageControl implements
editField = new Combo(parent, doAdjustEditFieldControlStyles(style));
if (toolkit != null) toolkit.adapt((Combo)editField);
((Combo)editField).addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
if (!isInitializing) { // do not call this unless the boundaries of the control are calculated yet
SWTControlUtil.setValueToolTip(editField);
@@ -798,6 +799,7 @@ public class BaseEditBrowseTextControl extends BaseDialogPageControl implements
});
// make sure that after resizing a control, the necessity of showing the tool tip is recalculated
((Combo)editField).addPaintListener(new PaintListener() {
+ @Override
public void paintControl(PaintEvent e) {
if (!isInitializing) { // do not call this unless the boundaries of the control are calculated yet
SWTControlUtil.setValueToolTip(editField);
@@ -810,6 +812,7 @@ public class BaseEditBrowseTextControl extends BaseDialogPageControl implements
}
editField = toolkit != null ? toolkit.createText(parent, null, doAdjustEditFieldControlStyles(SWT.BORDER | style)) : new Text(parent, doAdjustEditFieldControlStyles(SWT.BORDER | style));
((Text)editField).addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
if (!isInitializing) { // do not call this unless the boundaries of the control are calculated yet
SWTControlUtil.setValueToolTip(editField);
@@ -818,6 +821,7 @@ public class BaseEditBrowseTextControl extends BaseDialogPageControl implements
});
// make sure that after resizing a control, the necessity of showing the tool tip is recalculated
((Text)editField).addPaintListener(new PaintListener() {
+ @Override
public void paintControl(PaintEvent e) {
if (!isInitializing) { // do not call this unless the boundaries of the control are calculated yet
SWTControlUtil.setValueToolTip(editField);
@@ -1003,6 +1007,7 @@ public class BaseEditBrowseTextControl extends BaseDialogPageControl implements
/* (non-Javadoc)
* @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
*/
+ @Override
public void modifyText(ModifyEvent e) {
// validate the page
IValidatableWizardPage validatable = getValidatableWizardPage();
@@ -1039,12 +1044,14 @@ public class BaseEditBrowseTextControl extends BaseDialogPageControl implements
/* (non-Javadoc)
* @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
*/
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
}
/* (non-Javadoc)
* @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
*/
+ @Override
public void widgetSelected(SelectionEvent e) {
// validate the page
IValidatableWizardPage validatable = getValidatableWizardPage();
@@ -1253,7 +1260,7 @@ public class BaseEditBrowseTextControl extends BaseDialogPageControl implements
}
/* (non-Javadoc)
- * @see com.windriver.ide.target.ui.wizard.WRTMBaseTargetConnectionPageControl#setupPanel(org.eclipse.swt.widgets.Composite)
+ * @see org.eclipse.tm.te.ui.controls.BaseControl#setupPanel(org.eclipse.swt.widgets.Composite)
*/
@Override
public void setupPanel(Composite parent) {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/interfaces/IWizardConfigurationPanel.java b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/interfaces/IWizardConfigurationPanel.java
index 6482b4986..39d7599c1 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/interfaces/IWizardConfigurationPanel.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/interfaces/IWizardConfigurationPanel.java
@@ -13,7 +13,7 @@ import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.swt.events.TypedEvent;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
import org.eclipse.ui.forms.widgets.FormToolkit;
/**
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/net/RemoteHostAddressControl.java b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/net/RemoteHostAddressControl.java
index 398200c64..d258291c8 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/net/RemoteHostAddressControl.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/net/RemoteHostAddressControl.java
@@ -166,6 +166,7 @@ public class RemoteHostAddressControl extends BaseEditBrowseTextControl {
/* (non-Javadoc)
* @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
monitor.setTaskName(getTaskNameCheckNameAddress());
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/panels/AbstractWizardConfigurationPanel.java b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/panels/AbstractWizardConfigurationPanel.java
index a04df3b65..33092e952 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/panels/AbstractWizardConfigurationPanel.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/panels/AbstractWizardConfigurationPanel.java
@@ -49,6 +49,7 @@ public abstract class AbstractWizardConfigurationPanel implements IWizardConfigu
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IMessageProvider#getMessage()
*/
+ @Override
public final String getMessage() {
return message;
}
@@ -56,6 +57,7 @@ public abstract class AbstractWizardConfigurationPanel implements IWizardConfigu
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IMessageProvider#getMessageType()
*/
+ @Override
public final int getMessageType() {
return messageType;
}
@@ -75,6 +77,7 @@ public abstract class AbstractWizardConfigurationPanel implements IWizardConfigu
/* (non-Javadoc)
* @see org.eclipse.tm.te.ui.controls.interfaces.IWizardConfigurationPanel#dispose()
*/
+ @Override
public void dispose() {
}
@@ -90,6 +93,7 @@ public abstract class AbstractWizardConfigurationPanel implements IWizardConfigu
/* (non-Javadoc)
* @see org.eclipse.tm.te.ui.controls.interfaces.IWizardConfigurationPanel#getControl()
*/
+ @Override
public Composite getControl() {
return topControl;
}
@@ -97,24 +101,28 @@ public abstract class AbstractWizardConfigurationPanel implements IWizardConfigu
/* (non-Javadoc)
* @see org.eclipse.tm.te.ui.controls.interfaces.IWizardConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String)
*/
+ @Override
public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) {
}
/* (non-Javadoc)
* @see org.eclipse.tm.te.ui.controls.interfaces.IWizardConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String)
*/
+ @Override
public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) {
}
/* (non-Javadoc)
* @see org.eclipse.tm.te.ui.controls.interfaces.IWizardConfigurationPanel#adjustControlEnablement()
*/
+ @Override
public void adjustControlEnablement() {
}
/* (non-Javadoc)
* @see org.eclipse.tm.te.ui.controls.interfaces.IWizardConfigurationPanel#isValid()
*/
+ @Override
public boolean isValid() {
return true;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/RegexVerifyListener.java b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/RegexVerifyListener.java
index 59dd26430..2f322f86a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/RegexVerifyListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/RegexVerifyListener.java
@@ -68,6 +68,7 @@ public class RegexVerifyListener extends VerifyListener {
* Verify the full text.
* The result is set in <code>e.doit</code>.
*/
+ @Override
public void verifyText(VerifyEvent e) {
e.doit = getFullText(e).matches(regex);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/Validator.java b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/Validator.java
index 9ba894b16..0365b02b8 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/Validator.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/Validator.java
@@ -126,6 +126,7 @@ public abstract class Validator implements IMessageProvider, ICellEditorValidato
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ICellEditorValidator#isValid(java.lang.Object)
*/
+ @Override
public final String isValid(Object newValue) {
String strValue = (newValue != null) ? newValue.toString() : null;
if (!isValid(strValue)) {
@@ -156,6 +157,7 @@ public abstract class Validator implements IMessageProvider, ICellEditorValidato
* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IMessageProvider#getMessage()
*/
+ @Override
public final String getMessage() {
return message;
}
@@ -172,6 +174,7 @@ public abstract class Validator implements IMessageProvider, ICellEditorValidato
* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IMessageProvider#getMessageType()
*/
+ @Override
public final int getMessageType() {
return messageType;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/WorkspaceContainerValidator.java b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/WorkspaceContainerValidator.java
index 5d9e5e97a..b15a25ff6 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/WorkspaceContainerValidator.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.controls/src/org/eclipse/tm/te/ui/controls/validator/WorkspaceContainerValidator.java
@@ -38,7 +38,7 @@ public class WorkspaceContainerValidator extends Validator {
}
/* (non-Javadoc)
- * @see com.windriver.ide.common.ui.validator.WRValidator#isValid(java.lang.String)
+ * @see org.eclipse.tm.te.ui.controls.validator.Validator#isValid(java.lang.String)
*/
@Override
public boolean isValid(String newText) {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/.settings/org.eclipse.jdt.core.prefs
index 10fd2a6b1..8cee7e336 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Fri Sep 30 13:35:40 CEST 2011
+#Mon Oct 03 10:36:51 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/build.properties b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/build.properties
index 1b3820f31..f4ae97015 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/build.properties
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/build.properties
@@ -3,4 +3,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
-jre.compilation.profile = J2SE-1.5
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/CustomFormToolkit.java b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/CustomFormToolkit.java
index d136649e3..4b37de898 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/CustomFormToolkit.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/CustomFormToolkit.java
@@ -170,6 +170,7 @@ public class CustomFormToolkit extends PlatformObject {
/* (non-Javadoc)
* @see org.eclipse.ui.forms.events.IExpansionListener#expansionStateChanged(org.eclipse.ui.forms.events.ExpansionEvent)
*/
+ @Override
public void expansionStateChanged(ExpansionEvent e) {
// Always set the scrolled form to re-flow. Otherwise it wouldn't
// re-arrange the controls following this expandable composite on
@@ -195,6 +196,7 @@ public class CustomFormToolkit extends PlatformObject {
/* (non-Javadoc)
* @see org.eclipse.ui.forms.events.IExpansionListener#expansionStateChanging(org.eclipse.ui.forms.events.ExpansionEvent)
*/
+ @Override
public void expansionStateChanging(ExpansionEvent e) {
}
});
@@ -257,6 +259,7 @@ public class CustomFormToolkit extends PlatformObject {
/* (non-Javadoc)
* @see org.eclipse.ui.forms.events.IExpansionListener#expansionStateChanged(org.eclipse.ui.forms.events.ExpansionEvent)
*/
+ @Override
public void expansionStateChanged(ExpansionEvent e) {
// Always set the scrolled form to re-flow. Otherwise it wouldn't
// re-arrange the controls following this expandable composite on
@@ -282,6 +285,7 @@ public class CustomFormToolkit extends PlatformObject {
/* (non-Javadoc)
* @see org.eclipse.ui.forms.events.IExpansionListener#expansionStateChanging(org.eclipse.ui.forms.events.ExpansionEvent)
*/
+ @Override
public void expansionStateChanging(ExpansionEvent e) {
}
});
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractFormTextSection.java b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractFormTextSection.java
index 56f1970e8..819036412 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractFormTextSection.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractFormTextSection.java
@@ -136,6 +136,7 @@ public abstract class AbstractFormTextSection extends AbstractSection implements
/* (non-Javadoc)
* @see org.eclipse.ui.forms.events.IHyperlinkListener#linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent)
*/
+ @Override
public void linkEntered(HyperlinkEvent e) {
Object container = getManagedForm().getContainer();
if (container instanceof IEditorPart) {
@@ -147,6 +148,7 @@ public abstract class AbstractFormTextSection extends AbstractSection implements
/* (non-Javadoc)
* @see org.eclipse.ui.forms.events.IHyperlinkListener#linkExited(org.eclipse.ui.forms.events.HyperlinkEvent)
*/
+ @Override
public void linkExited(HyperlinkEvent e) {
Object container = getManagedForm().getContainer();
if (container instanceof IEditorPart) {
@@ -158,6 +160,7 @@ public abstract class AbstractFormTextSection extends AbstractSection implements
/* (non-Javadoc)
* @see org.eclipse.ui.forms.events.IHyperlinkListener#linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent)
*/
+ @Override
public void linkActivated(HyperlinkEvent e) {
}
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractSection.java b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractSection.java
index cf791efad..fe5de77f3 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractSection.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractSection.java
@@ -108,6 +108,7 @@ public abstract class AbstractSection extends SectionPart implements IAdaptable
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
return Platform.getAdapterManager().getAdapter(this, adapter);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractStructuredViewerSection.java b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractStructuredViewerSection.java
index ca6dc2218..ed0e7ce4a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractStructuredViewerSection.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractStructuredViewerSection.java
@@ -102,6 +102,7 @@ public abstract class AbstractStructuredViewerSection extends AbstractSection {
// Create and initialize the menu manager
MenuManager manager = new MenuManager();
manager.addMenuListener(new IMenuListener() {
+ @Override
public void menuAboutToShow(IMenuManager manager2) {
fillContextMenu(manager2);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractTableSection.java b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractTableSection.java
index de84a2f7c..1a5bc91b7 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractTableSection.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractTableSection.java
@@ -158,12 +158,14 @@ public abstract class AbstractTableSection extends AbstractStructuredViewerSecti
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
*/
+ @Override
public void doubleClick(DoubleClickEvent event) {
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractTreeSection.java b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractTreeSection.java
index 0f9c10f18..3f157a2e3 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractTreeSection.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/AbstractTreeSection.java
@@ -164,12 +164,14 @@ public abstract class AbstractTreeSection extends AbstractStructuredViewerSectio
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
*/
+ @Override
public void doubleClick(DoubleClickEvent event) {
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/TablePart.java b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/TablePart.java
index 564f7e85a..fe5ae4d0a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/TablePart.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/TablePart.java
@@ -55,11 +55,13 @@ public class TablePart extends AbstractStructuredViewerPart implements ISelectio
Assert.isNotNull(viewer);
viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent e) {
TablePart.this.selectionChanged(e);
}
});
viewer.addDoubleClickListener(new IDoubleClickListener() {
+ @Override
public void doubleClick(DoubleClickEvent e) {
TablePart.this.doubleClick(e);
}
@@ -95,12 +97,14 @@ public class TablePart extends AbstractStructuredViewerPart implements ISelectio
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
*/
+ @Override
public void doubleClick(DoubleClickEvent event) {
}
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/TreePart.java b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/TreePart.java
index 90569787b..e3163d18f 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/TreePart.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.forms/src/org/eclipse/tm/te/ui/forms/parts/TreePart.java
@@ -56,11 +56,13 @@ public class TreePart extends AbstractStructuredViewerPart implements ISelection
Assert.isNotNull(viewer);
viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent e) {
TreePart.this.selectionChanged(e);
}
});
viewer.addDoubleClickListener(new IDoubleClickListener() {
+ @Override
public void doubleClick(DoubleClickEvent e) {
TreePart.this.doubleClick(e);
}
@@ -96,12 +98,14 @@ public class TreePart extends AbstractStructuredViewerPart implements ISelection
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
*/
+ @Override
public void doubleClick(DoubleClickEvent event) {
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/.classpath b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/.classpath
index 2d1a4302f..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/.settings/org.eclipse.jdt.core.prefs
index 724ed72ef..29ceb62ce 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Mon Aug 22 09:20:54 CEST 2011
+#Mon Oct 03 10:37:41 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/META-INF/MANIFEST.MF
index 48aee4244..7363d7405 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.tm.te.ui.swt.activator.UIPlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.ui;bundle-version="3.7.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.ui.jface.dialogs,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/jface/dialogs/CustomTitleAreaDialog.java b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/jface/dialogs/CustomTitleAreaDialog.java
index 642c3d38b..f4c212971 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/jface/dialogs/CustomTitleAreaDialog.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/jface/dialogs/CustomTitleAreaDialog.java
@@ -358,6 +358,7 @@ public class CustomTitleAreaDialog extends TitleAreaDialog implements IMessagePr
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IMessageProvider#getMessageType()
*/
+ @Override
public int getMessageType() {
return errorMessage != null ? IMessageProvider.ERROR : messageType;
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/swt/listener/AbstractCellPaintListener.java b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/swt/listener/AbstractCellPaintListener.java
index 9222f2f7a..cf180d483 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/swt/listener/AbstractCellPaintListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/swt/listener/AbstractCellPaintListener.java
@@ -53,6 +53,7 @@ public abstract class AbstractCellPaintListener implements Listener {
widget.addListener(SWT.MeasureItem, this);
widget.addListener(SWT.PaintItem, this);
widget.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
deregister(e.widget);
}
@@ -74,6 +75,7 @@ public abstract class AbstractCellPaintListener implements Listener {
/* (non-Javadoc)
* @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
*/
+ @Override
public void handleEvent(Event event) {
// Check if the event type is handled.
if (!isHandledEventType(event.type)) {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/swt/widgets/NoteCompositeHelper.java b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/swt/widgets/NoteCompositeHelper.java
index 02979ce83..d6f6deaa7 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/swt/widgets/NoteCompositeHelper.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.swt/src/org/eclipse/tm/te/ui/swt/widgets/NoteCompositeHelper.java
@@ -89,6 +89,7 @@ public class NoteCompositeHelper {
noteLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
final IPropertyChangeListener fontListener = new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
// Note: This is actually wrong but the same as in platforms
// PreferencePage
@@ -99,6 +100,7 @@ public class NoteCompositeHelper {
};
JFaceResources.getFontRegistry().addListener(fontListener);
noteLabel.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent event) {
JFaceResources.getFontRegistry().removeListener(fontListener);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/.classpath b/target_explorer/plugins/org.eclipse.tm.te.ui.views/.classpath
index 64c5e31b7..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.ui.views/.settings/org.eclipse.jdt.core.prefs
index b4d45768d..3b4e92a77 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Fri Sep 30 17:32:57 CEST 2011
+#Mon Oct 03 10:38:31 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.ui.views/META-INF/MANIFEST.MF
index b8a1e2a32..c168b783b 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/META-INF/MANIFEST.MF
@@ -10,10 +10,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.forms;bundle-version="3.5.100",
org.eclipse.ui.navigator;bundle-version="3.5.100",
- org.eclipse.tm.te.core;bundle-version="1.0.0",
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0",
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0",
org.eclipse.tm.te.ui;bundle-version="1.0.0",
org.eclipse.tm.te.ui.forms;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.ui.views,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/ViewsUtil.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/ViewsUtil.java
index 912ee6a0e..87cc14948 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/ViewsUtil.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/ViewsUtil.java
@@ -33,6 +33,7 @@ public class ViewsUtil {
// Create the runnable
Runnable runnable = new Runnable() {
+ @Override
public void run() {
// Check the active workbench window and active page instances
if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null && PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() != null) {
@@ -67,6 +68,7 @@ public class ViewsUtil {
// Create the runnable
Runnable runnable = new Runnable() {
+ @Override
public void run() {
// Check the active workbench window and active page instances
if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null && PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() != null) {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/editor/AbstractEditorPage.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/editor/AbstractEditorPage.java
index 595b9db67..f44d0d855 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/editor/AbstractEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/editor/AbstractEditorPage.java
@@ -14,7 +14,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.tm.te.core.nls.Messages;
+import org.eclipse.tm.te.runtime.nls.Messages;
import org.eclipse.tm.te.ui.views.activator.UIPlugin;
import org.eclipse.tm.te.ui.views.interfaces.IEditorPage;
import org.eclipse.ui.IEditorInput;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/editor/Editor.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/editor/Editor.java
index 5f8ad6556..96707d200 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/editor/Editor.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/editor/Editor.java
@@ -153,6 +153,7 @@ public class Editor extends FormEditor implements IPersistableEditor {
/* (non-Javadoc)
* @see org.eclipse.ui.IPersistableEditor#restoreState(org.eclipse.ui.IMemento)
*/
+ @Override
public void restoreState(IMemento memento) {
// Get the editor specific memento
mementoToRestore = internalGetMemento(memento);
@@ -161,6 +162,7 @@ public class Editor extends FormEditor implements IPersistableEditor {
/* (non-Javadoc)
* @see org.eclipse.ui.IPersistable#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento memento) {
// Get the editor specific memento
memento = internalGetMemento(memento);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/editor/EditorInput.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/editor/EditorInput.java
index 30619a7cc..cdaf7c9ed 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/editor/EditorInput.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/editor/EditorInput.java
@@ -82,6 +82,7 @@ public class EditorInput implements IEditorInput, IPersistableElement {
/* (non-Javadoc)
* @see org.eclipse.ui.IEditorInput#exists()
*/
+ @Override
public boolean exists() {
return node != null;
}
@@ -89,6 +90,7 @@ public class EditorInput implements IEditorInput, IPersistableElement {
/* (non-Javadoc)
* @see org.eclipse.ui.IEditorInput#getImageDescriptor()
*/
+ @Override
public ImageDescriptor getImageDescriptor() {
return UIPlugin.getImageDescriptor(ImageConsts.IMAGE_EDITOR);
}
@@ -96,6 +98,7 @@ public class EditorInput implements IEditorInput, IPersistableElement {
/* (non-Javadoc)
* @see org.eclipse.ui.IEditorInput#getName()
*/
+ @Override
public String getName() {
if (name == null && node != null) {
CommonViewer viewer = getViewer();
@@ -126,6 +129,7 @@ public class EditorInput implements IEditorInput, IPersistableElement {
/* (non-Javadoc)
* @see org.eclipse.ui.IEditorInput#getPersistable()
*/
+ @Override
public IPersistableElement getPersistable() {
// We cannot persist this kind of editor input.
return null;
@@ -134,6 +138,7 @@ public class EditorInput implements IEditorInput, IPersistableElement {
/* (non-Javadoc)
* @see org.eclipse.ui.IPersistableElement#getFactoryId()
*/
+ @Override
public String getFactoryId() {
return null;
}
@@ -141,12 +146,14 @@ public class EditorInput implements IEditorInput, IPersistableElement {
/* (non-Javadoc)
* @see org.eclipse.ui.IPersistable#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento memento) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IEditorInput#getToolTipText()
*/
+ @Override
public String getToolTipText() {
return getName();
}
@@ -154,6 +161,7 @@ public class EditorInput implements IEditorInput, IPersistableElement {
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
if (IPersistableElement.class.isAssignableFrom(adapter)) {
return getPersistable();
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/expressions/EditorPropertyTester.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/expressions/EditorPropertyTester.java
index 02724ff0d..88529ceed 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/expressions/EditorPropertyTester.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/expressions/EditorPropertyTester.java
@@ -23,6 +23,7 @@ public class EditorPropertyTester extends PropertyTester {
/* (non-Javadoc)
* @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
*/
+ @Override
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
if ("hasApplicableEditorBindings".equals(property)) { //$NON-NLS-1$
// Create a fake editor input object
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageBinding.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageBinding.java
index ddb09a8d6..57f22d07d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageBinding.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageBinding.java
@@ -13,7 +13,7 @@ import org.eclipse.core.expressions.Expression;
import org.eclipse.core.expressions.ExpressionConverter;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.tm.te.core.extensions.ExecutableExtension;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtension;
/**
* Target Explorer: Details editor page binding implementation.
@@ -25,7 +25,7 @@ public class EditorPageBinding extends ExecutableExtension {
private Expression expression;
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.ExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+ * @see org.eclipse.tm.te.runtime.extensions.ExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
*/
@Override
public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageBindingExtensionPointManager.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageBindingExtensionPointManager.java
index c32989358..41a9af7d5 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageBindingExtensionPointManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageBindingExtensionPointManager.java
@@ -20,8 +20,8 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.tm.te.core.extensions.AbstractExtensionPointManager;
-import org.eclipse.tm.te.core.extensions.ExecutableExtensionProxy;
+import org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtensionProxy;
import org.eclipse.tm.te.ui.views.activator.UIPlugin;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.ISources;
@@ -54,7 +54,7 @@ public class EditorPageBindingExtensionPointManager extends AbstractExtensionPoi
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.AbstractExtensionPointManager#getExtensionPointId()
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getExtensionPointId()
*/
@Override
protected String getExtensionPointId() {
@@ -62,7 +62,7 @@ public class EditorPageBindingExtensionPointManager extends AbstractExtensionPoi
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.AbstractExtensionPointManager#getConfigurationElementName()
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getConfigurationElementName()
*/
@Override
protected String getConfigurationElementName() {
@@ -70,13 +70,13 @@ public class EditorPageBindingExtensionPointManager extends AbstractExtensionPoi
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.AbstractExtensionPointManager#doCreateExtensionProxy(org.eclipse.core.runtime.IConfigurationElement)
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#doCreateExtensionProxy(org.eclipse.core.runtime.IConfigurationElement)
*/
@Override
protected ExecutableExtensionProxy<EditorPageBinding> doCreateExtensionProxy(IConfigurationElement element) throws CoreException {
return new ExecutableExtensionProxy<EditorPageBinding>(element) {
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.ExecutableExtensionProxy#newInstance()
+ * @see org.eclipse.tm.te.runtime.extensions.ExecutableExtensionProxy#newInstance()
*/
@Override
public EditorPageBinding newInstance() {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageExtensionPointManager.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageExtensionPointManager.java
index 43d85b8f8..e49cfe236 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageExtensionPointManager.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/extensions/EditorPageExtensionPointManager.java
@@ -13,8 +13,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.eclipse.tm.te.core.extensions.AbstractExtensionPointManager;
-import org.eclipse.tm.te.core.extensions.ExecutableExtensionProxy;
+import org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtensionProxy;
import org.eclipse.tm.te.ui.views.interfaces.IEditorPage;
@@ -44,7 +44,7 @@ public class EditorPageExtensionPointManager extends AbstractExtensionPointManag
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.AbstractExtensionPointManager#getExtensionPointId()
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getExtensionPointId()
*/
@Override
protected String getExtensionPointId() {
@@ -52,7 +52,7 @@ public class EditorPageExtensionPointManager extends AbstractExtensionPointManag
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.views.internal.extensions.AbstractExtensionPointManager#getConfigurationElementName()
+ * @see org.eclipse.tm.te.runtime.extensions.AbstractExtensionPointManager#getConfigurationElementName()
*/
@Override
protected String getConfigurationElementName() {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/handler/OpenCommandHandler.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/handler/OpenCommandHandler.java
index 32357bb66..4e7f0e5f2 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/handler/OpenCommandHandler.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/handler/OpenCommandHandler.java
@@ -35,6 +35,7 @@ public class OpenCommandHandler extends AbstractHandler {
/* (non-Javadoc)
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
// The selection is the Target Explorer tree selection
ISelection selection = HandlerUtil.getCurrentSelection(event);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/handler/PropertiesCommandHandler.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/handler/PropertiesCommandHandler.java
index 0e877eae8..cd207b746 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/handler/PropertiesCommandHandler.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/handler/PropertiesCommandHandler.java
@@ -37,6 +37,7 @@ public class PropertiesCommandHandler extends AbstractHandler {
/* (non-Javadoc)
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
// Get the active selection
ISelection selection = HandlerUtil.getCurrentSelection(event);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/listeners/WorkbenchPartListener.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/listeners/WorkbenchPartListener.java
index 3789c8aa0..a3941647d 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/listeners/WorkbenchPartListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/listeners/WorkbenchPartListener.java
@@ -31,36 +31,42 @@ public class WorkbenchPartListener implements IPartListener2 {
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference)
*/
+ @Override
public void partBroughtToTop(IWorkbenchPartReference partRef) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference)
*/
+ @Override
public void partOpened(IWorkbenchPartReference partRef) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference)
*/
+ @Override
public void partClosed(IWorkbenchPartReference partRef) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference)
*/
+ @Override
public void partVisible(IWorkbenchPartReference partRef) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference)
*/
+ @Override
public void partHidden(IWorkbenchPartReference partRef) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference)
*/
+ @Override
public void partActivated(IWorkbenchPartReference partRef) {
if (IUIConstants.ID_EXPLORER.equals(partRef.getId())) {
IWorkbenchPart part = partRef.getPart(false);
@@ -81,6 +87,7 @@ public class WorkbenchPartListener implements IPartListener2 {
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference)
*/
+ @Override
public void partDeactivated(IWorkbenchPartReference partRef) {
if (IUIConstants.ID_EXPLORER.equals(partRef.getId())) {
IWorkbenchPart part = partRef.getPart(false);
@@ -99,6 +106,7 @@ public class WorkbenchPartListener implements IPartListener2 {
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference)
*/
+ @Override
public void partInputChanged(IWorkbenchPartReference partRef) {
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/listeners/WorkbenchWindowListener.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/listeners/WorkbenchWindowListener.java
index ffdd83767..ae8da18b1 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/listeners/WorkbenchWindowListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/internal/listeners/WorkbenchWindowListener.java
@@ -25,18 +25,21 @@ public class WorkbenchWindowListener implements IWindowListener {
/* (non-Javadoc)
* @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void windowActivated(IWorkbenchWindow window) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void windowDeactivated(IWorkbenchWindow window) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void windowClosed(IWorkbenchWindow window) {
// On close, remove all global listeners from the window
if (window != null && window.getPartService() != null) {
@@ -47,6 +50,7 @@ public class WorkbenchWindowListener implements IWindowListener {
/* (non-Javadoc)
* @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void windowOpened(IWorkbenchWindow window) {
// On open, register all global listener to the window
if (window != null && window.getPartService() != null) {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/perspective/PerspectiveFactory.java b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/perspective/PerspectiveFactory.java
index e379e6f42..0745f4121 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/perspective/PerspectiveFactory.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui.views/src/org/eclipse/tm/te/ui/views/perspective/PerspectiveFactory.java
@@ -28,6 +28,7 @@ public class PerspectiveFactory extends PlatformObject implements IPerspectiveFa
/* (non-Javadoc)
* @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
*/
+ @Override
public void createInitialLayout(IPageLayout layout) {
// editor is placed for free
String editorArea = layout.getEditorArea();
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/.classpath b/target_explorer/plugins/org.eclipse.tm.te.ui/.classpath
index 64c5e31b7..8a8f1668c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/.classpath
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tm.te.ui/.settings/org.eclipse.jdt.core.prefs
index df889cbea..ba9ead32a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Fri Sep 30 17:31:02 CEST 2011
+#Mon Oct 03 10:34:35 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -79,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tm.te.ui/META-INF/MANIFEST.MF
index cfe448551..bcaaf2eed 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/META-INF/MANIFEST.MF
@@ -10,10 +10,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.forms;bundle-version="3.5.100",
org.eclipse.help;bundle-version="3.5.100",
- org.eclipse.tm.te.core;bundle-version="1.0.0",
+ org.eclipse.tm.te.runtime;bundle-version="1.0.0",
+ org.eclipse.tm.te.runtime.concurrent;bundle-version="1.0.0",
org.eclipse.tm.te.ui.swt;bundle-version="1.0.0",
org.eclipse.tm.te.ui.forms;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.te.ui,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/plugin.properties b/target_explorer/plugins/org.eclipse.tm.te.ui/plugin.properties
index 24fb4a0f1..02a60ccf5 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/plugin.properties
@@ -25,3 +25,7 @@ Command.category.name=Target Explorer Commands
Command.newWizards.name=New Target
Command.newWizards.description=Open the New target wizard
+
+# ***** Executors / Executor Utility Delegates *****
+
+EclipsePlatformDisplayExecutorUtilDelegate.label=Eclipse Platform Display Executor Utility Delegate
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tm.te.ui/plugin.xml
index 6e211ec59..5fde8f5d2 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/plugin.xml
@@ -56,4 +56,23 @@
sequence="M1+N">
</key>
</extension>
+
+<!-- Executor service contributions -->
+ <extension point="org.eclipse.tm.te.runtime.concurrent.executorServices">
+ <executorService
+ id="org.eclipse.tm.te.ui.executors.platform.display"
+ label="Eclipse Platform Display Executor"
+ class="org.eclipse.tm.te.ui.internal.executors.EclipsePlatformDisplayExecutor">
+ </executorService>
+ </extension>
+
+<!-- Executor utility delegate contributions -->
+ <extension point="org.eclipse.tm.te.runtime.concurrent.executorUtilDelegates">
+ <executorUtilDelegate
+ class="org.eclipse.tm.te.ui.internal.executors.EclipsePlatformDisplayExecutorUtilDelegate"
+ id="org.eclipse.tm.te.ui.executors.delegate.display"
+ label="%EclipsePlatformDisplayExecutorUtilDelegate.label">
+ </executorUtilDelegate>
+ </extension>
+
</plugin>
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/activator/UIPlugin.java
index f69b8616e..27427ba60 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/activator/UIPlugin.java
@@ -14,6 +14,7 @@ import java.net.URL;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.tm.te.runtime.tracing.TraceHandler;
import org.eclipse.tm.te.ui.interfaces.ImageConsts;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -24,6 +25,8 @@ import org.osgi.framework.BundleContext;
public class UIPlugin extends AbstractUIPlugin {
// The shared instance
private static UIPlugin plugin;
+ // The trace handler instance
+ private static TraceHandler traceHandler;
/**
* The constructor
@@ -50,6 +53,18 @@ public class UIPlugin extends AbstractUIPlugin {
return null;
}
+ /**
+ * Returns the bundles trace handler.
+ *
+ * @return The bundles trace handler.
+ */
+ public static TraceHandler getTraceHandler() {
+ if (traceHandler == null) {
+ traceHandler = new TraceHandler(getUniqueIdentifier());
+ }
+ return traceHandler;
+ }
+
/* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/dialogs/RenameDialog.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/dialogs/RenameDialog.java
index f38c90008..22447e6ac 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/dialogs/RenameDialog.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/dialogs/RenameDialog.java
@@ -93,6 +93,7 @@ public class RenameDialog extends CustomTitleAreaDialog {
name.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
name.setText(oldName);
name.addModifyListener(new ModifyListener(){
+ @Override
public void modifyText(ModifyEvent e) {
if (usedNames.contains(name.getText())) {
setButtonEnabled(OK, false);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/events/AbstractEventListener.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/events/AbstractEventListener.java
index 5b502b9d2..245b74776 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/events/AbstractEventListener.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/events/AbstractEventListener.java
@@ -10,8 +10,8 @@
package org.eclipse.tm.te.ui.events;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.tm.te.core.interfaces.events.IEventFireDelegate;
-import org.eclipse.tm.te.core.interfaces.events.IEventListener;
+import org.eclipse.tm.te.runtime.interfaces.events.IEventFireDelegate;
+import org.eclipse.tm.te.runtime.interfaces.events.IEventListener;
import org.eclipse.tm.te.ui.swt.DisplayUtil;
import org.eclipse.ui.PlatformUI;
@@ -22,8 +22,9 @@ import org.eclipse.ui.PlatformUI;
public abstract class AbstractEventListener implements IEventListener, IEventFireDelegate {
/* (non-Javadoc)
- * @see org.eclipse.tm.te.core.interfaces.events.IEventFireDelegate#fire(java.lang.Runnable)
+ * @see org.eclipse.tm.te.runtime.interfaces.events.IEventFireDelegate#fire(java.lang.Runnable)
*/
+ @Override
public void fire(Runnable runnable) {
// Do nothing if no valid runnable is passed
if (runnable == null) return;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/internal/executors/EclipsePlatformDisplayExecutor.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/internal/executors/EclipsePlatformDisplayExecutor.java
new file mode 100644
index 000000000..dcfb218f0
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/internal/executors/EclipsePlatformDisplayExecutor.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.ui.internal.executors;
+
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.IExecutor;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.INestableExecutor;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.ISingleThreadedExecutor;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtension;
+import org.eclipse.tm.te.ui.activator.UIPlugin;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * Eclipse platform display executor implementation utilizing the platform display.
+ */
+public class EclipsePlatformDisplayExecutor extends ExecutableExtension implements IExecutor, ISingleThreadedExecutor, INestableExecutor {
+
+ /* (non-Javadoc)
+ * @see java.util.concurrent.Executor#execute(java.lang.Runnable)
+ */
+ @Override
+ public void execute(Runnable command) {
+ // In case we do have a display, just execute the runnable asynchronously using this display
+ if (PlatformUI.isWorkbenchRunning() &&
+ PlatformUI.getWorkbench() != null && PlatformUI.getWorkbench().getDisplay() != null) {
+ PlatformUI.getWorkbench().getDisplay().asyncExec(command);
+ } else {
+ // Check if the current thread is the display thread
+ Display display = Display.findDisplay(Thread.currentThread());
+ // if we got the display for the riverbed dispatch thread, we can execute the
+ // original runnable now
+ if (display != null) {
+ display.asyncExec(command);
+ } else {
+ // Well, we don't have any display to execute the runnable at.
+ // Drop execution and write a trace message if enabled
+ UIPlugin.getTraceHandler().trace("DROPPED display command invocation. No display instance found.!", 1, this); //$NON-NLS-1$
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.ISingleThreadedExecutor#isExecutorThread()
+ */
+ @Override
+ public boolean isExecutorThread() {
+ return isExecutorThread(Thread.currentThread());
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.ISingleThreadedExecutor#isExecutorThread(java.lang.Thread)
+ */
+ @Override
+ public boolean isExecutorThread(Thread thread) {
+ if (thread != null) {
+ // Find the display for this thread
+ Display display = Display.findDisplay(thread);
+ if (display != null) {
+ return thread.equals(display.getThread());
+ }
+ }
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.INestableExecutor#getMaxDepth()
+ */
+ @Override
+ public int getMaxDepth() {
+ return 1;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.INestableExecutor#readAndExecute()
+ */
+ @Override
+ public boolean readAndExecute() {
+ Display display = Display.getCurrent();
+ if (display != null) {
+ return display.readAndDispatch();
+ }
+ return false;
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/internal/executors/EclipsePlatformDisplayExecutorUtilDelegate.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/internal/executors/EclipsePlatformDisplayExecutorUtilDelegate.java
new file mode 100644
index 000000000..48e51779e
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/internal/executors/EclipsePlatformDisplayExecutorUtilDelegate.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.te.ui.internal.executors;
+
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.tm.te.runtime.concurrent.interfaces.IExecutorUtilDelegate;
+import org.eclipse.tm.te.runtime.extensions.ExecutableExtension;
+
+/**
+ * Eclipse platform display executor utility delegate implementation.
+ */
+public class EclipsePlatformDisplayExecutorUtilDelegate extends ExecutableExtension implements IExecutorUtilDelegate {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.IExecutorUtilDelegate#isHandledExecutorThread()
+ */
+ @Override
+ public boolean isHandledExecutorThread() {
+ return Display.getCurrent() != null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.te.runtime.concurrent.interfaces.IExecutorUtilDelegate#readAndDispatch()
+ */
+ @Override
+ public boolean readAndDispatch() {
+ return Display.getCurrent().readAndDispatch();
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/tables/properties/NodePropertiesTableControl.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/tables/properties/NodePropertiesTableControl.java
index fa0ff0250..77e6ee0a8 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/tables/properties/NodePropertiesTableControl.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/tables/properties/NodePropertiesTableControl.java
@@ -72,6 +72,7 @@ public abstract class NodePropertiesTableControl extends WorkbenchPartControl {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
if (getViewer() != null) {
getViewer().setInput(event.getSelection());
@@ -298,6 +299,7 @@ public abstract class NodePropertiesTableControl extends WorkbenchPartControl {
MenuManager manager = new MenuManager("#PopupMenu"); //$NON-NLS-1$
// Attach the menu listener
manager.addMenuListener(new IMenuListener() {
+ @Override
public void menuAboutToShow(IMenuManager manager) {
manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
}
@@ -354,6 +356,7 @@ public abstract class NodePropertiesTableControl extends WorkbenchPartControl {
toolbar.setCursor(handCursor);
// Cursor needs to be explicitly disposed
toolbar.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
if (handCursor.isDisposed() == false) {
handCursor.dispose();
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/trees/AbstractTreeControl.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/trees/AbstractTreeControl.java
index 3066c6594..3e9036103 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/trees/AbstractTreeControl.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/trees/AbstractTreeControl.java
@@ -193,6 +193,7 @@ public abstract class AbstractTreeControl extends WorkbenchPartControl {
MenuManager manager = new MenuManager("#PopupMenu"); //$NON-NLS-1$
// Attach the menu listener
manager.addMenuListener(new IMenuListener() {
+ @Override
public void menuAboutToShow(IMenuManager manager) {
manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
}
@@ -246,6 +247,7 @@ public abstract class AbstractTreeControl extends WorkbenchPartControl {
toolbar.setCursor(handCursor);
// Cursor needs to be explicitly disposed
toolbar.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
if (handCursor.isDisposed() == false) {
handCursor.dispose();
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/AbstractWizardCommandHandler.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/AbstractWizardCommandHandler.java
index 1ae1288aa..28cc997ff 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/AbstractWizardCommandHandler.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/AbstractWizardCommandHandler.java
@@ -96,6 +96,7 @@ public abstract class AbstractWizardCommandHandler extends AbstractHandler {
/* (non-Javadoc)
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
+ @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event);
if (window != null) {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/interfaces/ISharedDataWizardPage.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/interfaces/ISharedDataWizardPage.java
index 59cf9cbdb..499854a40 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/interfaces/ISharedDataWizardPage.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/interfaces/ISharedDataWizardPage.java
@@ -9,7 +9,7 @@
*******************************************************************************/
package org.eclipse.tm.te.ui.wizards.interfaces;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
/**
* Target Explorer: Public interface for wizard or dialog pages or wizard page
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizard.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizard.java
index 9914e23b3..f79157a5a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizard.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizard.java
@@ -71,6 +71,7 @@ public final class NewWizard extends Wizard implements INewWizard {
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
if (mainPage != null) mainPage.init(workbench, selection);
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizardNode.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizardNode.java
index 4cb141e2a..79269c0b0 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizardNode.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizardNode.java
@@ -55,12 +55,14 @@ import org.eclipse.ui.wizards.IWizardDescriptor;
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardNode#dispose()
*/
+ @Override
public void dispose() {
}
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardNode#getExtent()
*/
+ @Override
public Point getExtent() {
return new Point(-1, -1);
}
@@ -68,6 +70,7 @@ import org.eclipse.ui.wizards.IWizardDescriptor;
/* (non-Javadoc)
* @see org.eclipse.ui.IPluginContribution#getLocalId()
*/
+ @Override
public String getLocalId() {
IPluginContribution contribution = (IPluginContribution)Util.getAdapter(descriptor, IPluginContribution.class);
if (contribution != null) {
@@ -79,6 +82,7 @@ import org.eclipse.ui.wizards.IWizardDescriptor;
/* (non-Javadoc)
* @see org.eclipse.ui.IPluginContribution#getPluginId()
*/
+ @Override
public String getPluginId() {
IPluginContribution contribution = (IPluginContribution) Util.getAdapter(descriptor, IPluginContribution.class);
if (contribution != null) {
@@ -90,6 +94,7 @@ import org.eclipse.ui.wizards.IWizardDescriptor;
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardNode#isContentCreated()
*/
+ @Override
public boolean isContentCreated() {
return wizard != null;
}
@@ -97,6 +102,7 @@ import org.eclipse.ui.wizards.IWizardDescriptor;
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizardNode#getWizard()
*/
+ @Override
public IWizard getWizard() {
if (wizard == null) {
wizard = createWizard(descriptor);
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizardSelectionPage.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizardSelectionPage.java
index 0d93881c7..365a1bc6c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizardSelectionPage.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/newWizard/NewWizardSelectionPage.java
@@ -137,6 +137,7 @@ public class NewWizardSelectionPage extends WizardPage {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout());
@@ -160,11 +161,13 @@ public class NewWizardSelectionPage extends WizardPage {
treeViewer.setComparator(new NewWizardViewerComparator());
treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
onSelectionChanged();
}
});
treeViewer.addDoubleClickListener(new IDoubleClickListener() {
+ @Override
public void doubleClick(DoubleClickEvent event) {
// Double-click on a connection type is triggering the sub wizard
if (event.getSelection() instanceof IStructuredSelection) {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractFormsWizardPage.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractFormsWizardPage.java
index cfbaac1bc..dc1c277c6 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractFormsWizardPage.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractFormsWizardPage.java
@@ -79,6 +79,7 @@ public abstract class AbstractFormsWizardPage extends AbstractWizardPage {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
// Create the form toolkit
toolkit = createFormToolkit(parent.getDisplay());
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractSharedDataWizardPage.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractSharedDataWizardPage.java
index 08a07da25..34030b444 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractSharedDataWizardPage.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractSharedDataWizardPage.java
@@ -10,7 +10,7 @@
package org.eclipse.tm.te.ui.wizards.pages;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer;
+import org.eclipse.tm.te.runtime.interfaces.properties.IPropertiesContainer;
import org.eclipse.tm.te.ui.wizards.interfaces.ISharedDataWizardPage;
/**
@@ -39,26 +39,30 @@ public abstract class AbstractSharedDataWizardPage extends AbstractValidatableWi
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.wizards.interfaces.ISharedDataWizardPage#setupData(org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer)
+ * @see org.eclipse.tm.te.ui.wizards.interfaces.ISharedDataWizardPage#setupData(org.eclipse.tm.te.runtime.interfaces.nodes.IPropertiesContainer)
*/
+ @Override
public void setupData(IPropertiesContainer data) {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.wizards.interfaces.ISharedDataWizardPage#extractData(org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer)
+ * @see org.eclipse.tm.te.ui.wizards.interfaces.ISharedDataWizardPage#extractData(org.eclipse.tm.te.runtime.interfaces.nodes.IPropertiesContainer)
*/
+ @Override
public void extractData(IPropertiesContainer data) {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.wizards.interfaces.ISharedDataWizardPage#initializeData(org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer)
+ * @see org.eclipse.tm.te.ui.wizards.interfaces.ISharedDataWizardPage#initializeData(org.eclipse.tm.te.runtime.interfaces.nodes.IPropertiesContainer)
*/
+ @Override
public void initializeData(IPropertiesContainer data) {
}
/* (non-Javadoc)
- * @see org.eclipse.tm.te.ui.wizards.interfaces.ISharedDataWizardPage#removeData(org.eclipse.tm.te.core.interfaces.nodes.IPropertiesContainer)
+ * @see org.eclipse.tm.te.ui.wizards.interfaces.ISharedDataWizardPage#removeData(org.eclipse.tm.te.runtime.interfaces.nodes.IPropertiesContainer)
*/
+ @Override
public void removeData(IPropertiesContainer data) {
}
}
diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractValidatableWizardPage.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractValidatableWizardPage.java
index b1e614d63..f68edaec6 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractValidatableWizardPage.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/wizards/pages/AbstractValidatableWizardPage.java
@@ -84,6 +84,7 @@ public abstract class AbstractValidatableWizardPage extends AbstractWizardPage i
/* (non-Javadoc)
* @see org.eclipse.tm.te.ui.controls.interfaces.IValidatableDialogPage#validatePage()
*/
+ @Override
public void validatePage() {
if (isValidationInProgress()) return;
setValidationInProgress(true);

Back to the top