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 for identification of particle for complexContent derived from a complexType. need to recurse model groups to locate the actual particle. resolves issue WCM-474.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ariel Backenroth
2007-05-15 00:00:47 +00:00
parent df32d0ddf1
commit fd2176bc1c
1 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
source/java/org/alfresco/web/forms/xforms/SchemaUtil.java
View File

@@ -420,6 +420,8 @@ public class SchemaUtil
final XSComplexTypeDefinition complexType = elDecl.getEnclosingCTDefinition();
if (complexType == null)
{
LOGGER.warn("unable to find corresponding particle for " + elDecl.getName() +
". no enclosing complex type.");
return null;
}
@@ -427,25 +429,68 @@ public class SchemaUtil
final XSTerm term = particle.getTerm();
if (! (term instanceof XSModelGroup))
{
LOGGER.warn("unable to find corresponding particle for " + elDecl.getName() +
". term " + term + " is not a model group.");
return null;
}
final XSModelGroup group = (XSModelGroup) term;
final XSObjectList particles = group.getParticles();
if (particles == null)
final XSParticle result = SchemaUtil.findCorrespondingParticleInModelGroup((XSModelGroup)term, elDecl);
if (result == null)
{
final String msg = ("unable to find corresponding particle for " + elDecl.getName() +
" in term " + term);
if (LOGGER.isDebugEnabled())
{
throw new NullPointerException(msg);
}
else
{
LOGGER.warn(msg);
}
}
return result;
}
private static XSParticle findCorrespondingParticleInModelGroup(final XSModelGroup modelGroup,
final XSElementDeclaration elDecl)
{
final XSObjectList particles = modelGroup.getParticles();
if (particles == null || particles.getLength() == 0)
{
LOGGER.debug("unable to find corresponding particle for " + elDecl.getName() +
". group " + modelGroup + " contains no particles.");
return null;
}
for (int i = 0; i < particles.getLength(); i++)
{
final XSParticle part = (XSParticle) particles.item(i);
//test term
XSParticle part = (XSParticle)particles.item(i);
final XSTerm thisTerm = part.getTerm();
if (thisTerm == elDecl)
if (thisTerm instanceof XSModelGroup)
{
return part;
part = SchemaUtil.findCorrespondingParticleInModelGroup((XSModelGroup)thisTerm, elDecl);
if (part != null)
{
return part;
}
}
else
{
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("checking term " + thisTerm.getName() +
" in " + modelGroup.getName() + "(" + modelGroup.getClass().getName() + ")");
}
if (thisTerm == elDecl)
{
return part;
}
}
}
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("unable to find corresponding particle for " + elDecl.getName() +
". " + elDecl.getName() +
" not found in " + particles.getLength() + " particles");
}
return null;
}