[190643] taglib line in jsp (.tag) reported as error (red squiggly line)
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/Tag20ElementCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/Tag20ElementCollection.java index 81c2e69..baa6c2b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/Tag20ElementCollection.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/Tag20ElementCollection.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.wst.html.core.internal.contentmodel; - - import java.lang.reflect.Field; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; @@ -204,6 +202,28 @@ declarations.putNamedItem(JSP20Namespace.ATTR_NAME_ISELIGNORED, adec); } + /* + * Changed in 2.0 + */ + private void createForDirTaglib() { + // ("uri" URI OPTIONAL) + AttrDecl adec = new AttrDecl(ATTR_NAME_URI); + adec.type = new HTMLCMDataTypeImpl(CMDataType.URI); + adec.usage = CMAttributeDeclaration.OPTIONAL; + declarations.putNamedItem(ATTR_NAME_URI, adec); + + adec = new AttrDecl(JSP20Namespace.ATTR_NAME_TAGDIR); + adec.type = new HTMLCMDataTypeImpl(CMDataType.URI); + adec.usage = CMAttributeDeclaration.OPTIONAL; + declarations.putNamedItem(JSP20Namespace.ATTR_NAME_TAGDIR, adec); + + // ("prefix" CDATA REQUIRED) + adec = new AttrDecl(ATTR_NAME_PREFIX); + adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA); + adec.usage = CMAttributeDeclaration.REQUIRED; + declarations.putNamedItem(ATTR_NAME_PREFIX, adec); + } + private void createForDirVariable() { AttrDecl adec = new AttrDecl(JSP20Namespace.ATTR_NAME_NAME_GIVEN); adec.type = new HTMLCMDataTypeImpl(CMDataType.CDATA); @@ -334,6 +354,9 @@ case TagIds20.ID_DIRECTIVE_ATTRIBUTE : createForDirAttribute(); break; + case Ids.ID_DIRECTIVE_TAGLIB : + createForDirTaglib(); + break; case TagIds20.ID_ATTRIBUTE : createForAttribute(); break;