Remove repeat hyphen

Author: bodom91

src/main/java/ru/mystamps/web/controller/CategoryController.java

@@ -65,6 +65,8 @@ protected void initBinder(WebDataBinder binder) {
 		StringTrimmerEditor editor = new StringTrimmerEditor(false);
 		binder.registerCustomEditor(String.class, "name", editor);
 		binder.registerCustomEditor(String.class, "nameRu", editor);
+		binder.registerCustomEditor(String.class, "name", new CustomCategoryNameEditor());
+		binder.registerCustomEditor(String.class, "nameRu", new CustomCategoryNameEditor());
 	}
 
 	@RequestMapping(Url.ADD_CATEGORY_PAGE)

src/main/java/ru/mystamps/web/controller/CustomCategoryNameEditor.java

@@ -0,0 +1,33 @@
+package ru.mystamps.web.controller;
+
+import java.beans.PropertyEditorSupport;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static ru.mystamps.web.validation.ValidationRules.CATEGORY_REPEAT_HYPHEN_REGEXP;
+
+/**
+ * Created by Максим on 28.08.2016.
+ */
+
+@SuppressWarnings("PMD")
+public class CustomCategoryNameEditor extends PropertyEditorSupport {
+	
+	@Override
+	public void setAsText(String categoryName) throws IllegalArgumentException {
+		
+		Pattern regexpCheck = Pattern.compile(CATEGORY_REPEAT_HYPHEN_REGEXP);
+		Matcher regexpMatch = regexpCheck.matcher(categoryName);
+		
+		if (!regexpMatch.matches()) {
+			
+			setValue(categoryName.replaceAll(CATEGORY_REPEAT_HYPHEN_REGEXP, "-"));
+			
+		} else {
+			
+			setValue(categoryName);
+			
+		}
+	}
+	
+}

src/main/java/ru/mystamps/web/model/AddCategoryForm.java

@@ -36,6 +36,7 @@
 import static ru.mystamps.web.validation.ValidationRules.CATEGORY_NAME_NO_HYPHEN_REGEXP;
 import static ru.mystamps.web.validation.ValidationRules.CATEGORY_NAME_RU_REGEXP;
 
+
 @Getter
 @Setter
 @GroupSequence({

src/main/java/ru/mystamps/web/validation/ValidationRules.java

@@ -41,6 +41,7 @@ public final class ValidationRules {
 	public static final String CATEGORY_NAME_EN_REGEXP = "[- a-zA-Z]+";
 	public static final String CATEGORY_NAME_RU_REGEXP = "[- а-яёА-ЯЁ]+";
 	public static final String CATEGORY_NAME_NO_HYPHEN_REGEXP = "[ \\p{L}]([- \\p{L}]+[ \\p{L}])*";
+	public static final String CATEGORY_REPEAT_HYPHEN_REGEXP = "[-]{2,}";
 
 	public static final int COUNTRY_NAME_MIN_LENGTH = 3;
 	public static final int COUNTRY_NAME_MAX_LENGTH = Db.Country.NAME_LENGTH;