Author: scabanovich
Date: 2009-04-27 11:17:11 -0400 (Mon, 27 Apr 2009)
New Revision: 14937
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-attrs.properties
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4213
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-attrs.properties
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-attrs.properties 2009-04-27
14:42:09 UTC (rev 14936)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-attrs.properties 2009-04-27
15:17:11 UTC (rev 14937)
@@ -8,51 +8,51 @@
JSF.xmlns_xsi=Xmlns\:xsi
JSF.xsi_schemaLocation=Xsi\:schemaLocation
JSF.action-listener=Action-Listener
-JSF.default-render-kit-id=Default-Render-Kit-ID
-JSF.navigation-handler=Navigation-Handler
-JSF.view-handler=View-Handler
-JSF.state-manager=State-Manager
-JSF.property-resolver=Property-Resolver
-JSF.variable-resolver=Variable-Resolver
-JSF.el-resolver=El-Resolver
+JSF.default-render-kit-id=Default Render Kit ID
+JSF.navigation-handler=Navigation Handler
+JSF.view-handler=View Handler
+JSF.state-manager=State Manager
+JSF.property-resolver=Property Resolver
+JSF.variable-resolver=Variable Resolver
+JSF.el-resolver=El Resolver
JSF.description=Description
-JSF.display-name=Display-Name
-JSF.small-icon=Small-Icon
-JSF.large-icon=Large-Icon
-JSF.attribute-name=Attribute-Name
-JSF.attribute-class=Attribute-Class
-JSF.default-value=Default-Value
-JSF.suggested-value=Suggested-Value
-JSF.component-type=Component-Type
-JSF.component-class=Component-Class
-JSF.converter-id=Converter-ID
-JSF.converter-for-class=Converter-for-Class
-JSF.converter-class=Converter-Class
+JSF.display-name=Display Name
+JSF.small-icon=Small Icon
+JSF.large-icon=Large Icon
+JSF.attribute-name=Attribute Name
+JSF.attribute-class=Attribute Class
+JSF.default-value=Default Value
+JSF.suggested-value=Suggested Value
+JSF.component-type=Component Type
+JSF.component-class=Component Class
+JSF.converter-id=Converter ID
+JSF.converter-for-class=Converter for Class
+JSF.converter-class=Converter Class
JSF.class_name=Class Name
-JSF.facet-name=Facet-Name
-JSF.application-factory=Application-Factory
-JSF.faces-context-factory=Faces-Context-Factory
-JSF.lifecycle-factory=Lifecycle-Factory
-JSF.render-kit-factory=Render-Kit-Factory
-JSF.value-class=Value-Class
-JSF.null-value=Null-Value
+JSF.facet-name=Facet Name
+JSF.application-factory=Application Factory
+JSF.faces-context-factory=Faces Context Factory
+JSF.lifecycle-factory=Lifecycle Factory
+JSF.render-kit-factory=Render Kit Factory
+JSF.value-class=Value Class
+JSF.null-value=Null Value
JSF.value=Value
-JSF.default-locale=Default-Locale
-JSF.managed-bean-name=Managed-Bean-Name
-JSF.managed-bean-class=Managed-Bean-Class
-JSF.managed-bean-scope=Managed-Bean-Scope
-JSF.property-name=Property-Name
-JSF.property-class=Property-Class
-JSF.value-kind=Value-Kind
-JSF.key-class=Key-Class
+JSF.default-locale=Default Locale
+JSF.managed-bean-name=Managed Bean Name
+JSF.managed-bean-class=Managed Bean Class
+JSF.managed-bean-scope=Managed Bean Scope
+JSF.property-name=Property Name
+JSF.property-class=Property Class
+JSF.value-kind=Value Kind
+JSF.key-class=Key Class
JSF.key=Key
-JSF.message-bundle=Message-Bundle
-JSF.from-action=From-Action
-JSF.from-outcome=From-Outcome
-JSF.to-view-id=To-View-ID
+JSF.message-bundle=Message Bundle
+JSF.from-action=From Action
+JSF.from-outcome=From Outcome
+JSF.to-view-id=To View ID
JSF.redirect=Redirect
-JSF.from-view-id=From-View-ID
-JSF.phase-listener=Phase-Listener
+JSF.from-view-id=From View ID
+JSF.phase-listener=Phase Listener
JSF.type=Type
JSF.shape=Shape
JSF.target=Target
@@ -62,19 +62,19 @@
JSF.title=Title
JSF.hidden=Hidden
JSF.shortcut=Shortcut
-JSF.referenced-bean-name=Referenced-Bean-Name
-JSF.referenced-bean-class=Referenced-Bean-Class
-JSF.render-kit-id=Render-Kit-ID
-JSF.render-kit-class=Render-Kit-Class
-JSF.component-family=Component-Family
-JSF.renderer-type=Renderer-Type
-JSF.renderer-class=Renderer-Class
-JSF.base-name=Base-Name
+JSF.referenced-bean-name=Referenced Bean Name
+JSF.referenced-bean-class=Referenced Bean Class
+JSF.render-kit-id=Render Kit ID
+JSF.render-kit-class=Render Kit Class
+JSF.component-family=Component Family
+JSF.renderer-type=Renderer Type
+JSF.renderer-class=Renderer Class
+JSF.base-name=Base Name
JSF.var=Var
-JSF.attribute-names=Attribute-Names
-JSF.supported-locale=Supported-Locale
-JSF.validator-id=Validator-ID
-JSF.validator-class=Validator-Class
+JSF.attribute-names=Attribute Names
+JSF.supported-locale=Supported Locale
+JSF.validator-id=Validator ID
+JSF.validator-class=Validator Class
JSF.URI=URI
JSF.path_on_disk=Path on Disk
JSF.java_src=Java Src
@@ -100,3 +100,11 @@
JSF.rename_file=Rename File
JSF.link_text=Link Text
JSF.select_items=Select Items
+JSF.function-name=Function Name
+JSF.function-class=Function Class
+JSF.function-signature=Function Signature
+JSF.handler-class=Handler Class
+JSF.source=Source
+JSF.tag-name=Tag Name
+JSF.library-class=Library Class
+JSF.uri=Namespace
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta 2009-04-27
14:42:09 UTC (rev 14936)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta 2009-04-27
15:17:11 UTC (rev 14937)
@@ -256,9 +256,7 @@
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="save=always;category=general"
- name="source" xmlname="#text">
- <Editor name="Note2"/>
- </XModelAttribute>
+ name="source" xmlname="#text"/>
<XModelAttribute TRIM="no" name="comment"
xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -314,9 +312,28 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem HandlerClassName="%OpenJavaSource%"
ICON="action.empty"
- PROPERTIES="attribute=handler-class" displayName="Open Handler"
- kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.empty" displayName="New"
group="1"
+ kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
ICON="empty"
+ PROPERTIES="significanceMessageClass=%Replace%;child=declaration"
+ WizardClassName="%Default%" displayName="Component..."
+ kind="action" name="AddComponent">
+ <EntityData EntityName="FaceletTaglibComponent">
+ <AttributeData AttributeName="component-type"/>
+ <AttributeData AttributeName="renderer-type"
Mandatory="no"/>
+ <AttributeData AttributeName="handler-class"
Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
ICON="empty"
+ PROPERTIES="significanceMessageClass=%Replace%;child=declaration"
+ WizardClassName="%Default%" displayName="Converter..."
+ kind="action" name="AddConverter">
+ <EntityData EntityName="FaceletTaglibConverter">
+ <AttributeData AttributeName="converter-id"/>
+ <AttributeData AttributeName="handler-class"
Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy"
kind="list" name="CopyActions">
<XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
ICON="action.cut" displayName="Cut" kind="action"
name="Cut"/>
@@ -327,14 +344,14 @@
<XActionItem BaseActionName="Delete"
HandlerClassName="%Delete%"
ICON="action.delete" displayName="Delete"
kind="action" name="Delete"/>
</XActionItem>
+ <XActionItem ICON="action.empty" kind="list"
name="Properties">
+ <XActionItem HandlerClassName="%Properties%"
ICON="action.empty"
+ displayName="Properties..." kind="action"
name="Properties"/>
+ </XActionItem>
<XActionItem displayName="move" kind="list"
name="MoveActions">
<XActionItem HIDE="always" HandlerClassName="%Move%"
ICON="action.move" displayName="Move" kind="action"
name="Move"/>
</XActionItem>
- <XActionItem ICON="action.empty" kind="list"
name="Properties">
- <XActionItem HandlerClassName="%Properties%"
ICON="action.empty"
- displayName="Properties..." kind="action"
name="Properties"/>
- </XActionItem>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -413,16 +430,6 @@
<XModelAttribute default="xml" name="extension"
xmlname="EXTENSION">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=general"
name="library-class" xmlname="library-class.#text">
- <Editor name="AccessibleJava"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=general"
- name="taglib namespace" xmlname="namespace.#text">
- <Editor name="AccessibleJava"/>
- </XModelAttribute>
- <XModelAttribute TRIM="no" name="comment"
xmlname="#comment">
- <Editor name="Note"/>
- </XModelAttribute>
<XModelAttribute loader="ElementType" name="_lateload"
visibility="false">
<Editor name="Uneditable"/>
</XModelAttribute>
@@ -438,6 +445,20 @@
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute name="incorrectBody" visibility="false"/>
+ <XModelAttribute default="false" name="expanded"
visibility="false">
+ <Constraint loader="List">
+ <value name="false"/>
+ <value name="true"/>
+ </Constraint>
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general"
name="library-class" xmlname="library-class.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="uri"
xmlname="namespace.#text"/>
+ <XModelAttribute TRIM="no" name="comment"
xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
<XModelAttribute name="encoding">
<Constraint loader="ListString">
<value name="ISO-8859-1"/>
@@ -483,6 +504,9 @@
</XActionItem>
<XActionItem ICON="action.empty" displayName="New"
group="1"
kind="list" name="CreateActions"/>
+ <XActionItem HIDE="disabled"
+
HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
+ ICON="action.empty" displayName="Set Expanded"
kind="action" name="SetExpanded"/>
<XActionItem ICON="action.copy" displayName="Copy"
kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action"
name="Copy"/>
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2009-04-27
14:42:09 UTC (rev 14936)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2009-04-27
15:17:11 UTC (rev 14937)
@@ -13,6 +13,9 @@
import java.util.*;
import org.eclipse.core.resources.IResource;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
public class JSFProjectTagLibs extends JSFProjectResourceBundles {
private static final long serialVersionUID = 7805053632320764494L;
@@ -34,6 +37,12 @@
protected List<XModelObject> collect(Iterator<XModelObject> rs) {
List<XModelObject> list = super.collect(rs);
+
+ XModelObject faceletTaglib = getFaceletTaglibs();
+ if(faceletTaglib != null && faceletTaglib.getAttributeValue("uri") !=
null) {
+ list.add(faceletTaglib);
+ }
+
Iterator<XModelObject> it = list.iterator();
Set<String> set = new HashSet<String>();
while(it.hasNext()) {
@@ -48,6 +57,18 @@
return list;
}
+ private XModelObject getFaceletTaglibs() {
+ XModelObject webxml = getModel().getByPath("/web.xml");
+ XModelObject webRoot = FileSystemsHelper.getWebRoot(getModel());
+ if(webxml == null || webRoot == null) return null;
+ XModelObject cp = WebAppHelper.findWebAppContextParam(webxml,
"facelets.LIBRARIES");
+ if(cp == null) return null;
+ String value = cp.getAttributeValue("param-value");
+ if(value == null || value.length() == 0) return null;
+ if(value.startsWith("/")) value = value.substring(1);
+ return webRoot.getChildByPath(value);
+ }
+
static String TLD_ENTITIES =
".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.FileTLD_2_1.";
protected boolean acceptFile(XModelObject o) {