Skip to main content
summaryrefslogtreecommitdiffstats
path: root/dsf
diff options
context:
space:
mode:
authorJonah Graham2015-05-11 14:00:33 -0400
committerJonah Graham2015-05-11 14:00:33 -0400
commit406950d31fecd237c1e61934046186badee79719 (patch)
treedb593b5de0ff40bbfb30786e734e17b37edbad38 /dsf
parent71d0155cafc9c6a9eb7526e456251b7c0088964c (diff)
downloadorg.eclipse.cdt-406950d31fecd237c1e61934046186badee79719.tar.gz
org.eclipse.cdt-406950d31fecd237c1e61934046186badee79719.tar.xz
org.eclipse.cdt-406950d31fecd237c1e61934046186badee79719.zip
Bug 467023 - Minor updates to the DSF Programming Intro
- Add a note about turning pre-processor off so edits made as part of the tutorial are not overwritten - Add missing ConfinedToDsfExecutor for Exercise 4 - Fix typo Change-Id: I790fc2e3f640510a665a9a29a04f20502af7c710 Signed-off-by: Jonah Graham <jonah@kichwacoders.com>
Diffstat (limited to 'dsf')
-rw-r--r--dsf/org.eclipse.cdt.examples.dsf/src_preprocess/org/eclipse/cdt/examples/dsf/dataviewer/DataGeneratorWithExecutor.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/dsf/org.eclipse.cdt.examples.dsf/src_preprocess/org/eclipse/cdt/examples/dsf/dataviewer/DataGeneratorWithExecutor.java b/dsf/org.eclipse.cdt.examples.dsf/src_preprocess/org/eclipse/cdt/examples/dsf/dataviewer/DataGeneratorWithExecutor.java
index d1ee0b542e..5022746f91 100644
--- a/dsf/org.eclipse.cdt.examples.dsf/src_preprocess/org/eclipse/cdt/examples/dsf/dataviewer/DataGeneratorWithExecutor.java
+++ b/dsf/org.eclipse.cdt.examples.dsf/src_preprocess/org/eclipse/cdt/examples/dsf/dataviewer/DataGeneratorWithExecutor.java
@@ -60,7 +60,7 @@ public class DataGeneratorWithExecutor implements IDataGenerator {
// Request objects are used to serialize the interface calls into objects
// which can then be pushed into a queue.
//#ifdef exercises
- // TODO Ecercise 4 - Add an annotationindicating allowed concurrency access
+ // TODO Exercise 4 - Add an annotationindicating allowed concurrency access
// Hint: Request and its subclasses have all their fields declared as final.
//#else
//# @Immutable
@@ -305,7 +305,13 @@ public class DataGeneratorWithExecutor implements IDataGenerator {
},
PROCESSING_DELAY, TimeUnit.MILLISECONDS);
}
-
+
+ //#ifdef exercises
+ // TODO Exercise 4 - Add an annotation (ThreadSafe/ConfinedToDsfExecutor)
+ // indicating allowed thread access to this class/method/member
+ //#else
+//# @ConfinedToDsfExecutor("fExecutor")
+ //#endif
private void doServiceQueue() {
//#ifdef exercises
// TODO Exercise 3 - Add logic to discard cancelled requests from queue.

Back to the top