diff --git a/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/model/EHRComplianceDBDomainKind.java b/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/model/EHRComplianceDBDomainKind.java index 034ac2df8..af8b83911 100644 --- a/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/model/EHRComplianceDBDomainKind.java +++ b/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/model/EHRComplianceDBDomainKind.java @@ -1,8 +1,6 @@ package org.labkey.ehr_compliancedb.model; -import org.jetbrains.annotations.NotNull; import org.labkey.api.data.Container; -import org.labkey.api.exp.property.Domain; import org.labkey.api.gwt.client.model.GWTPropertyDescriptor; import org.labkey.api.query.ExtendedTableDomainKind; import org.labkey.api.security.User; @@ -10,9 +8,7 @@ import org.labkey.data.xml.domainTemplate.DomainTemplateType; import org.labkey.data.xml.domainTemplate.EHRComplianceDBTemplateType; - import java.util.List; -import java.util.Set; public class EHRComplianceDBDomainKind extends ExtendedTableDomainKind { @@ -42,12 +38,6 @@ public String getKindName() return KIND_NAME; } - @Override - public @NotNull Set getReservedPropertyNames(Domain domain, User user) - { - return super.getReservedPropertyNames(domain, user); - } - @Override public boolean matchesTemplateXML(String templateName, DomainTemplateType template, List properties) { diff --git a/ehr/src/org/labkey/ehr/model/EHRDomainKind.java b/ehr/src/org/labkey/ehr/model/EHRDomainKind.java index dc6ccbdea..d755552b1 100644 --- a/ehr/src/org/labkey/ehr/model/EHRDomainKind.java +++ b/ehr/src/org/labkey/ehr/model/EHRDomainKind.java @@ -16,9 +16,7 @@ package org.labkey.ehr.model; -import org.jetbrains.annotations.NotNull; import org.labkey.api.data.Container; -import org.labkey.api.exp.property.Domain; import org.labkey.api.gwt.client.model.GWTPropertyDescriptor; import org.labkey.api.query.ExtendedTableDomainKind; import org.labkey.api.security.User; @@ -26,9 +24,7 @@ import org.labkey.data.xml.domainTemplate.DomainTemplateType; import org.labkey.data.xml.domainTemplate.EHRTemplateType; - import java.util.List; -import java.util.Set; public class EHRDomainKind extends ExtendedTableDomainKind { @@ -63,12 +59,6 @@ public String getKindName() return KIND_NAME; } - @Override - public @NotNull Set getReservedPropertyNames(Domain domain, User user) - { - return super.getReservedPropertyNames(domain, user); - } - @Override public boolean matchesTemplateXML(String templateName, DomainTemplateType template, List properties) {