← Back to branch summary

~tapaal-contributor/tapaal/cpn-gui-dev

« back to all changes in this revision

Viewing changes to src/dk/aau/cs/model/CPN/Expressions/InequalityExpression.java

  • Committer: ptaankvist at gmail
  • Date: 2020-10-23 12:44:24 UTC
  • Revision ID: ptaankvist@gmail.com-20201023124424-cvlbocv73pdr8qs3
Can now change variables in guard expressions even though it is the same variable on both sides

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dk/aau/cs/model/CPN/Expressions/InequalityExpression.java
31
31
        }
32
32
    }
33
33
    @Override
34
 
    public GuardExpression replace(Expression object1, Expression object2) {
 
34
    public GuardExpression replace(Expression object1, Expression object2,boolean replaceAllInstances) {
35
35
        if (this == object1 && object2 instanceof GuardExpression) {
36
36
            GuardExpression obj2 = (GuardExpression)object2;
37
37
            obj2.setParent(parent);
38
38
            return obj2;
39
39
        }
40
40
        else {
41
 
            left = left.replace(object1, object2);
42
 
            right = right.replace(object1, object2);
 
41
            left = left.replace(object1, object2,replaceAllInstances);
 
42
            right = right.replace(object1, object2,replaceAllInstances);
43
43
            return this;
44
44
        }
45
45
    }
 
46
    @Override
 
47
    public GuardExpression replace(Expression object1, Expression object2){
 
48
        return replace(object1,object2,false);
 
49
    }
46
50
 
47
51
    @Override
48
52
    public ExprValues getValues(ExprValues exprValues) {