Changeset 1152 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/CMDperformUsabilityEvaluation.java

Timestamp:

04/08/13 16:50:21 (11 years ago)

Author:

pharms

Message:

• complete refactoring of task tree model with a separation of task models and task instances

File:

• trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/CMDperformUsabilityEvaluation.java (modified) (3 diffs)

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/CMDperformUsabilityEvaluation.java

@@ -20 +20 @@
 
 import de.ugoe.cs.autoquest.CommandHelpers;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.rules.EmptyRuleset;
 import de.ugoe.cs.autoquest.usability.rules.UsabilityResult;
@@ -50 +50 @@
     public void run(List<Object> parameters) {
         String nameOfTaskTree = getTaskTreeParameter(parameters);
-        Optional<ITaskTree> taskTree = getTaskTreeFromDataContainer(nameOfTaskTree);
-        if(taskTree.isPresent()) {
+        Optional<ITaskModel> taskModel = getTaskModelFromDataContainer(nameOfTaskTree);
+        if (taskModel.isPresent()) {
             UsabilityRuleset ruleset = getUsabilityRuleset();
-            UsabilityResult result = UsabilityEvaluator.evaluate(taskTree.get()).using(ruleset);
+            UsabilityResult result = UsabilityEvaluator.evaluate(taskModel.get()).using(ruleset);
             String evaluationResultParameterName = getEvaluationResultParameter(parameters);
             storeUsabilityResultInDataContainer(evaluationResultParameterName, result);
@@ -99 +99 @@
      * @return
      */
-    private Optional<ITaskTree> getTaskTreeFromDataContainer(String nameOfTaskTree) {
+    private Optional<ITaskModel> getTaskModelFromDataContainer(String nameOfTaskTree) {
         Object dataObject = GlobalDataContainer.getInstance().getData(nameOfTaskTree);
         if(dataObject != null) {
-            if(dataObject instanceof ITaskTree) {
-                ITaskTree taskTree = (ITaskTree) dataObject;
+            if(dataObject instanceof ITaskModel) {
+                ITaskModel taskTree = (ITaskModel) dataObject;
                 return Optional.of(taskTree);
             } else {
-                CommandHelpers.objectNotType(nameOfTaskTree, "ITaskTree");
+                CommandHelpers.objectNotType(nameOfTaskTree, "ITaskModel");
                 return Optional.absent();
             }