diff --git a/hl7templates/gocmodel-jar/src/main/java/net/ihe/gazelle/goc/common/utils/XSITypeOCL.java b/hl7templates/gocmodel-jar/src/main/java/net/ihe/gazelle/goc/common/utils/XSITypeOCL.java index 58e1b52587082611792562dff15f7f92bfb969d2..dccc26fef07dd2c84f2e1c08a9aa447402e41701 100644 --- a/hl7templates/gocmodel-jar/src/main/java/net/ihe/gazelle/goc/common/utils/XSITypeOCL.java +++ b/hl7templates/gocmodel-jar/src/main/java/net/ihe/gazelle/goc/common/utils/XSITypeOCL.java @@ -3,18 +3,18 @@ package net.ihe.gazelle.goc.common.utils; public class XSITypeOCL extends XPATHOCLRule { private String type; - private Boolean note; + private Boolean negativeOperation; - public XSITypeOCL(OperationKind operationKind ,Boolean note, String type) { + public XSITypeOCL(OperationKind operationKind , Boolean negativeOperation, String type) { super(operationKind); this.type = type; - this.note = note; + this.negativeOperation = negativeOperation; } - public XSITypeOCL(OperationKind operation, Boolean note, String type, String content) { + public XSITypeOCL(OperationKind operation, Boolean negativeOperation, String type, String content) { super(operation, content); this.type = type; - this.note = note; + this.negativeOperation = negativeOperation; } public XSITypeOCL() {} @@ -27,11 +27,11 @@ public class XSITypeOCL extends XPATHOCLRule { this.type = type; } - public Boolean isNote() { - return note; + public Boolean isNegativeOperation() { + return negativeOperation; } - public void setNote(Boolean note) { - this.note = note; + public void setNegativeOperation(Boolean negativeOperation) { + this.negativeOperation = negativeOperation; } } diff --git a/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/AssertAnalyzer.java b/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/AssertAnalyzer.java index 40fd7e447025d949b127c03a05f7d51bf3d8968b..ea0fc000865159bffb9221feab123792d832f357 100644 --- a/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/AssertAnalyzer.java +++ b/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/AssertAnalyzer.java @@ -420,7 +420,7 @@ public class AssertAnalyzer extends AssertProcessorImpl { :" "+xpathoclRule.getOperation().getValue()+" "; if(group.getRules().get(i) instanceof XSITypeOCL){ XSITypeOCL xsiTypeOCL = (XSITypeOCL)xpathoclRule; - String not = xsiTypeOCL.isNote()?"not(":""; + String not = xsiTypeOCL.isNegativeOperation()?"not(":""; String closingNot = not.equals("not(")?")":""; String formattedType = xsiTypeOCL.getType().replace("_",""); subRule = prefix+"->forAll("+not+"oclIsKindOf("+formattedType+")"