Improve collection types

src/main/java/org/javarosa/core/model/FormDef.java

@@ -687,7 +687,7 @@ public void finalizeTriggerables() throws IllegalStateException {
         // DAGify the triggerables based on dependencies and sort them so that
         // triggerables come only after the triggerables they depend on
         //
-        dagImpl.finalizeTriggerables(getMainInstance(), getEvaluationContext());
+        dagImpl.finalizeTriggerables(getMainInstance());
     }
 
     /**

src/main/java/org/javarosa/core/model/QuickTriggerable.java

@@ -50,18 +50,16 @@ public List<EvaluationResult> apply(FormInstance mainInstance, EvaluationContext
         return triggerable.apply(mainInstance, ec, qualified);
     }
 
-    public List<TreeReference> getTargets() {
+    public Set<TreeReference> getTargets() {
         return triggerable.getTargets();
     }
 
     public boolean contains(Triggerable triggerable) {
         return this.triggerable.equals(triggerable);
     }
 
-    public Triggerable changeContextRefToIntersectWithTriggerable(Triggerable other) {
-        // TODO It's fishy to mutate the Triggerable here. We might prefer to return a copy of the original Triggerable
-        triggerable.changeContextRefToIntersectWithTriggerable(other);
-        return triggerable;
+    public void intersectContextWith(Triggerable other) {
+        triggerable.intersectContextWith(other);
     }
 
     public void setImmediateCascades(Set<QuickTriggerable> deps) {

src/main/java/org/javarosa/core/model/condition/Condition.java

@@ -19,7 +19,6 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.List;
 import java.util.Set;
 import org.javarosa.core.model.QuickTriggerable;
 import org.javarosa.core.model.instance.FormInstance;
@@ -42,7 +41,7 @@ public class Condition extends Triggerable {
     public Condition() {
     }
 
-    protected Condition(XPathConditional expr, TreeReference contextRef, TreeReference originalContextRef, List<TreeReference> targets, Set<QuickTriggerable> immediateCascades, ConditionAction trueAction, ConditionAction falseAction) {
+    protected Condition(XPathConditional expr, TreeReference contextRef, TreeReference originalContextRef, Set<TreeReference> targets, Set<QuickTriggerable> immediateCascades, ConditionAction trueAction, ConditionAction falseAction) {
         super(expr, contextRef, originalContextRef, targets, immediateCascades);
         this.trueAction = trueAction;
         this.falseAction = falseAction;

src/main/java/org/javarosa/core/model/condition/Recalculate.java

@@ -19,7 +19,6 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.List;
 import java.util.Set;
 import org.javarosa.core.model.QuickTriggerable;
 import org.javarosa.core.model.data.IAnswerData;
@@ -41,7 +40,7 @@ public Recalculate() {
 
     }
 
-    protected Recalculate(XPathConditional expr, TreeReference contextRef, TreeReference originalContextRef, List<TreeReference> targets, Set<QuickTriggerable> immediateCascades) {
+    protected Recalculate(XPathConditional expr, TreeReference contextRef, TreeReference originalContextRef, Set<TreeReference> targets, Set<QuickTriggerable> immediateCascades) {
         super(expr, contextRef, originalContextRef, targets, immediateCascades);
     }
 

src/main/java/org/javarosa/core/model/condition/Triggerable.java

@@ -58,7 +58,7 @@ public abstract class Triggerable implements Externalizable {
      * References to all of the (non-contextualized) nodes which should be
      * updated by the result of this triggerable
      */
-    protected List<TreeReference> targets;
+    protected Set<TreeReference> targets;
 
     /**
      * Current reference which is the "Basis" of the trigerrables being evaluated. This is the highest
@@ -79,7 +79,7 @@ protected Triggerable() {
 
     }
 
-    protected Triggerable(XPathConditional expr, TreeReference contextRef, TreeReference originalContextRef, List<TreeReference> targets, Set<QuickTriggerable> immediateCascades) {
+    protected Triggerable(XPathConditional expr, TreeReference contextRef, TreeReference originalContextRef, Set<TreeReference> targets, Set<QuickTriggerable> immediateCascades) {
         this.expr = expr;
         this.targets = targets;
         this.contextRef = contextRef;
@@ -88,11 +88,11 @@ protected Triggerable(XPathConditional expr, TreeReference contextRef, TreeRefer
     }
 
     public static Triggerable condition(XPathConditional expr, ConditionAction trueAction, ConditionAction falseAction, TreeReference contextRef) {
-        return new Condition(expr, contextRef, contextRef, new ArrayList<>(), new HashSet<>(), trueAction, falseAction);
+        return new Condition(expr, contextRef, contextRef, new HashSet<>(), new HashSet<>(), trueAction, falseAction);
     }
 
     public static Triggerable recalculate(XPathConditional expr, TreeReference contextRef) {
-        return new Recalculate(expr, contextRef, contextRef, new ArrayList<>(), new HashSet<>());
+        return new Recalculate(expr, contextRef, contextRef, new HashSet<>(), new HashSet<>());
     }
 
     public abstract Object eval(FormInstance instance, EvaluationContext ec);
@@ -167,12 +167,12 @@ public final List<EvaluationResult> apply(FormInstance mainInstance, EvaluationC
         return affectedNodes;
     }
 
-    public List<TreeReference> getTargets() {
+    public Set<TreeReference> getTargets() {
         return targets;
     }
 
-    public void changeContextRefToIntersectWithTriggerable(Triggerable t) {
-        contextRef = contextRef.intersect(t.contextRef);
+    public void intersectContextWith(Triggerable other) {
+        contextRef = contextRef.intersect(other.contextRef);
     }
 
     public TreeReference getContext() {
@@ -196,9 +196,7 @@ public IConditionExpr getExpr() {
     }
 
     public void addTarget(TreeReference target) {
-        if (targets.indexOf(target) == -1) {
-            targets.add(target);
-        }
+        targets.add(target);
     }
 
     @Override
@@ -242,7 +240,7 @@ public void readExternal(DataInputStream in, PrototypeFactory pf) throws IOExcep
         expr = (XPathConditional) ExtUtil.read(in, new ExtWrapTagged(), pf);
         contextRef = (TreeReference) ExtUtil.read(in, TreeReference.class, pf);
         originalContextRef = (TreeReference) ExtUtil.read(in, TreeReference.class, pf);
-        targets = new ArrayList<>((List<TreeReference>) ExtUtil.read(in, new ExtWrapList(TreeReference.class), pf));
+        targets = new HashSet<>((List<TreeReference>) ExtUtil.read(in, new ExtWrapList(TreeReference.class), pf));
     }
 
     @Override