ALF-11518 and ALF-11519: unify separate validation/differences lists and move text generation to Result classes.

ALF-11518: Unify differences and validation results lists
ALF-11519: Move validation/diff result text generation from SchemaBootstrap to result classes.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2011-11-18 18:20:53 +00:00
parent 50ad2d600c
commit 29dadc748a
25 changed files with 554 additions and 167 deletions

View File

@@ -18,8 +18,6 @@
*/
package org.alfresco.util.schemacomp;
import java.util.List;
import org.alfresco.util.schemacomp.model.Schema;
import org.hibernate.dialect.Dialect;
@@ -33,25 +31,39 @@ import org.hibernate.dialect.Dialect;
public class DiffContext
{
private final Dialect dialect;
private final Results differences;
private final List<ValidationResult> validationResults;
private final Results results;
private final Schema referenceSchema;
private final Schema targetSchema;
/**
* Constructor.
*
* @param dialect
* @param differences
* @param results
* @param referenceSchema
* @param targetSchema
*/
public DiffContext(Dialect dialect, Results differences, List<ValidationResult> validationResults,
Schema referenceSchema, Schema targetSchema)
public DiffContext(Dialect dialect, Results results, Schema referenceSchema, Schema targetSchema)
{
this.dialect = dialect;
this.differences = differences;
this.validationResults = validationResults;
this.results = results;
this.referenceSchema = referenceSchema;
this.targetSchema = targetSchema;
}
/**
* Constructor.
*
* @param dialect
* @param referenceSchema
* @param targetSchema
*/
public DiffContext(Dialect dialect, Schema referenceSchema, Schema targetSchema)
{
this(dialect, new Results(), referenceSchema, targetSchema);
}
/**
* @return the dialect
*/
@@ -61,19 +73,11 @@ public class DiffContext
}
/**
* @return the differences
* @return the results of schema comparison: validation failures, differences etc.
*/
public Results getDifferences()
public Results getComparisonResults()
{
return this.differences;
}
/**
* @return the validationResults
*/
public List<ValidationResult> getValidationResults()
{
return this.validationResults;
return this.results;
}
/**