Changeset 804 for trunk/quest-core-tasktrees/src/main/java/de/ugoe

Timestamp:

09/10/12 16:57:52 (12 years ago)

Author:

pharms

Message:

• grouping is now also possible for complex children such as iterations or sequences, if all of their children operate on the same GUI element. In this case they can be grouped with other task tree nodes operating on the same GUI element.

File:

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

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

@@ -51 +51 @@
                 }
                 else {
-                    handleEventTargetSequence(parent, startingIndex, index - 1, builder,
-                                              nodeFactory, result);
+                    int endIndex = index - 1;
+                    
+                    // only reduce to a sequence, if it is not a sequence with only one child
+                    // or if this child is not a sequence itself
+                    if ((startingIndex != endIndex) ||
+                        (!(parent.getChildren().get(startingIndex) instanceof ISequence)))
+                    {
+                        handleEventTargetSequence
+                            (parent, startingIndex, endIndex, builder, nodeFactory, result);
 
-                    return result;
+                        result.setRuleApplicationStatus
+                            (RuleApplicationStatus.RULE_APPLICATION_FINISHED);
+                        return result;
+                    }
+                    else {
+                        // here a new sequence on a new target begins
+                        startingIndex = index;
+                        currentEventTarget = eventTarget;
+                    }
                 }
             }
@@ -62 +77 @@
 
         if (startingIndex > -1) {
-            if (finalize && (startingIndex > 0)) {
-                handleEventTargetSequence(parent, startingIndex, parent.getChildren().size() - 1,
-                                          builder, nodeFactory, result);
+            int endIndex = parent.getChildren().size() - 1;
+            
+            if (finalize) {
+                // only reduce to a sequence, if it is not a sequence with only one child
+                // or if this child is not a sequence itself
+                if ((startingIndex > 0) &&
+                    ((startingIndex != endIndex) ||
+                     (!(parent.getChildren().get(startingIndex) instanceof ISequence))))
+                {
+                    handleEventTargetSequence
+                        (parent, startingIndex, endIndex, builder, nodeFactory, result);
+                
+                    result.setRuleApplicationStatus(RuleApplicationStatus.RULE_APPLICATION_FINISHED);
+                }
             }
             else {
@@ -85 +111 @@
         }
         else {
-            return null;
+            IEventTarget commonTarget = null;
+            
+            for (ITaskTreeNode child : node.getChildren()) {
+                if (commonTarget == null) {
+                    commonTarget = determineEventTarget(child);
+                }
+                else {
+                    if (!commonTarget.equals(determineEventTarget(child))) {
+                        return null;
+                    }
+                }
+            }
+            
+            return commonTarget;
         }
     }
@@ -110 +149 @@
 
         result.addNewlyCreatedParentNode(sequence);
-        result.setRuleApplicationStatus(RuleApplicationStatus.RULE_APPLICATION_FINISHED);
     }