Merge branch 'master' of https://github.com/bculkin2442/bjc-utils2

3 files changed, 8 insertions, 8 deletions

diff --git a/base/src/main/java/bjc/utils/gui/panels/DropdownListPanel.java b/base/src/main/java/bjc/utils/gui/panels/DropdownListPanel.java
index 8f65577..465be02 100644
--- a/base/src/main/java/bjc/utils/gui/panels/DropdownListPanel.java
+++ b/base/src/main/java/bjc/utils/gui/panels/DropdownListPanel.java
@@ -9,7 +9,7 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.ListSelectionModel;
 
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 import bjc.utils.gui.layout.AutosizeLayout;
 import bjc.utils.gui.layout.HLayout;
 
@@ -35,7 +35,7 @@ public class DropdownListPanel extends JPanel {
 	 *                The items to choose from
 	 */
 	public <T> DropdownListPanel(final String type, final DefaultListModel<T> model,
-			final IList<T> choices) {
+			final ListEx<T> choices) {
 		setLayout(new AutosizeLayout());
 
 		final JPanel itemInputPanel = new JPanel();
diff --git a/base/src/main/java/bjc/utils/gui/panels/HolderOutputPanel.java b/base/src/main/java/bjc/utils/gui/panels/HolderOutputPanel.java
index d0b5383..dbf70f0 100644
--- a/base/src/main/java/bjc/utils/gui/panels/HolderOutputPanel.java
+++ b/base/src/main/java/bjc/utils/gui/panels/HolderOutputPanel.java
@@ -4,11 +4,11 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.Timer;
 
-import bjc.data.IHolder;
+import bjc.data.Holder;
 import bjc.utils.gui.layout.HLayout;
 
 /**
- * A panel that outputs a value bound to a {@link IHolder}
+ * A panel that outputs a value bound to a {@link Holder}
  *
  * @author ben
  *
@@ -19,7 +19,7 @@ public class HolderOutputPanel extends JPanel {
 	private Timer updater;
 	private final JLabel value;
 	private final int nDelay;
-	private final IHolder<String> val;
+	private final Holder<String> val;
 
 	/**
 	 * Create a new display panel, backed by a holder
@@ -31,7 +31,7 @@ public class HolderOutputPanel extends JPanel {
 	 * @param nDelay
 	 *                    The delay in ms between value updates
 	 */
-	public HolderOutputPanel(final String lab, final IHolder<String> valueHolder,
+	public HolderOutputPanel(final String lab, final Holder<String> valueHolder,
 			final int nDelay) {
 		this.val = valueHolder;
 		this.nDelay = nDelay;
diff --git a/base/src/main/java/bjc/utils/gui/panels/ListParameterPanel.java b/base/src/main/java/bjc/utils/gui/panels/ListParameterPanel.java
index 3b48309..4ba5a01 100644
--- a/base/src/main/java/bjc/utils/gui/panels/ListParameterPanel.java
+++ b/base/src/main/java/bjc/utils/gui/panels/ListParameterPanel.java
@@ -9,7 +9,7 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.ListSelectionModel;
 
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 import bjc.utils.gui.SimpleJList;
 import bjc.utils.gui.layout.HLayout;
 import bjc.utils.gui.layout.VLayout;
@@ -54,7 +54,7 @@ public class ListParameterPanel<E> extends JPanel {
 	 *                 The default values to put in the list
 	 */
 	public ListParameterPanel(final Supplier<E> add, final Consumer<E> edit,
-			final Consumer<E> remove, final IList<E> defaults) {
+			final Consumer<E> remove, final ListEx<E> defaults) {
 		setLayout(new VLayout(2));
 
 		JList<E> list;