You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2009/07/14 01:44:46 UTC
svn commit: r793754 - in
/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator:
crossval/recorder/ crossval/storage/ crossval/strategy/ util/
Author: gpetracek
Date: Mon Jul 13 23:44:46 2009
New Revision: 793754
URL: http://svn.apache.org/viewvc?rev=793754&view=rev
Log:
EXTVAL-51 renamed internal class
Added:
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationStorageEntry.java
- copied, changed from r793751, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationEntry.java
Removed:
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationEntry.java
Modified:
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/recorder/CrossValidationUserInputRecorder.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/DefaultProcessedInformationStorage.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationStorage.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationHelper.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalCompareStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalPropertyChainCompareStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/recorder/CrossValidationUserInputRecorder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/recorder/CrossValidationUserInputRecorder.java?rev=793754&r1=793753&r2=793754&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/recorder/CrossValidationUserInputRecorder.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/recorder/CrossValidationUserInputRecorder.java Mon Jul 13 23:44:46 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.extensions.validator.core.recorder.ProcessedInformationRecorder;
import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
-import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorageEntry;
import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorage;
import org.apache.myfaces.extensions.validator.util.CrossValidationUtils;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
@@ -51,7 +51,7 @@
ProcessedInformationStorage processedInformationStorage = CrossValidationUtils
.getOrInitProcessedInformationStorage();
- ProcessedInformationEntry entry;
+ ProcessedInformationStorageEntry entry;
PropertyDetails propertyDetails =
ExtValUtils.getELHelper().getPropertyDetailsOfValueBinding(uiComponent);
@@ -61,7 +61,7 @@
return;
}
- entry = new ProcessedInformationEntry();
+ entry = new ProcessedInformationStorageEntry();
entry.setBean(propertyDetails.getBaseObject());
entry.setConvertedValue(value);
entry.setComponent(uiComponent);
@@ -77,12 +77,12 @@
//for the validation within a complex component e.g. a table
//don't override existing expression (style: #{entry.property}) - make a special mapping
- List<ProcessedInformationEntry> furtherEntries =
+ List<ProcessedInformationStorageEntry> furtherEntries =
processedInformationStorage.getEntry(key).getFurtherEntries();
if (furtherEntries == null)
{
- furtherEntries = new ArrayList<ProcessedInformationEntry>();
+ furtherEntries = new ArrayList<ProcessedInformationStorageEntry>();
processedInformationStorage.getEntry(key).setFurtherEntries(furtherEntries);
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/DefaultProcessedInformationStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/DefaultProcessedInformationStorage.java?rev=793754&r1=793753&r2=793754&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/DefaultProcessedInformationStorage.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/DefaultProcessedInformationStorage.java Mon Jul 13 23:44:46 2009
@@ -31,10 +31,10 @@
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultProcessedInformationStorage implements ProcessedInformationStorage
{
- private Map<String, ProcessedInformationEntry> processedInformationMap =
- new HashMap<String, ProcessedInformationEntry>();
+ private Map<String, ProcessedInformationStorageEntry> processedInformationMap =
+ new HashMap<String, ProcessedInformationStorageEntry>();
- public void setEntry(String key, ProcessedInformationEntry entry)
+ public void setEntry(String key, ProcessedInformationStorageEntry entry)
{
this.processedInformationMap.put(key, entry);
}
@@ -44,7 +44,7 @@
return processedInformationMap.containsKey(key);
}
- public ProcessedInformationEntry getEntry(String key)
+ public ProcessedInformationStorageEntry getEntry(String key)
{
return processedInformationMap.get(key);
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationStorage.java?rev=793754&r1=793753&r2=793754&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationStorage.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationStorage.java Mon Jul 13 23:44:46 2009
@@ -28,9 +28,9 @@
@UsageInformation(API)
public interface ProcessedInformationStorage
{
- void setEntry(String key, ProcessedInformationEntry entry);
+ void setEntry(String key, ProcessedInformationStorageEntry entry);
boolean containsEntry(String key);
- ProcessedInformationEntry getEntry(String key);
+ ProcessedInformationStorageEntry getEntry(String key);
}
Copied: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationStorageEntry.java (from r793751, myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationEntry.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationStorageEntry.java?p2=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationStorageEntry.java&p1=myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationEntry.java&r1=793751&r2=793754&rev=793754&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationEntry.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/ProcessedInformationStorageEntry.java Mon Jul 13 23:44:46 2009
@@ -25,16 +25,13 @@
import java.util.List;
/**
- * normally it should be in the storage package and the name should be ProcessedInformationStorageEntry
- * due to backward compatibility it isn't the case
- * <p/>
* In order to build up a mapping which is used for cross-validation.
*
* @author Gerhard Petracek
* @since 1.x.1
*/
@UsageInformation(UsageCategory.INTERNAL)
-public class ProcessedInformationEntry
+public class ProcessedInformationStorageEntry
{
private Object bean;
private Object convertedValue;
@@ -42,7 +39,7 @@
//for complex components (e.g. a table there are multiple entries with
//the same key (here the el expression #{entry.property})
//however, don't override the previous entry - they arn't the same;
- private List<ProcessedInformationEntry> furtherEntries;
+ private List<ProcessedInformationStorageEntry> furtherEntries;
//just for input components within complex components e.g. dataTable,...
private String clientId;
@@ -89,12 +86,12 @@
this.clientId = clientId;
}
- public List<ProcessedInformationEntry> getFurtherEntries()
+ public List<ProcessedInformationStorageEntry> getFurtherEntries()
{
return furtherEntries;
}
- public void setFurtherEntries(List<ProcessedInformationEntry> furtherEntries)
+ public void setFurtherEntries(List<ProcessedInformationStorageEntry> furtherEntries)
{
this.furtherEntries = furtherEntries;
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationHelper.java?rev=793754&r1=793753&r2=793754&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationHelper.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationHelper.java Mon Jul 13 23:44:46 2009
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.extensions.validator.crossval.strategy;
-import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorageEntry;
import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -34,7 +34,7 @@
{
public static void crossValidateCompareStrategy(AbstractCompareStrategy compareStrategy,
CrossValidationStorageEntry crossValidationStorageEntry,
- ProcessedInformationEntry validationTargetEntry,
+ ProcessedInformationStorageEntry validationTargetEntry,
boolean isModelAwareValidation)
{
if (compareStrategy.isViolation(
@@ -63,7 +63,7 @@
private static void processTargetAfterCrossComponentValidation(
AbstractCompareStrategy compareStrategy,
CrossValidationStorageEntry sourceCrossValidationStorageEntry,
- ProcessedInformationEntry validationTargetEntry)
+ ProcessedInformationStorageEntry validationTargetEntry)
{
CrossValidationStorageEntry targetCrossValidationStorageEntry = new CrossValidationStorageEntry();
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java?rev=793754&r1=793753&r2=793754&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java Mon Jul 13 23:44:46 2009
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.extensions.validator.crossval.strategy;
-import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorageEntry;
import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorage;
@@ -70,7 +70,7 @@
CrossValidationStorage crossValidationStorage,
AbstractCompareStrategy compareStrategy)
{
- ProcessedInformationEntry validationTargetEntry =
+ ProcessedInformationStorageEntry validationTargetEntry =
resolveTargetForCrossComponentValidation(crossValidationStorageEntry, validationTarget);
if(validationTargetEntry != null)
@@ -85,7 +85,7 @@
return true;
}
- private ProcessedInformationEntry resolveTargetForCrossComponentValidation(
+ private ProcessedInformationStorageEntry resolveTargetForCrossComponentValidation(
CrossValidationStorageEntry crossValidationStorageEntry,
ValueBindingExpression validationTarget)
{
@@ -101,7 +101,7 @@
private void processCrossComponentValidation(
AbstractCompareStrategy compareStrategy,
CrossValidationStorageEntry crossValidationStorageEntry,
- ProcessedInformationEntry validationTargetEntry)
+ ProcessedInformationStorageEntry validationTargetEntry)
{
CrossValidationHelper
.crossValidateCompareStrategy(
@@ -116,7 +116,7 @@
FacesContext facesContext = FacesContext.getCurrentInstance();
Object targetValue = ExtValUtils.getELHelper().getValueOfExpression(facesContext, validationTarget);
- ProcessedInformationEntry targetEntry = new ProcessedInformationEntry();
+ ProcessedInformationStorageEntry targetEntry = new ProcessedInformationStorageEntry();
targetEntry.setBean(
ExtValUtils.getELHelper().getValueOfExpression(facesContext, validationTarget.getBaseExpression()));
targetEntry.setConvertedValue(targetValue);
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalCompareStrategy.java?rev=793754&r1=793753&r2=793754&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalCompareStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalCompareStrategy.java Mon Jul 13 23:44:46 2009
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.extensions.validator.crossval.strategy;
-import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorageEntry;
import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorage;
@@ -80,7 +80,7 @@
String sourceKey = resolveSourceKey(crossValidationStorageEntry);
targetKey = sourceKey.substring(0, sourceKey.lastIndexOf(".") + 1) + targetKey;
- ProcessedInformationEntry validationTargetEntry = CrossValidationUtils.resolveValidationTargetEntry(
+ ProcessedInformationStorageEntry validationTargetEntry = CrossValidationUtils.resolveValidationTargetEntry(
processedInformationStorage, targetKey, crossValidationStorageEntry);
if (validationTargetEntry != null && validationTargetEntry.getComponent() != null && !isModelAwareValidation)
@@ -171,7 +171,7 @@
private void processCrossComponentValidation(
AbstractCompareStrategy compareStrategy,
CrossValidationStorageEntry crossValidationStorageEntry,
- ProcessedInformationEntry validationTargetEntry)
+ ProcessedInformationStorageEntry validationTargetEntry)
{
CrossValidationHelper
.crossValidateCompareStrategy(
@@ -183,7 +183,7 @@
CrossValidationStorageEntry crossValidationStorageEntry,
String targetProperty)
{
- ProcessedInformationEntry targetEntry = new ProcessedInformationEntry();
+ ProcessedInformationStorageEntry targetEntry = new ProcessedInformationStorageEntry();
targetEntry.setBean(
crossValidationStorageEntry.getMetaDataEntry()
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalPropertyChainCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalPropertyChainCompareStrategy.java?rev=793754&r1=793753&r2=793754&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalPropertyChainCompareStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalPropertyChainCompareStrategy.java Mon Jul 13 23:44:46 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
-import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorageEntry;
import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorage;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -72,7 +72,7 @@
if (processedInformationStorage.containsEntry(newKey))
{
- ProcessedInformationEntry validationTargetEntry = processedInformationStorage.getEntry(newKey);
+ ProcessedInformationStorageEntry validationTargetEntry = processedInformationStorage.getEntry(newKey);
processCrossComponentValidation(compareStrategy, crossValidationStorageEntry, validationTargetEntry);
}
@@ -88,7 +88,7 @@
private void processCrossComponentValidation(
AbstractCompareStrategy compareStrategy,
CrossValidationStorageEntry crossValidationStorageEntry,
- ProcessedInformationEntry targetInformationEntry)
+ ProcessedInformationStorageEntry targetInformationEntry)
{
if (compareStrategy.isViolation(
crossValidationStorageEntry.getConvertedObject(),
@@ -136,7 +136,7 @@
Object targetValue = getValueOfProperty(newBase, targetKey);
- ProcessedInformationEntry targetEntry = new ProcessedInformationEntry();
+ ProcessedInformationStorageEntry targetEntry = new ProcessedInformationStorageEntry();
targetEntry.setBean(newBase);
targetEntry.setConvertedValue(targetValue);
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java?rev=793754&r1=793753&r2=793754&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java Mon Jul 13 23:44:46 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.validator.util;
import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
-import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorageEntry;
import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorage;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -58,11 +58,11 @@
ExtValUtils.resetStorage(ProcessedInformationStorage.class, ProcessedInformationStorage.class.getName());
}
- public static ProcessedInformationEntry resolveValidationTargetEntry(
+ public static ProcessedInformationStorageEntry resolveValidationTargetEntry(
ProcessedInformationStorage processedInformationStorage,
String targetKey, CrossValidationStorageEntry crossValidationStorageEntry)
{
- ProcessedInformationEntry processedInformationEntry =
+ ProcessedInformationStorageEntry processedInformationEntry =
processedInformationStorage.getEntry(targetKey);
//value not submitted at this request - use model value (validation against the model)
@@ -89,7 +89,7 @@
return processedInformationEntry;
}
- for (ProcessedInformationEntry entry : processedInformationEntry.getFurtherEntries())
+ for (ProcessedInformationStorageEntry entry : processedInformationEntry.getFurtherEntries())
{
if (entry.getBean().equals(targetBean))
{