1 files changed, 29 insertions, 26 deletions

diff --git a/src/esieequest/controller/Utils.java b/src/esieequest/controller/Utils.java
index 139798c..d45f58c 100644
--- a/src/esieequest/controller/Utils.java
+++ b/src/esieequest/controller/Utils.java
@@ -1,40 +1,43 @@
 package esieequest.controller;
 
-import java.util.Set;
+import java.util.List;
 
+import com.google.common.base.Joiner;
+
+import esieequest.model.Text;
+
+/**
+ * A set of custom utility methods.
+ * 
+ * @author Pacien TRAN-GIRARD
+ */
 public class Utils {
 
         /**
+         * Converts a List<String> into a String with a given prefix, suffix and
+         * placeholder used if the List is empty.
          * 
-         * @param elements
-         *            the elements
+         * @param list
+         *            the List to convert
          * @param prefix
-         *            the prefix of the list
-         * @param emptyText
-         *            the text that will be returned if the Set is empty
-         * @return the list
+         *            the prefix
+         * @param empty
+         *            the placeholder
+         * @param suffix
+         *            the suffix
+         * @return the converted String
          */
-        public static String list(final Set<String> elements, final String prefix, final String emptyText) {
-                if (!elements.isEmpty()) {
-                        return prefix + Utils.buildListString(elements) + ".";
-                }
-                return emptyText;
-        }
+        public static String listToString(final List<String> list, final String prefix, final String empty, final String suffix) {
+                final StringBuilder str = new StringBuilder(prefix);
 
-        /**
-         * Builds a list in the form of a String from a given Set.
-         * 
-         * @param elements
-         *            the Set of Strings
-         * 
-         * @return the list
-         */
-        private static String buildListString(final Set<String> elements) {
-                final StringBuilder list = new StringBuilder();
-                for (final String string : elements) {
-                        list.append(" ").append(string);
+                if (list.isEmpty()) {
+                        str.append(empty);
+                } else {
+                        str.append(Joiner.on(Text.LIST_SEPARATOR.getText()).join(list));
                 }
-                return list.toString();
+                str.append(suffix);
+
+                return str.toString();
         }
 
 }