WebSVN – eFlore/Applications.cel – Diff – /trunk/src/org/tela_botanica/client/util/MotsClesUtilitaire.java

 	public static boolean estUnePositionAutorisee(TreeNode node, Node parent, String text) {
 		if(parent == null) {
 			parent = node.getParentNode();
+		}
 		text = normaliserChaine(text);
 		Node[] noeudsFreres = parent.getChildNodes();
 		boolean ok = true;
 		for(int i = 0; i <= noeudsFreres.length; i++) {
 			if(noeudsFreres[i] != null) {
-				String cheminFrere = noeudsFreres[i].getPath();
+				String cheminFrere = normaliserChaine(noeudsFreres[i].getPath());
-				String cheminNoeud = node.getPath();
+				String cheminNoeud = normaliserChaine(node.getPath());
-				String texteNoeudfrere = ((String[])noeudsFreres[i].getUserObject())[0];
+				String texteNoeudfrere = normaliserChaine(((String[])noeudsFreres[i].getUserObject())[0]);
-				if(!cheminFrere.equals(cheminNoeud) && text.trim().equals(texteNoeudfrere.trim())) {
+				if(!cheminFrere.equals(cheminNoeud) && text.equals(texteNoeudfrere)) {
 					ok = false;
+				}
+			}
+		}
 		return ok;
+	}
+	public static String normaliserChaine(String chaine) {
+		return supprimerAccents(chaine).toLowerCase().trim();
+	}
+	public static String supprimerAccents(String chaine) {
+	    String s = chaine;
+	    s = s.replaceAll("[èéêë]","e");
+	    s = s.replaceAll("[ûùü]","u");
+	    s = s.replaceAll("[ïî]","i");
+	    s = s.replaceAll("[àâ]","a");
+	    s = s.replaceAll("ô","o");
+	    s = s.replaceAll("[ÈÉÊË]","E");
+	    s = s.replaceAll("[ÛÙÜ]","U");
+	    s = s.replaceAll("[ÏÎ]","I");
+	    s = s.replaceAll("[ÀÂ]","A");
+	    s = s.replaceAll("Ô","O");
+	    return s;
+	}

Subversion Repositories eFlore/Applications.cel

(root)/trunk/src/org/tela_botanica/client/util/MotsClesUtilitaire.java – Rev 2199 → 2231