diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java index 6ac9176..51e9899 100644 --- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java +++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java @@ -8,7 +8,6 @@ import java.util.Set; public class JsonAccessor extends Term { - public JsonAccessor(Symbol symbol) { super(symbol); } @@ -53,10 +52,8 @@ } return value; } - if (json.getChild(0) == null - || (json.getChild(0) instanceof Term && - (((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.null_)) - || ((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.nil))) return null; + if (json.getChild(0) == null || (json.getChild(0) instanceof Term && (((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.null_)) || ((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.nil))) + return null; return getValue((Term) json.getChild(0), key); } } @@ -75,10 +72,8 @@ } return value; } - if (json.getChild(0) == null - || (json.getChild(0) instanceof Term && - (((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.null_)) - || ((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.nil))) return null; + if (json.getChild(0) == null || (json.getChild(0) instanceof Term && (((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.null_)) || ((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.nil))) + return null; return getValue((Term) json.getChild(0), key); } if (json.getSymbol().equals(DataConstraintModel.insert)) { @@ -89,10 +84,8 @@ } return value; } - if (json.getChild(0) == null - || (json.getChild(0) instanceof Term && - (((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.null_)) - || ((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.nil))) return null; + if (json.getChild(0) == null || (json.getChild(0) instanceof Term && (((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.null_)) || ((Term) json.getChild(0)).getSymbol().equals(DataConstraintModel.nil))) + return null; return getValue((Term) json.getChild(0), key); } return new Constant(DataConstraintModel.null_); diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/StateTransitionTerm.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/StateTransitionTerm.java index 65ea95a..2dbb8af 100644 --- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/StateTransitionTerm.java +++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/StateTransitionTerm.java @@ -3,9 +3,7 @@ import models.algebra.Term; public class StateTransitionTerm extends Term { - public StateTransitionTerm(ResourcePath path) { super(path); } - }