Changeset 808 for trunk/quest-core-tasktrees/src/main/java

Timestamp:

09/12/12 08:41:06 (12 years ago)

Author:

pharms

Message:

• to make it easier, removed creation of sub selections

File:

• trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/TrackBarSelectionDetectionRule.java (modified) (2 diffs)

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/TrackBarSelectionDetectionRule.java

@@ -123 +123 @@
 
     /**
-   *
-   */
+     *
+     */
     private void addChildIfNecessary(ISelection            parentSelection,
                                      ITaskTreeNode         node,
@@ -134 +134 @@
             ITaskTreeNode child = parentSelection.getChildren().get(i);
 
-            if (child instanceof IEventTask) {
-                // check, if the new node is a variant for the current event task
-                NodeEquality nodeEquality = nodeEqualityRuleManager.applyRules(child, node);
-                if (nodeEquality.isAtLeast(NodeEquality.SEMANTICALLY_EQUAL)) {
-                    // the node is a variant. If it not structurally equal, a new sub-selection for
-                    // the existing and the new node must be created. Otherwise, the new node does
-                    // not need to be added
-                    if (!nodeEquality.isAtLeast(NodeEquality.LEXICALLY_EQUAL)) {
-                        ISelection selection = nodeFactory.createNewSelection();
-                        result.addNewlyCreatedParentNode(selection);
-                        builder.addChild(parentSelection, selection);
-
-                        builder.addChild(selection, child);
-                        builder.addChild(selection, node);
-                        builder.removeChild(parentSelection, child);
-                    }
-
-                    return;
-                }
-            }
-            else if (child instanceof ISelection) {
-                // check, if the new node is a variant for the semantically equal children of the
-                // current
-                // selection
-                boolean addNode = true;
-                for (int j = 0; j < child.getChildren().size(); j++) {
-                    NodeEquality nodeEquality = nodeEqualityRuleManager.applyRules(child, node);
-                    if (!nodeEquality.isAtLeast(NodeEquality.SEMANTICALLY_EQUAL)) {
-                        // the new node is no semantical equivalent of the nodes in the current
-                        // selection - break up
-                        addNode = false;
-                        break;
-                    }
-                    else if (nodeEquality.isAtLeast(NodeEquality.LEXICALLY_EQUAL)) {
-                        addNode = false;
-                        break;
-                    }
-                }
-
-                if (addNode) {
-                    // the node is a semantical equivalent to all the nodes in the existing
-                    // sub-selection
-                    // but it is not structurally identical to either of them. Therefore add it.
-                    builder.addChild((ISelection) child, node);
-                    return;
-                }
+            // check, if the new node is a variant for the current event task
+            NodeEquality nodeEquality = nodeEqualityRuleManager.applyRules(child, node);
+            if (nodeEquality.isAtLeast(NodeEquality.SYNTACTICALLY_EQUAL)) {
+                return;
             }
         }