Improve Name keywords detection

app/src/main/java/fr/iutnantes/miar/dndgenerator/api/donjon/bin/sh/Name.java

@@ -94,15 +94,44 @@ public class Name implements Serializable {
      * @return matched
      */
     public boolean matchWith(List<String> keywords) {
-        boolean[] matched = {false, false};
+        return matchWithSpecie(keywords) && matchWithType(keywords);
+    }
+
+    /**
+     * For check if this Name Generator specie match with list of keywords given
+     * @param keywords : List of String represent keyword used
+     * @return matched
+     */
+    public boolean matchWithSpecie(List<String> keywords) {
+        boolean matched = false;
         for (String keyword: keywords) {
             String word = keyword.trim();
-            if (!matched[0] && specie.equalsIgnoreCase(word))
-                matched[0] = true;
-            if (type != null && !matched[1] && type.equalsIgnoreCase(word))
-                matched[1] = true;
+            if (word.contains(",")) {
+                matched = matchWithType(Arrays.asList(word.split(",")));
+            }
+            if (!matched && specie.equalsIgnoreCase(word))
+                matched = true;
         }
-        return matched[0] && (type == null || matched[1]);
+        return matched;
+    }
+
+    /**
+     * For check if this Name Generator type match with list of keywords given
+     * @param keywords : List of String represent keyword used
+     * @return matched
+     */
+    public boolean matchWithType(List<String> keywords) {
+        boolean matched = type == null;
+        if (type != null)
+            for (String keyword: keywords) {
+                String word = keyword.trim();
+                if (word.contains(",")) {
+                    matched = matchWithType(Arrays.asList(word.split(",")));
+                }
+                if (!matched && type.equalsIgnoreCase(word))
+                    matched = true;
+            }
+        return matched;
     }
 
     /**

app/src/test/java/fr/iutnantes/miar/dndgenerator/api/donjon/bin/sh/NameTest.java

@@ -61,6 +61,9 @@ public class NameTest {
         assertFalse(example.matchWith("Truc", "Bidule"));
         assertTrue(exampleTruc.matchWith("ExAmple", "Truc", "Bidule"));
         assertTrue(exampleTruc.matchWith("  Example", "truc   ", "Bidule"));
+        assertTrue(exampleTruc.matchWith("ExAmple, Truc", "Bidule"));
+        assertTrue(exampleTruc.matchWith("ExAmple", "Truc, Bidule"));
+        assertTrue(exampleTruc.matchWith("ExAmple, Truc, Bidule"));
         assertFalse(exampleTruc.matchWith("Truc", "Bidule"));
         assertFalse(exampleTruc.matchWith("Example", "Bidule"));
     }