Eliminate class-loading deadlock warning in ContainerFilter (#535)

Author: labkey-adam

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java

@@ -340,7 +340,7 @@ protected void applyContainerFilter(ContainerFilter filter)
                 sql.append(super.getFromSQL("X"));
                 sql.append(" ");
 
-                if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
+                if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter())
                 {
                     SQLFragment joinToExpAnnotSql = new SQLFragment("INNER JOIN ");
                     joinToExpAnnotSql.append(PanoramaPublicManager.getTableInfoSubmission(), "s");

panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java

@@ -432,7 +432,7 @@ private ExprColumn getAnnouncementIdCol()
 
         // Add a FK lookup so that we can access the "Modified" etc. columns on the "Announcement" table.
         announcementCol.setFk(QueryForeignKey.from(getUserSchema(),
-                        ContainerFilter.EVERYTHING_UNSAFE) // Announcements are not in the same container. e.g. on PanoramaWeb they are in "/home/support/panorama public requests"
+                        ContainerFilter.getUnsafeEverythingFilter()) // Announcements are not in the same container. e.g. on PanoramaWeb they are in "/home/support/panorama public requests"
                 .schema("announcement")  // Cannot use CommSchemma.getSchemaName() which returns "comm". This only works if we use "announcement".
                                                     // AnnouncementSchema is not part of the LabKey API.
                 .to("Announcement", // Table name cannot be the plural, "Announcements", returned by CommSchema.getInstance().getTableInfoAnnouncements().getName()

panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java

@@ -76,7 +76,7 @@ public SQLFragment getFromSQL(String alias)
         sql.append(super.getFromSQL("X"));
         sql.append(" ");
 
-        if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
+        if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter())
         {
             // Filter on the Container column of the associated ExperimentAnnotations row
             SQLFragment joinToExpAnnotSql = new SQLFragment("INNER JOIN ");

panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java

@@ -57,7 +57,7 @@ public SQLFragment getFromSQL(String alias)
         sql.append(super.getFromSQL(TABLE_ALIAS));
         sql.append(" ");
 
-        if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
+        if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter())
         {
             sql.append(_joinSql.getSQL());
             sql.append(" WHERE ");

panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java

@@ -112,7 +112,7 @@ public SQLFragment getFromSQL(String alias)
         sql.append(super.getFromSQL("X"));
         sql.append(" ");
 
-        if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
+        if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter())
         {
             SQLFragment joinSql = new SQLFragment("INNER JOIN ");
             joinSql.append(PanoramaPublicManager.getTableInfoJournalExperiment(), "je")