Refactored validate method

Signed-off-by: George Gastaldi <gegastaldi@gmail.com>
forge · Oct 16, 2013 · 776fe92 · 776fe92
1 parent 1cfb185
commit 776fe92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/ui/ui-test-harness/src/main/java/org/jboss/forge/ui/test/impl/command/CommandTesterImpl.java b/ui/ui-test-harness/src/main/java/org/jboss/forge/ui/test/impl/command/CommandTesterImpl.java
@@ -15,7 +15,6 @@
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.ui.CommandExecutionListener;
 import org.jboss.forge.addon.ui.UICommand;
-import org.jboss.forge.addon.ui.UIValidator;
 import org.jboss.forge.addon.ui.input.InputComponent;
 import org.jboss.forge.addon.ui.result.Result;
 import org.jboss.forge.addon.ui.util.InputComponents;
@@ -79,15 +78,7 @@ public List<String> getValidationErrors()
 
       for (InputComponent<?, ?> input : builder.getInputs())
       {
-         UIValidator validator = input.getValidator();
-         if (validator != null)
-         {
-            validator.validate(validationContext);
-         }
-         if (input.isRequired() && InputComponents.getValueFor(input) == null)
-         {
-            validationContext.addValidationError(input, input.getRequiredMessage());
-         }
+         input.validate(validationContext);
       }
 
       currentCommand.validate(validationContext);

diff --git a/ui/ui-test-harness/src/main/java/org/jboss/forge/ui/test/impl/wizard/WizardTesterImpl.java b/ui/ui-test-harness/src/main/java/org/jboss/forge/ui/test/impl/wizard/WizardTesterImpl.java
@@ -16,7 +16,6 @@
 import org.jboss.forge.addon.convert.ConverterFactory;
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.ui.UICommand;
-import org.jboss.forge.addon.ui.UIValidator;
 import org.jboss.forge.addon.ui.input.InputComponent;
 import org.jboss.forge.addon.ui.result.NavigationResult;
 import org.jboss.forge.addon.ui.result.Result;
@@ -225,15 +224,7 @@ private List<String> getValidationErrors(UIBuilderImpl builder)
 
       for (InputComponent<?, ?> input : builder.getInputs())
       {
-         UIValidator validator = input.getValidator();
-         if (validator != null)
-         {
-            validator.validate(validationContext);
-         }
-         if (input.isRequired() && InputComponents.getValueFor(input) == null)
-         {
-            validationContext.addValidationError(input, input.getRequiredMessage());
-         }
+         input.validate(validationContext);
       }
 
       currentWizard.validate(validationContext);