Changeset 1146 for trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/taskequality/TaskIdentityRule.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

Location:

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/taskequality

Files:

• . (copied) (copied from trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/nodeequality)
• TaskIdentityRule.java (copied) (copied from trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/nodeequality/NodeIdentityRule.java) (2 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/taskequality/TaskIdentityRule.java

@@ -13 +13 @@
 //   limitations under the License.
 
-package de.ugoe.cs.autoquest.tasktrees.nodeequality;
+package de.ugoe.cs.autoquest.tasktrees.taskequality;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 
 /**
  * <p>
- * This comparison rule returns <code>NodeEquality.IDENTICAL</code> if the comparison of the two
- * task tree nodes using the <code>==</code> operator or the <code>equals</code> method return true.
- * Else it returns null to denote, that it can not compare the nodes.
+ * This comparison rule returns <code>TaskEquality.IDENTICAL</code> if the comparison of the two
+ * tasks using the <code>==</code> operator or the <code>equals</code> method return true.
+ * Else it returns null to denote, that it can not compare the tasks.
  * </p>
  * 
@@ -27 +27 @@
  * @author 2012, last modified by $Author: patrick$
  */
-public class NodeIdentityRule implements NodeComparisonRule {
+public class TaskIdentityRule implements TaskComparisonRule {
 
     /* (non-Javadoc)
-     * @see NodeComparisonRule#isApplicable(ITaskTreeNode, ITaskTreeNode)
+     * @see NodeComparisonRule#isApplicable(ITask, ITask)
      */
     @Override
-    public boolean isApplicable(ITaskTreeNode node1, ITaskTreeNode node2) {
-        return (node1 == node2);
+    public boolean isApplicable(ITask task1, ITask task2) {
+        return (task1 == task2);
     }
 
     /* (non-Javadoc)
-     * @see NodeComparisonRule#areLexicallyEqual(ITaskTreeNode, ITaskTreeNode)
+     * @see NodeComparisonRule#areLexicallyEqual(ITask, ITask)
      */
     @Override
-    public boolean areLexicallyEqual(ITaskTreeNode node1, ITaskTreeNode node2) {
-        return (node1 == node2);
+    public boolean areLexicallyEqual(ITask task1, ITask task2) {
+        return (task1 == task2);
     }
 
     /* (non-Javadoc)
-     * @see NodeComparisonRule#areSyntacticallyEqual(ITaskTreeNode, ITaskTreeNode)
+     * @see NodeComparisonRule#areSyntacticallyEqual(ITask, ITask)
      */
     @Override
-    public boolean areSyntacticallyEqual(ITaskTreeNode node1, ITaskTreeNode node2) {
-        return (node1 == node2);
+    public boolean areSyntacticallyEqual(ITask task1, ITask task2) {
+        return (task1 == task2);
     }
 
     /* (non-Javadoc)
-     * @see NodeComparisonRule#areSemanticallyEqual(ITaskTreeNode, ITaskTreeNode)
+     * @see NodeComparisonRule#areSemanticallyEqual(ITask, ITask)
      */
     @Override
-    public boolean areSemanticallyEqual(ITaskTreeNode node1, ITaskTreeNode node2) {
-        return (node1 == node2);
+    public boolean areSemanticallyEqual(ITask task1, ITask task2) {
+        return (task1 == task2);
     }
 
     /* (non-Javadoc)
-     * @see NodeComparisonRule#compare(ITaskTreeNode, ITaskTreeNode)
+     * @see NodeComparisonRule#compare(ITask, ITask)
      */
     @Override
-    public NodeEquality compare(ITaskTreeNode node1, ITaskTreeNode node2) {
-        if (isApplicable(node1, node2)) {
-            return NodeEquality.IDENTICAL;
+    public TaskEquality compare(ITask task1, ITask task2) {
+        if (isApplicable(task1, task2)) {
+            return TaskEquality.IDENTICAL;
         }
         else {