Changeset 1146 for trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/manager/ComponentManager.java

Timestamp:

04/04/13 16:06:07 (11 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

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/manager/ComponentManager.java (modified) (6 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/manager/ComponentManager.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.tasktrees.manager;
 
-import de.ugoe.cs.autoquest.tasktrees.nodeequality.NodeEqualityRuleManager;
+import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEqualityRuleManager;
 import de.ugoe.cs.autoquest.tasktrees.temporalrelation.TemporalRelationshipRuleManager;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeBuilder;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNodeFactory;
-import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskTreeBuilder;
-import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskTreeNodeFactory;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory;
+import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskFactory;
 
 /**
@@ -37 +37 @@
 
     /** */
-    private NodeEqualityRuleManager nodeEqualityRuleManager;
+    private TaskEqualityRuleManager taskEqualityRuleManager;
 
     /** */
-    private ITaskTreeBuilder taskTreeBuilder;
+    private ITaskBuilder taskBuilder;
 
     /** */
-    private ITaskTreeNodeFactory taskTreeNodeFactory;
+    private ITaskFactory taskFactory;
 
     /**
@@ -55 +55 @@
      *
      */
-    public static NodeEqualityRuleManager getNodeEqualityRuleManager() {
-        return getInstance().nodeEqualityRuleManager;
+    public static TaskEqualityRuleManager getTaskEqualityRuleManager() {
+        return getInstance().taskEqualityRuleManager;
     }
 
@@ -62 +62 @@
      *
      */
-    public static ITaskTreeBuilder getDefaultTaskTreeBuilder() {
-        return getInstance().taskTreeBuilder;
+    public static ITaskBuilder getDefaultTaskBuilder() {
+        return getInstance().taskBuilder;
     }
 
@@ -69 +69 @@
      *
      */
-    public static ITaskTreeNodeFactory getDefaultTaskTreeNodeFactory() {
-        return getInstance().taskTreeNodeFactory;
+    public static ITaskFactory getDefaultTaskFactory() {
+        return getInstance().taskFactory;
     }
 
@@ -95 +95 @@
      */
     private void init() {
-        nodeEqualityRuleManager = new NodeEqualityRuleManager();
-        nodeEqualityRuleManager.init();
+        taskEqualityRuleManager = new TaskEqualityRuleManager();
+        taskEqualityRuleManager.init();
 
-        taskTreeBuilder = new TaskTreeBuilder();
-        taskTreeNodeFactory = new TaskTreeNodeFactory();
+        taskBuilder = new TaskBuilder();
+        taskFactory = new TaskFactory();
 
         temporalRelationshipRuleManager = new TemporalRelationshipRuleManager
-            (nodeEqualityRuleManager, taskTreeNodeFactory, taskTreeBuilder);
+            (taskEqualityRuleManager, taskFactory, taskBuilder);
         temporalRelationshipRuleManager.init();
     }