Changeset 1146 for trunk/autoquest-ui-core

Timestamp:

04/04/13 16:06:07 (12 years ago)

Author:

pharms

Message:

• complete refactoring of task tree model with a separation of task models and task instances
• appropriate adaptation of task tree generation process
• appropriate adaptation of commands and task tree visualization

Location:

trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability

Files:

• CMDevaluateUsability.java (modified) (2 diffs)
• CMDgenerateTaskTree.java (modified) (2 diffs)

trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDevaluateUsability.java

@@ -18 +18 @@
 
 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.UsabilityEvaluationManager;
 import de.ugoe.cs.autoquest.usability.UsabilityEvaluationResult;
@@ -73 +73 @@
             return;
         }
-        if (!(dataObject instanceof ITaskTree)) {
+        if (!(dataObject instanceof ITaskModel)) {
             CommandHelpers.objectNotType(tasktreeName, "ITaskTree");
             return;
         }
 
-        ITaskTree taskTree = (ITaskTree) dataObject;
+        ITaskModel taskTree = (ITaskModel) dataObject;
         
         UsabilityEvaluationResult result =

trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDgenerateTaskTree.java

@@ -22 +22 @@
 import de.ugoe.cs.autoquest.eventcore.Event;
 import de.ugoe.cs.autoquest.tasktrees.manager.TaskTreeManager;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.GlobalDataContainer;
@@ -84 +84 @@
         sequences = (Collection<List<Event>>) dataObject;
         
-        ITaskTree taskTree = new TaskTreeManager().createTaskTree(sequences);
+        ITaskModel taskModel = new TaskTreeManager().createTaskModel(sequences);
         
-        if (GlobalDataContainer.getInstance().addData(tasktreeName, taskTree)) {
+        if (GlobalDataContainer.getInstance().addData(tasktreeName, taskModel)) {
             CommandHelpers.dataOverwritten(sequencesName);
         }