Move single-module classes out of api into their owning modules

flow/src/org/labkey/flow/FlowModule.java

@@ -26,7 +26,6 @@
 import org.labkey.api.exp.api.ExperimentService;
 import org.labkey.api.files.FileContentService;
 import org.labkey.api.files.TableUpdaterFileListener;
-import org.labkey.api.flow.api.FlowService;
 import org.labkey.api.module.FolderTypeManager;
 import org.labkey.api.module.Module;
 import org.labkey.api.module.ModuleContext;
@@ -56,6 +55,7 @@
 import org.labkey.flow.analysis.web.StatisticSpec;
 import org.labkey.flow.analysis.web.SubsetParser;
 import org.labkey.flow.analysis.web.SubsetTests;
+import org.labkey.flow.api.FlowService;
 import org.labkey.flow.controllers.FlowController;
 import org.labkey.flow.controllers.ReportsController;
 import org.labkey.flow.controllers.attribute.AttributeController;

flow/src/org/labkey/flow/FlowServiceImpl.java

@@ -17,21 +17,21 @@
 package org.labkey.flow;
 
 import org.jetbrains.annotations.Nullable;
-import org.labkey.api.data.Container;
-import org.labkey.api.data.SQLFragment;
+import org.labkey.api.data.Container;
+import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.SqlSelector;
 import org.labkey.api.exp.api.ExpData;
-import org.labkey.api.exp.api.ExperimentService;
-import org.labkey.api.flow.api.FlowService;
+import org.labkey.api.exp.api.ExperimentService;
 import org.labkey.api.util.FileUtil;
+import org.labkey.flow.api.FlowService;
 import org.labkey.flow.persist.FlowManager;
 
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-
+
 /**
  * User: matthewb
  * Date: Oct 25, 2010

flow/src/org/labkey/flow/api/FlowService.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010-2026 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.labkey.flow.api;
+
+import org.jetbrains.annotations.Nullable;
+import org.labkey.api.services.ServiceRegistry;
+import org.labkey.api.webdav.WebdavResourceExpDataProvider;
+
+/**
+ * User: matthewb
+ * Date: Oct 25, 2010
+ * Time: 10:18:04 AM
+ */
+public interface FlowService extends WebdavResourceExpDataProvider
+{
+    static @Nullable FlowService get()
+    {
+        return ServiceRegistry.get().getService(FlowService.class);
+    }
+
+    static void setInstance(FlowService impl)
+    {
+        ServiceRegistry.get().registerService(FlowService.class, impl);
+    }
+}

flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java

@@ -32,7 +32,6 @@
 import org.labkey.api.data.Container;
 import org.labkey.api.data.DataRegion;
 import org.labkey.api.data.DisplayColumn;
-import org.labkey.api.data.InputColumn;
 import org.labkey.api.data.JdbcType;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.data.Results;
@@ -55,6 +54,7 @@
 import org.labkey.flow.analysis.model.Workspace;
 import org.labkey.flow.data.FlowFCSFile;
 import org.labkey.flow.data.FlowRun;
+import org.labkey.flow.data.InputColumn;
 import org.labkey.flow.query.FlowSchema;
 import org.labkey.flow.util.KeywordUtil;
 import org.springframework.validation.Errors;

flow/src/org/labkey/flow/controllers/executescript/ScriptOverview.java

@@ -22,7 +22,6 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
-import org.labkey.api.view.Overview;
 import org.labkey.flow.analysis.model.Analysis;
 import org.labkey.flow.analysis.model.CompensationCalculation;
 import org.labkey.flow.analysis.model.Population;
@@ -32,6 +31,7 @@
 import org.labkey.flow.data.FlowProtocolStep;
 import org.labkey.flow.data.FlowRun;
 import org.labkey.flow.data.FlowScript;
+import org.labkey.flow.view.Overview;
 
 import java.util.List;
 

flow/src/org/labkey/flow/data/InputColumn.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2012-2026 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.labkey.flow.data;
+
+import org.labkey.api.data.ColumnInfo;
+import org.labkey.api.data.DataColumn;
+import org.labkey.api.data.RenderContext;
+import org.labkey.api.writer.HtmlWriter;
+
+/**
+ * Renders a bound ColumnInfo as an HTML form input in a grid view.
+ */
+public class InputColumn extends DataColumn
+{
+    public InputColumn(ColumnInfo col)
+    {
+        super(col);
+    }
+
+    @Override
+    public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
+    {
+        renderInputHtml(ctx, out, getInputValue(ctx));
+    }
+
+    @Override
+    public void render(RenderContext ctx, HtmlWriter out)
+    {
+        renderInputHtml(ctx, out, getInputValue(ctx));
+    }
+}