Changeset 985 for trunk/autoquest-core-tasktrees/src/main

Timestamp:

11/15/12 11:28:05 (12 years ago)

Author:

pharms

Message:

• small bugfix

File:

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

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

@@ -59 +59 @@
                         (!(parent.getChildren().get(startingIndex) instanceof ISequence)))
                     {
-                        handleEventTargetSequence
-                            (parent, startingIndex, endIndex, builder, nodeFactory, result);
+                        handleEventTargetSequence(parent, currentEventTarget, startingIndex,
+                                                  endIndex, builder, nodeFactory, result);
 
                         result.setRuleApplicationStatus
@@ -66 +66 @@
                         return result;
                     }
-                    else {
+                    else if (eventTarget != null) {
                         // here a new sequence on a new target begins
                         startingIndex = index;
                         currentEventTarget = eventTarget;
+                    }
+                    else {
+                        startingIndex = -1;
+                        currentEventTarget = null;
                     }
                 }
@@ -87 +91 @@
                      (!(parent.getChildren().get(startingIndex) instanceof ISequence))))
                 {
-                    handleEventTargetSequence
-                        (parent, startingIndex, endIndex, builder, nodeFactory, result);
+                    handleEventTargetSequence(parent, currentEventTarget, startingIndex, endIndex,
+                                              builder, nodeFactory, result);
                 
                     result.setRuleApplicationStatus(RuleApplicationStatus.RULE_APPLICATION_FINISHED);
@@ -134 +138 @@
      */
     private void handleEventTargetSequence(ITaskTreeNode         parent,
+                                           IEventTarget          target,
                                            int                   startIndex,
                                            int                   endIndex,
@@ -141 +146 @@
     {
         ISequence sequence = nodeFactory.createNewSequence();
+        builder.setDescription(sequence, "interactions on " + target.getStringIdentifier());
 
         for (int i = startIndex; i <= endIndex; i++) {