DomainKind.getKindReservedPropertyNames

Author: labkey-nicka

elispotassay/src/org/labkey/elispot/query/ElispotAntigenDomainKind.java

@@ -15,13 +15,11 @@
  */
 package org.labkey.elispot.query;
 
-import org.jetbrains.annotations.NotNull;
 import org.labkey.api.assay.AssayDomainKind;
 import org.labkey.api.data.DbScope;
 import org.labkey.api.data.JdbcType;
 import org.labkey.api.data.PropertyStorageSpec;
 import org.labkey.api.exp.property.Domain;
-import org.labkey.api.security.User;
 import org.labkey.elispot.ElispotAssayProvider;
 import org.labkey.elispot.ElispotDataHandler;
 import org.labkey.elispot.ElispotManager;
@@ -86,10 +84,4 @@ public String getStorageSchemaName()
     {
         return ElispotProtocolSchema.ELISPOT_ANTIGEN_SCHEMA_NAME;
     }
-
-    @Override
-    public @NotNull Set<String> getReservedPropertyNames(Domain domain, User user)
-    {
-        return getAssayReservedPropertyNames();
-    }
 }

luminex/src/org/labkey/luminex/LuminexAnalyteDomainKind.java

@@ -24,10 +24,6 @@
 import java.util.List;
 import java.util.Set;
 
-/**
- * User: jeckels
- * Date: Jan 27, 2012
- */
 public class LuminexAnalyteDomainKind extends AssayDomainKind
 {
     private static final Set<String> RESERVED_NAMES;
@@ -58,7 +54,7 @@ public String getKindName()
     }
 
     @Override
-    public @NotNull Set<String> getReservedPropertyNames(Domain domain, User user)
+    protected @NotNull Set<String> getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
     {
         return RESERVED_NAMES;
     }

luminex/src/org/labkey/luminex/LuminexDataDomainKind.java

@@ -27,10 +27,6 @@
 import java.util.Map;
 import java.util.Set;
 
-/**
- * User: jeckels
- * Date: Jan 27, 2012
- */
 public class LuminexDataDomainKind extends AssayDomainKind
 {
     public static final Set<String> RESERVED_NAMES;
@@ -49,6 +45,7 @@ public class LuminexDataDomainKind extends AssayDomainKind
 
         RESERVED_NAMES = DomainUtil.getNamesAndLabels(names);
     }
+
     public LuminexDataDomainKind()
     {
         super(LuminexAssayProvider.ASSAY_DOMAIN_CUSTOM_DATA);
@@ -61,7 +58,7 @@ public String getKindName()
     }
 
     @Override
-    public @NotNull Set<String> getReservedPropertyNames(Domain domain, User user)
+    protected @NotNull Set<String> getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
     {
         return RESERVED_NAMES;
     }

nab/src/org/labkey/nab/query/NabVirusDomainKind.java

@@ -80,7 +80,7 @@ public String getStorageSchemaName()
     }
 
     @Override
-    public @NotNull Set<String> getReservedPropertyNames(Domain domain, User user)
+    protected @NotNull Set<String> getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
     {
         return RESERVED_PROPERTY_NAMES;
     }