From 275a627719fc2231b16caea41130ff09f0f2b6a1 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Fri, 8 Apr 2016 13:28:09 -0400
Subject: Switch functional data to use interfaces

---
 .../src/main/java/bjc/utils/gui/ExtensionFileFilter.java       | 10 +++-------
 BJC-Utils2/src/main/java/bjc/utils/gui/ListParameterPanel.java |  4 ++--
 .../src/main/java/bjc/utils/gui/awt/ExtensionFileFilter.java   | 10 +++-------
 3 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'BJC-Utils2/src/main/java/bjc/utils/gui')

diff --git a/BJC-Utils2/src/main/java/bjc/utils/gui/ExtensionFileFilter.java b/BJC-Utils2/src/main/java/bjc/utils/gui/ExtensionFileFilter.java
index e563530..766b241 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/gui/ExtensionFileFilter.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/gui/ExtensionFileFilter.java
@@ -2,10 +2,10 @@ package bjc.utils.gui;
 
 import java.io.File;
 import javax.swing.filechooser.FileFilter;
-import java.util.ArrayList;
 import java.util.List;
 
 import bjc.utils.funcdata.FunctionalList;
+import bjc.utils.funcdata.IFunctionalList;
 
 /**
  * A file filter based on extensions.
@@ -19,7 +19,7 @@ public class ExtensionFileFilter extends FileFilter {
 	/**
 	 * The list holding all filtered extensions
 	 */
-	private FunctionalList<String> extensions;
+	private IFunctionalList<String> extensions;
 
 	/**
 	 * Create a new filter only showing files with the specified
@@ -40,11 +40,7 @@ public class ExtensionFileFilter extends FileFilter {
 	 *            The extensions to show in this filter.
 	 */
 	public ExtensionFileFilter(String... exts) {
-		extensions = new FunctionalList<>(new ArrayList<>(exts.length));
-
-		for (String extension : exts) {
-			extensions.add(extension);
-		}
+		extensions = new FunctionalList<>(exts);
 	}
 
 	@Override
diff --git a/BJC-Utils2/src/main/java/bjc/utils/gui/ListParameterPanel.java b/BJC-Utils2/src/main/java/bjc/utils/gui/ListParameterPanel.java
index 4bbe6e7..26a5a78 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/gui/ListParameterPanel.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/gui/ListParameterPanel.java
@@ -9,7 +9,7 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.ListSelectionModel;
 
-import bjc.utils.funcdata.FunctionalList;
+import bjc.utils.funcdata.IFunctionalList;
 import bjc.utils.gui.layout.HLayout;
 import bjc.utils.gui.layout.VLayout;
 
@@ -54,7 +54,7 @@ public class ListParameterPanel<E> extends JPanel {
 	 */
 	public ListParameterPanel(Supplier<E> addAction,
 			Consumer<E> editAction, Consumer<E> removeAction,
-			FunctionalList<E> defaultValues) {
+			IFunctionalList<E> defaultValues) {
 		setLayout(new VLayout(2));
 
 		JList<E> list;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/gui/awt/ExtensionFileFilter.java b/BJC-Utils2/src/main/java/bjc/utils/gui/awt/ExtensionFileFilter.java
index 7e2c2d2..230b768 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/gui/awt/ExtensionFileFilter.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/gui/awt/ExtensionFileFilter.java
@@ -2,10 +2,10 @@ package bjc.utils.gui.awt;
 
 import java.io.File;
 import java.io.FilenameFilter;
-import java.util.ArrayList;
 import java.util.List;
 
 import bjc.utils.funcdata.FunctionalList;
+import bjc.utils.funcdata.IFunctionalList;
 
 /**
  * Filter a set of filenames by extension.
@@ -19,7 +19,7 @@ public class ExtensionFileFilter implements FilenameFilter {
 	/**
 	 * The list of extensions to filter
 	 */
-	private FunctionalList<String> extensions;
+	private IFunctionalList<String> extensions;
 
 	/**
 	 * Create a new filter only showing files with the specified
@@ -44,11 +44,7 @@ public class ExtensionFileFilter implements FilenameFilter {
 	 *            The extensions to show in this filter.
 	 */
 	public ExtensionFileFilter(String... exts) {
-		extensions = new FunctionalList<>(new ArrayList<>(exts.length));
-
-		for (String extension : exts) {
-			extensions.add(extension);
-		}
+		extensions = new FunctionalList<>(exts);
 	}
 
 	@Override
-- 
cgit v1.2.3