From 3819027f642df549622c478331391ad3a25a9c4f Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Sun, 12 Apr 2020 13:11:11 -0400
Subject: Finish esodata extraction

Finished extracting the old version of esodata, and fixed all the local
issues
---
 base/src/main/java/bjc/utils/ioutils/RegexStringEditor.java      | 6 +++---
 base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java  | 6 +++---
 base/src/main/java/bjc/utils/ioutils/RuleBasedReaderPragmas.java | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'base/src/main/java/bjc/utils/ioutils')

diff --git a/base/src/main/java/bjc/utils/ioutils/RegexStringEditor.java b/base/src/main/java/bjc/utils/ioutils/RegexStringEditor.java
index de46cbf..83672e6 100644
--- a/base/src/main/java/bjc/utils/ioutils/RegexStringEditor.java
+++ b/base/src/main/java/bjc/utils/ioutils/RegexStringEditor.java
@@ -7,9 +7,9 @@ import java.util.regex.Pattern;
 
 import bjc.data.Toggle;
 import bjc.data.ValueToggle;
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.IList;
-import bjc.utils.functypes.ID;
+import bjc.funcdata.FunctionalList;
+import bjc.funcdata.IList;
+import bjc.functypes.ID;
 
 /**
  * Editor methods for strings based off the command language for the Sam editor.
diff --git a/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java b/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java
index c9ac659..2ee25d1 100644
--- a/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java
+++ b/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java
@@ -11,9 +11,9 @@ import bjc.data.IPair;
 import bjc.data.Identity;
 import bjc.data.Pair;
 import bjc.utils.exceptions.UnknownPragmaException;
-import bjc.utils.funcdata.FunctionalMap;
-import bjc.utils.funcdata.FunctionalStringTokenizer;
-import bjc.utils.funcdata.IMap;
+import bjc.funcdata.FunctionalMap;
+import bjc.funcdata.FunctionalStringTokenizer;
+import bjc.funcdata.IMap;
 
 /**
  * This class parses a rules based config file, and uses it to drive a provided
diff --git a/base/src/main/java/bjc/utils/ioutils/RuleBasedReaderPragmas.java b/base/src/main/java/bjc/utils/ioutils/RuleBasedReaderPragmas.java
index 5d19337..7e7550e 100644
--- a/base/src/main/java/bjc/utils/ioutils/RuleBasedReaderPragmas.java
+++ b/base/src/main/java/bjc/utils/ioutils/RuleBasedReaderPragmas.java
@@ -3,7 +3,7 @@ package bjc.utils.ioutils;
 import java.util.function.BiConsumer;
 
 import bjc.utils.exceptions.PragmaFormatException;
-import bjc.utils.funcdata.FunctionalStringTokenizer;
+import bjc.funcdata.FunctionalStringTokenizer;
 import bjc.utils.funcutils.ListUtils;
 
 /**
-- 
cgit v1.2.3