inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DiffModelTest failures (fallout from r18790)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-02-24 10:13:10 +00:00
parent fa49dfc944
commit 277b13c91c
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/repo/dictionary/M2ClassDefinition.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2009 Alfresco Software Limited. * Copyright (C) 2005-2010 Alfresco Software Limited.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@@ -521,7 +521,7 @@ import org.alfresco.util.EqualsHelper;
} }
// check name - cannot be null // check name - cannot be null
if (! name.equals(classDef.getName())) if (! getName().equals(classDef.getName()))
{ {
isUpdated = true; isUpdated = true;
} }
@@ -539,9 +539,9 @@ import org.alfresco.util.EqualsHelper;
} }
// check parent name // check parent name
if (parentName != null) if (getParentName() != null)
{ {
if (! parentName.equals(classDef.getParentName())) if (! getParentName().equals(classDef.getParentName()))
{ {
isUpdated = true; isUpdated = true;
} }
@@ -590,15 +590,15 @@ import org.alfresco.util.EqualsHelper;
break; break;
} }
} }
// check all associations (including inherited associations, child associations and inherited child associations) // check all associations (including inherited associations, child associations and inherited child associations)
Collection<M2ModelDiff> assocDiffs = M2AssociationDefinition.diffAssocLists(getAssociations().values(), classDef.getAssociations().values()); Collection<M2ModelDiff> assocDiffs = M2AssociationDefinition.diffAssocLists(getAssociations().values(), classDef.getAssociations().values());
for (M2ModelDiff assocDiff : assocDiffs) for (M2ModelDiff assocDiff : assocDiffs)
{ {
// note: incremental association updates not supported yet, added for completeness // note: incremental association updates not supported yet, added for completeness
if (assocDiff.getDiffType().equals(M2ModelDiff.DIFF_CREATED) || assocDiff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED_INC)) if (assocDiff.getDiffType().equals(M2ModelDiff.DIFF_CREATED) || assocDiff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED_INC))
{ {
isUpdatedIncrementally = true; isUpdatedIncrementally = true;
} }
@@ -608,7 +608,7 @@ import org.alfresco.util.EqualsHelper;
break; break;
} }
} }
// check default/mandatory aspects (including inherited default aspects) // check default/mandatory aspects (including inherited default aspects)
Collection<M2ModelDiff> defaultAspectsDiffs = M2ClassDefinition.diffClassLists(new ArrayList<ClassDefinition>(getDefaultAspects()), new ArrayList<ClassDefinition>(classDef.getDefaultAspects()), M2ModelDiff.TYPE_DEFAULT_ASPECT); Collection<M2ModelDiff> defaultAspectsDiffs = M2ClassDefinition.diffClassLists(new ArrayList<ClassDefinition>(getDefaultAspects()), new ArrayList<ClassDefinition>(classDef.getDefaultAspects()), M2ModelDiff.TYPE_DEFAULT_ASPECT);
@@ -616,7 +616,7 @@ import org.alfresco.util.EqualsHelper;
{ {
// note: incremental default/mandatory aspect updates not supported yet, added for completeness // note: incremental default/mandatory aspect updates not supported yet, added for completeness
if (defaultAspectDiff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED_INC)) if (defaultAspectDiff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED_INC))
{ {
isUpdatedIncrementally = true; isUpdatedIncrementally = true;
} }
@@ -628,7 +628,7 @@ import org.alfresco.util.EqualsHelper;
} }
// check archive/inheritedArchive // check archive/inheritedArchive
if (archive == null) if (getArchive() == null)
{ {
if (classDef.getArchive() != null) if (classDef.getArchive() != null)
{ {
@@ -638,15 +638,16 @@ import org.alfresco.util.EqualsHelper;
else else
{ {
Boolean classArchive = classDef.getArchive(); Boolean classArchive = classDef.getArchive();
if (classArchive == null || classArchive.booleanValue() != archive.booleanValue()) if (classArchive == null || classArchive.booleanValue() != getArchive().booleanValue())
{ {
isUpdatedIncrementally = true; isUpdatedIncrementally = true;
} }
} }
// check includedInSuperTypeQuery/inheritedIncludedInSuperTypeQuery // check includedInSuperTypeQuery/inheritedIncludedInSuperTypeQuery
if (includedInSuperTypeQuery == null) if (getIncludedInSuperTypeQuery() == null)
{ {
// belts-and-braces (currently does not return null)
if (classDef.getIncludedInSuperTypeQuery() != null) if (classDef.getIncludedInSuperTypeQuery() != null)
{ {
isUpdatedIncrementally = true; isUpdatedIncrementally = true;
@@ -655,7 +656,7 @@ import org.alfresco.util.EqualsHelper;
else else
{ {
Boolean classIncludedInSuperTypeQuery = classDef.getIncludedInSuperTypeQuery(); Boolean classIncludedInSuperTypeQuery = classDef.getIncludedInSuperTypeQuery();
if (classIncludedInSuperTypeQuery == null || classIncludedInSuperTypeQuery.booleanValue() != includedInSuperTypeQuery.booleanValue()) if (classIncludedInSuperTypeQuery == null || classIncludedInSuperTypeQuery.booleanValue() != getIncludedInSuperTypeQuery().booleanValue())
{ {
isUpdatedIncrementally = true; isUpdatedIncrementally = true;
} }