From a2c7425458f645802a352abc4783e0afc73dba13 Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Thu, 3 Dec 2020 19:22:35 -0500
Subject: Adapt to esodata changes

---
 base/src/main/java/bjc/utils/funcutils/CollectorUtils.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'base/src/main/java/bjc/utils/funcutils/CollectorUtils.java')

diff --git a/base/src/main/java/bjc/utils/funcutils/CollectorUtils.java b/base/src/main/java/bjc/utils/funcutils/CollectorUtils.java
index 81313c8..a92c2d1 100644
--- a/base/src/main/java/bjc/utils/funcutils/CollectorUtils.java
+++ b/base/src/main/java/bjc/utils/funcutils/CollectorUtils.java
@@ -2,8 +2,8 @@ package bjc.utils.funcutils;
 
 import java.util.stream.Collector;
 
-import bjc.data.IHolder;
-import bjc.data.IPair;
+import bjc.data.Holder;
+import bjc.data.Pair;
 
 /**
  * Utilities for producing implementations of {@link Collector}
@@ -38,8 +38,8 @@ public class CollectorUtils {
 	 * @return A collector that functions as mentioned above.
 	 */
 	public static <InitialType, AuxType1, AuxType2, FinalType1, FinalType2>
-			Collector<InitialType, IHolder<IPair<AuxType1, AuxType2>>,
-					IPair<FinalType1, FinalType2>>
+			Collector<InitialType, Holder<Pair<AuxType1, AuxType2>>,
+					Pair<FinalType1, FinalType2>>
 			compoundCollect(final Collector<InitialType, AuxType1, FinalType1> first,
 					final Collector<InitialType, AuxType2, FinalType2> second) {
 		return new CompoundCollector<>(first, second);
-- 
cgit v1.2.3