From 995d63490a878da0905db2e0d3c616be605e527f Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Tue, 27 Oct 2026 19:14:27 -0700
Subject: [PATCH] Move single-module classes out of api into their owning
 modules

---
 .../org/labkey/devtools/ToolsController.java  |  2 +-
 .../collections/ArrayListValuedTreeMap.java   | 37 +++++++++++++++++++
 .../test/components/core/ProjectMenu.java     |  2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 modules/devtools/src/org/labkey/devtools/collections/ArrayListValuedTreeMap.java

diff --git a/modules/devtools/src/org/labkey/devtools/ToolsController.java b/modules/devtools/src/org/labkey/devtools/ToolsController.java
index 1428a52c91..4a0d27b398 100644
--- a/modules/devtools/src/org/labkey/devtools/ToolsController.java
+++ b/modules/devtools/src/org/labkey/devtools/ToolsController.java
@@ -29,7 +29,6 @@
 import org.labkey.api.action.SpringActionController;
 import org.labkey.api.cache.Cache;
 import org.labkey.api.cache.CacheManager;
-import org.labkey.api.collections.ArrayListValuedTreeMap;
 import org.labkey.api.collections.LabKeyCollectors;
 import org.labkey.api.data.BaseColumnInfo;
 import org.labkey.api.data.ColumnInfo;
@@ -70,6 +69,7 @@
 import org.labkey.api.view.NotFoundException;
 import org.labkey.api.view.VBox;
 import org.labkey.api.writer.PrintWriters;
+import org.labkey.devtools.collections.ArrayListValuedTreeMap;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Errors;
 import org.springframework.web.servlet.ModelAndView;
diff --git a/modules/devtools/src/org/labkey/devtools/collections/ArrayListValuedTreeMap.java b/modules/devtools/src/org/labkey/devtools/collections/ArrayListValuedTreeMap.java
new file mode 100644
index 0000000000..2ef1cd61c8
--- /dev/null
+++ b/modules/devtools/src/org/labkey/devtools/collections/ArrayListValuedTreeMap.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2025-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.devtools.collections;
+
+import org.apache.commons.collections4.multimap.AbstractListValuedMap;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeMap;
+
+public class ArrayListValuedTreeMap<K, V> extends AbstractListValuedMap<K, V>
+{
+    public ArrayListValuedTreeMap(Comparator<? super K> comparator)
+    {
+        super(new TreeMap<>(comparator));
+    }
+
+    @Override
+    protected List<V> createCollection()
+    {
+        return new ArrayList<>();
+    }
+}
diff --git a/src/org/labkey/test/components/core/ProjectMenu.java b/src/org/labkey/test/components/core/ProjectMenu.java
index 87d2fec3cf..85b5053213 100644
--- a/src/org/labkey/test/components/core/ProjectMenu.java
+++ b/src/org/labkey/test/components/core/ProjectMenu.java
@@ -34,7 +34,7 @@
 
 /**
  * Wraps the project/folder menu nav in labkey pages
- * Defined in org/labkey/core/project/folderNav.jsp and {@link org.labkey.api.view.menu.FolderMenu}
+ * Defined in org/labkey/core/project/folderNav.jsp and {@link org.labkey.core.view.menu.FolderMenu}
  */
 public class ProjectMenu extends WebDriverComponent<ProjectMenu.ElementCache>
 {