Author: kwin Date: Wed Apr 12 06:33:59 2017 New Revision: 1791074 URL: http://svn.apache.org/viewvc?rev=1791074&view=rev Log: SLING-6776 ValidationContextImpl -> ValidatorContextImpl
Added: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidatorContextImpl.java - copied, changed from r1790239, sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationContextImpl.java Removed: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationContextImpl.java Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java?rev=1791074&r1=1791073&r2=1791074&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java Wed Apr 12 06:33:59 2017 @@ -392,7 +392,7 @@ public class ValidationServiceImpl imple @SuppressWarnings({ "rawtypes", "unchecked" }) private void validateValue(CompositeValidationResult result, @Nonnull Object value, String property, String relativePath, @Nonnull ValueMap valueMap, Resource resource, @Nonnull Validator validator, ValueMap validatorParameters, @Nonnull ResourceBundle defaultResourceBundle, int severity) { try { - ValidatorContext validationContext = new ValidationContextImpl(relativePath + property, severity, valueMap, resource, defaultResourceBundle); + ValidatorContext validationContext = new ValidatorContextImpl(relativePath + property, severity, valueMap, resource, defaultResourceBundle); ValidationResult validatorResult = ((Validator)validator).validate(value, validationContext, validatorParameters); result.addValidationResult(validatorResult); } catch (SlingValidationException e) { Copied: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidatorContextImpl.java (from r1790239, sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationContextImpl.java) URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidatorContextImpl.java?p2=sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidatorContextImpl.java&p1=sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationContextImpl.java&r1=1790239&r2=1791074&rev=1791074&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationContextImpl.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidatorContextImpl.java Wed Apr 12 06:33:59 2017 @@ -27,7 +27,7 @@ import org.apache.sling.api.resource.Res import org.apache.sling.api.resource.ValueMap; import org.apache.sling.validation.spi.ValidatorContext; -public class ValidationContextImpl implements ValidatorContext { +public class ValidatorContextImpl implements ValidatorContext { private final @Nonnull String location; private final int severity; @@ -35,7 +35,7 @@ public class ValidationContextImpl imple private final Resource resource; private final @Nonnull ResourceBundle defaultResourceBundle; - public ValidationContextImpl(@Nonnull String location, int severity, @Nonnull ValueMap valueMap, Resource resource, @Nonnull ResourceBundle defaultResourceBundle) { + public ValidatorContextImpl(@Nonnull String location, int severity, @Nonnull ValueMap valueMap, Resource resource, @Nonnull ResourceBundle defaultResourceBundle) { super(); this.location = location; this.severity = severity;