Author: scabanovich Date: 2010-01-20 11:52:22 -0500 (Wed, 20 Jan 2010) New Revision: 19828 Added: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf.meta trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FileFacesConfigImpl.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OpenPageHandler.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ProcessAdopt.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/IPathSourceImpl.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFProcessHelper.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/OpenCaseHelper.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/NavigationRulesObjectImpl.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JsfTreeListener.java Log: https://jira.jboss.org/jira/browse/JBIDE-5471 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-01-20 16:52:22 UTC (rev 19828) @@ -6,6 +6,8 @@ <extension point="org.jboss.tools.common.model.meta"> <meta path="meta/jsf.meta"> </meta> + <meta path="meta/jsf2.meta"> + </meta> <meta path="meta/jsfcapabilities.meta"> </meta> <meta path="meta/jsfprojects.meta"> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf.meta =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf.meta 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf.meta 2010-01-20 16:52:22 UTC (rev 19828) @@ -658,7 +658,7 @@ </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.jsf.model.impl.ApplicationObjectImpl" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData;saveDefault=false" XMLSUBPATH="application" name="JSFApplication"> <XChildrenEntities> <XChildEntity maxCount="1" name="JSFLocaleConfig" required="yes"/> @@ -772,7 +772,7 @@ </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.jsf.model.impl.ApplicationObjectImpl" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData;saveDefault=false" XMLSUBPATH="application" name="JSFApplication12"> <XChildrenEntities> <XChildEntity maxCount="1" name="JSFLocaleConfig" required="yes"/> @@ -1758,7 +1758,7 @@ </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.jsf.model.impl.FactoryObjectImpl" - XMLSUBPATH="factory" name="JSFFactory"> + PROPERTIES="saveDefault=false" XMLSUBPATH="factory" name="JSFFactory"> <XChildrenEntities/> <XEntityRenderer> <ICONS> @@ -1826,7 +1826,7 @@ </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.jsf.model.impl.LifecycleObjectImpl" - XMLSUBPATH="lifecycle" name="JSFLifecycle"> + PROPERTIES="saveDefault=false" XMLSUBPATH="lifecycle" name="JSFLifecycle"> <XChildrenEntities> <XChildEntity name="JSFPhaseListener"/> </XChildrenEntities> @@ -1971,7 +1971,8 @@ </XActionItem> <XDependencies/> </XModelEntity> - <XModelEntity ImplementingClass="%Ordered%" XMLSUBPATH="locale-config" name="JSFLocaleConfig"> + <XModelEntity ImplementingClass="%Ordered%" + PROPERTIES="saveDefault=false" XMLSUBPATH="locale-config" name="JSFLocaleConfig"> <XChildrenEntities> <XChildEntity name="JSFSupportedLocale"/> </XChildrenEntities> Added: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta 2010-01-20 16:52:22 UTC (rev 19828) @@ -0,0 +1,1194 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" + "meta.dtd"> +<XModelEntityGroup> + <VERSION DEPENDS="Model:1.0" MODULE="JSF" VERSION="1.0"/> + <MAPPINGS> + <MAPPING name="FileVersions"> + <PAIR name="FacesConfig2.0" value="FacesConfig20"/> + </MAPPING> + </MAPPINGS> + <ICONS/> + <GlobalActions kind="list"/> + <XModelEntity + AdoptManagerClass="org.jboss.tools.jsf.model.handlers.FacesConfigAdopt" + ImplementationLoadingClass="org.jboss.tools.jsf.model.FacesConfigLoader" + ImplementingClass="org.jboss.tools.jsf.model.FileFacesConfigImpl" + ObjectEditorClass="%XML%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" + XMLSUBPATH="faces-config" name="FacesConfig20"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="JSFApplication20" required="yes"/> + <XChildEntity maxCount="1" name="JSFFactory20" required="yes"/> + <XChildEntity maxCount="1" name="JSFLifecycle" required="yes"/> + <XChildEntity maxCount="1" name="JSFComponents11" required="yes"/> + <XChildEntity maxCount="1" name="JSFConverters" required="yes"/> + <XChildEntity maxCount="1" name="JSFManagedBeans20" required="yes"/> + <XChildEntity maxCount="1" name="JSFNavigationRules20" required="yes"/> + <XChildEntity maxCount="1" name="JSFReferencedBeans" required="yes"/> + <XChildEntity maxCount="1" name="JSFRenderKits20" required="yes"/> + <XChildEntity maxCount="1" name="JSFValidators12" required="yes"/> + <XChildEntity maxCount="1" name="JSFConfigExtensions" required="yes"/> + <XChildEntity maxCount="1" name="JSFProcess" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.faces-config" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="faces-config" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="faces-config" name="name" xmlname="NAME"/> + <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="save=always" + default="http://java.sun.com/xml/ns/javaee" name="xmlns" xmlname="xmlns"/> + <XModelAttribute PROPERTIES="save=always" + default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"/> + <XModelAttribute PROPERTIES="save=always" + default="http://www.w3.org/2001/XInclude" name="xmlns:xi" + visibility="false" xmlname="xmlns:xi"/> + <XModelAttribute PROPERTIES="save=always" + default="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" + name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> + <XModelAttribute PROPERTIES="save=always" default="2.0" + name="version" visibility="false" xmlname="version"/> + <XModelAttribute default="no" name="isIncorrect" visibility="false"> + <Constraint loader="List"> + <value name="yes"/> + <value name="no"/> + </Constraint> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="incorrectBody" visibility="false"/> + <XModelAttribute name="encoding"> + <Constraint loader="ListString"> + <value name="ISO-8859-1"/> + <value name="UTF-8"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=advanced" + name="faces config name" xmlname="name.#text"> + <Constraint loader="JavaName"> + <value name="acceptIncorrect=true"/> + </Constraint> + <Editor name="Name"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + name="metadata-complete" xmlname="metadata-complete"> + <Constraint loader="List"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem BaseActionName="Open" HandlerClassName="%Open%" + ICON="action.empty" displayName="Open" kind="action" name="Open"/> + <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler" + ICON="action.empty" PROPERTIES="extension=struts-config" + displayName="Open with External Program" kind="action" name="OpenWithSelected"/> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler" + ICON="action.empty" PROPERTIES="extension=struts-config" + displayName="Choose Program..." kind="action" name="OpenWithChoice"> + <EntityData EntityName="OpenWithHelper"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="default"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="EditActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.jsf.model.handlers.RenameFacesConfigHandler" + ICON="action.empty" PROPERTIES="validator.edit=true" + WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename"> + <EntityData EntityName="FacesConfig"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler" + ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/> + </XActionItem> + <XActionItem kind="list" name="SaveActions"> + <XActionItem HIDE="always" HandlerClassName="%SaveFile%" + ICON="action.save" displayName="Save" kind="action" name="Save"/> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.jsf.model.handlers.SetApplicationHandler" + ICON="action.empty" displayName="Edit Application Settings..." + kind="action" name="SetApplication"/> + <XActionItem + HandlerClassName="org.jboss.tools.jsf.model.handlers.SetFactoryHandler" + ICON="action.empty" displayName="Edit Factory Settings..." + kind="action" name="SetFactory"/> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Redirect%" ICON="action.empty" + PROPERTIES="validator.add=true;sourcepath=Navigation Rules;actionpath=CreateActions/AddRule" + WizardClassName="%Default%" displayName="Rule..." kind="action" name="AddRule"/> + <XActionItem HandlerClassName="%Redirect%" ICON="action.empty" + PROPERTIES="validator.add=true;sourcepath=Components;actionpath=CreateActions/AddComponent" + WizardClassName="%Default%" displayName="Component..." + kind="action" name="AddComponent"/> + <XActionItem displayName="Converter" group="1" kind="list" name="AddConverter"> + <XActionItem HandlerClassName="%Redirect%" ICON="action.empty" + PROPERTIES="validator.add=true;sourcepath=Converters;actionpath=CreateActions/AddConverter/WithId" + WizardClassName="%Default%" displayName="with id..." kind="action" name="WithId"/> + <XActionItem HandlerClassName="%Redirect%" ICON="action.empty" + PROPERTIES="validator.add=true;sourcepath=Converters;actionpath=CreateActions/AddConverter/ForClass" + WizardClassName="%Default%" displayName="for class..." + kind="action" name="ForClass"/> + </XActionItem> + <XActionItem HandlerClassName="%Redirect%" ICON="action.empty" + PROPERTIES="validator.add=true;sourcepath=Managed Beans;actionpath=CreateActions/AddManagedBean" + WizardClassName="%Default%" displayName="Managed Bean..." + kind="action" name="AddManagedBean"/> + <XActionItem HandlerClassName="%Redirect%" ICON="action.empty" + PROPERTIES="validator.add=true;sourcepath=Referenced Beans;actionpath=CreateActions/AddReferencedBean" + WizardClassName="%Default%" displayName="Referenced Bean..." + kind="action" name="AddReferencedBean"/> + <XActionItem HandlerClassName="%Redirect%" ICON="action.empty" + PROPERTIES="validator.add=true;sourcepath=Render Kits;actionpath=CreateActions/AddRenderKit" + WizardClassName="%Default%" displayName="Render Kit..." + kind="action" name="AddRenderKit"/> + <XActionItem HandlerClassName="%DefaultReplaceUnique%" + ICON="action.empty" + PROPERTIES="significanceMessageClass=%Replace%;child=lifecycle" + displayName="Lifecycle..." kind="action" name="AddLifecycle"> + <EntityData EntityName="JSFLifecycle"/> + </XActionItem> + <XActionItem HandlerClassName="%Redirect%" ICON="action.empty" + PROPERTIES="validator.add=true;sourcepath=Validators;actionpath=CreateActions/AddValidator" + WizardClassName="%Default%" displayName="Validator..." + kind="action" name="AddValidator"/> + </XActionItem> + <XActionItem kind="list" name="GenerateActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="org.jboss.tools.jsf.model.handlers.DeleteFacesConfigHandler" + 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 kind="list" name="DiscardActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.jsf.model.handlers.DiscardConfigHandler" + ICON="action.delete" + PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage" + displayName="Discard Changes" kind="action" name="Discard"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity name="FacesConfig20_EditorActionList"> + <XChildrenEntities/> + <XEntityRenderer/> + <XModelAttributes/> + <XActionItem kind="list"> + <XActionItem displayName="New" group="1" kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem kind="list" name="VerifyActions"> + <XActionItem kind="list" name="StaticActions"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.jsf.model.impl.ApplicationObjectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData;saveDefault=false" + XMLSUBPATH="application" name="JSFApplication20"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="JSFLocaleConfig" required="yes"/> + <XChildEntity maxCount="1" name="JSFDefaultValidators" required="yes"/> + <XChildEntity name="JSFSystemEventListener"/> + <XChildEntity name="JSFELResolver"/> + <XChildEntity name="JSFPropertyResolver"/> + <XChildEntity name="JSFVariableResolver"/> + <XChildEntity name="JSFMessageBundle"/> + <XChildEntity name="JSFResourceBundle"/> + <XChildEntity name="JSFApplicationExtension"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.application" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="application" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="action-listener" xmlname="action-listener.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="default-render-kit-id" xmlname="default-render-kit-id.#text"> + <Constraint loader="ListString"/> + <Editor name="DefaultRendererKitId"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="navigation-handler" xmlname="navigation-handler.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="partial-traversal" xmlname="partial-traversal.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="view-handler" xmlname="view-handler.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="state-manager" xmlname="state-manager.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute COPYABLE="no" name="el-resolver"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute COPYABLE="no" name="property-resolver"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute COPYABLE="no" name="variable-resolver"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="resource-handler" xmlname="resource-handler.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem displayName="New" group="1" kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="System Listener" kind="action" name="AddSystemListener"> + <EntityData EntityName="JSFSystemEventListener"> + <AttributeData AttributeName="system-event-listener-class"/> + <AttributeData AttributeName="system-event-class"/> + <AttributeData AttributeName="source-class" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Message Bundle" kind="action" name="AddMessageBundle"> + <EntityData EntityName="JSFMessageBundle"> + <AttributeData AttributeName="message-bundle"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Resource Bundle..." kind="action" name="AddResourceBundle"> + <EntityData EntityName="JSFResourceBundle"> + <AttributeData AttributeName="base-name"/> + <AttributeData AttributeName="var"/> + </EntityData> + </XActionItem> + <XActionItem kind="list" name="CreateResolvers"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="EL Resolver..." kind="action" name="AddELResolver"> + <EntityData EntityName="JSFELResolver"> + <AttributeData AttributeName="class name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Property Resolver..." kind="action" name="AddPropertyResolver"> + <EntityData EntityName="JSFPropertyResolver"> + <AttributeData AttributeName="class name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Variable Resolver..." kind="action" name="AddVariableResolver"> + <EntityData EntityName="JSFVariableResolver"> + <AttributeData AttributeName="class name"/> + </EntityData> + </XActionItem> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler" + PROPERTIES="actionList=CreateActions/CreateResolvers" + displayName="Resolver..." kind="action" name="AddAnyResolver"/> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + displayName="Extension" kind="action" name="CreateExtension"> + <EntityData EntityName="JSFApplicationExtension"/> + </XActionItem> + </XActionItem> + <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty" + PROPERTIES="action-listener" displayName="Open Declaration" + kind="action" name="OpenSource"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"> + <XActionItem HandlerClassName="%Edit%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Edit..." kind="action" name="Edit"> + <EntityData EntityName="JSFApplication12"> + <AttributeData AttributeName="action-listener" Mandatory="no"/> + <AttributeData AttributeName="navigation-handler" Mandatory="no"/> + <AttributeData AttributeName="view-handler" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="GenerateActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <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> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" + XMLSUBPATH="validator-id" name="JSFDefaultValidator"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.validator" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="default validator" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="validator-id" xmlname="#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <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> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Ordered%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData;saveDefault=false" + XMLSUBPATH="default-validators" name="JSFDefaultValidators"> + <XChildrenEntities> + <XChildEntity name="JSFDefaultValidator"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.validators" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="default-validators" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="Default Validators" name="name" + visibility="false" xmlname="NAME"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Default Validator..." + kind="action" name="AddDefaultValidator"> + <EntityData EntityName="JSFDefaultValidator"> + <AttributeData AttributeName="validator-id"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <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> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.jsf.model.impl.FactoryObjectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData;saveDefault=false" + XMLSUBPATH="factory" name="JSFFactory20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.factory" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="factory" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="application-factory" xmlname="application-factory.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="exception-handler-factory" xmlname="exception-handler-factory.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="external-context-factory" xmlname="external-context-factory.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="faces-context-factory" xmlname="faces-context-factory.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="partial-view-context-factory" xmlname="partial-view-context-factory.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="lifecycle-factory" xmlname="lifecycle-factory.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="view-declaration-language-factory" xmlname="view-declaration-language-factory.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="tag-handler-delegate-factory" xmlname="tag-handler-delegate-factory.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="render-kit-factory" xmlname="render-kit-factory.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="visit-context-factory" xmlname="visit-context-factory.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty" + PROPERTIES="attribute=application-factory" + displayName="Open Declaration" kind="action" name="OpenSource"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"> + <XActionItem HandlerClassName="%Edit%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Edit..." kind="action" name="Edit"> + <EntityData EntityName="JSFFactory20"> + <AttributeData AttributeName="application-factory" Mandatory="no"/> + <AttributeData AttributeName="exception-handler-factory" Mandatory="no"/> + <AttributeData AttributeName="external-context-factory" Mandatory="no"/> + <AttributeData AttributeName="faces-context-factory" Mandatory="no"/> + <AttributeData AttributeName="partial-view-context-factory" Mandatory="no"/> + <AttributeData AttributeName="lifecycle-factory" Mandatory="no"/> + <AttributeData AttributeName="view-declaration-language-factory" Mandatory="no"/> + <AttributeData AttributeName="tag-handler-delegate-factory" Mandatory="no"/> + <AttributeData AttributeName="render-kit-factory" Mandatory="no"/> + <AttributeData AttributeName="visit-context-factory" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="GenerateActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <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> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.jsf.model.impl.ManagedBeanObjectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" + XMLSUBPATH="managed-bean" name="JSFManagedBean20"> + <XChildrenEntities> + <XChildEntity name="JSFManagedProperty"/> + <XChildEntity maxCount="1" name="JSFListEntries"/> + <XChildEntity maxCount="1" name="JSFMapEntries"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.bean" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="managed-bean" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="description" xmlname="description.#text"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute name="display-name" xmlname="display-name.#text"/> + <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text"/> + <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text"/> + <XModelAttribute PROPERTIES="id=true;save=always" + name="managed-bean-name" xmlname="managed-bean-name.#text"> + <Constraint loader="JavaName"> + <value name="acceptIncorrect=true"/> + </Constraint> + <Editor name="Name"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="save=always" name="managed-bean-class" xmlname="managed-bean-class.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="save=always" default="none" + name="managed-bean-scope" xmlname="managed-bean-scope.#text"> + <Constraint loader="ListString"> + <value name="view"/> + <value name="request"/> + <value name="session"/> + <value name="application"/> + <value name="none"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute name="eager" xmlname="eager"> + <Constraint loader="List"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute default="properties" name="content-kind" visibility="false"> + <Constraint loader="List"> + <value name="properties"/> + <value name="list-entries"/> + <value name="map-entries"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%SpecialWizard%" + ICON="main.jsf.property" + PROPERTIES="validator.add=true;support=org.jboss.tools.jsf.model.handlers.bean.AddManagedPropertySupport;entity=JSFManagedProperty" + displayName="Property..." kind="action" name="CreateProperty"> + <EntityData EntityName="AddJSFManagedPropertyWizard"> + <AttributeData AttributeName="property-name"/> + <AttributeData AttributeName="property-class" Mandatory="no"/> + <AttributeData AttributeName="value-kind" Mandatory="no"/> + <AttributeData AttributeName="value" Mandatory="no"/> + <AttributeData AttributeName="add java property" Mandatory="no"/> + <AttributeData AttributeName="generate getter" Mandatory="no"/> + <AttributeData AttributeName="generate setter" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.jsf.model.handlers.bean.AddManagedPropertySafeHandler" + ICON="main.jsf.property" displayName="Property..." kind="action" name="CreatePropertySafe"> + <EntityData EntityName="AddJSFManagedPropertyWizard"> + <AttributeData AttributeName="property-name"/> + <AttributeData AttributeName="property-class" Mandatory="no"/> + <AttributeData AttributeName="value-kind" Mandatory="no"/> + <AttributeData AttributeName="value" Mandatory="no"/> + <AttributeData AttributeName="add java property" Mandatory="no"/> + <AttributeData AttributeName="generate getter" Mandatory="no"/> + <AttributeData AttributeName="generate setter" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.jsf.model.handlers.ChangeContentKindHandler" + ICON="action.empty" PROPERTIES="content-kind=list-entries" + displayName="List-Entries" kind="action" name="ChangeToList"/> + <XActionItem + HandlerClassName="org.jboss.tools.jsf.model.handlers.ChangeContentKindHandler" + ICON="action.empty" PROPERTIES="content-kind=map-entries" + displayName="Map-Entries" kind="action" name="ChangeToMap"/> + </XActionItem> + <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty" + PROPERTIES="attribute=managed-bean-class" + displayName="Open Declaration" kind="action" name="OpenSource"/> + <XActionItem kind="list" name="EditActions"> + <XActionItem + HandlerClassName="org.jboss.tools.jsf.model.handlers.bean.RenameManagedBeanHandler" + ICON="action.empty" displayName="Rename Class..." kind="action" name="RenameClass"/> + </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"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="org.jboss.tools.jsf.model.handlers.DeleteManagedBeanHandler" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </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> + <XModelEntity ImplementingClass="%Ordered%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" name="JSFManagedBeans20"> + <XChildrenEntities> + <XChildEntity name="JSFManagedBean20"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.beans" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="managed bean list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="Managed Beans" name="name" xmlname="NAME"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%SpecialWizard%" ICON="main.jsf.bean" + PROPERTIES="validator.add=true;support=org.jboss.tools.jsf.model.handlers.bean.AddManagedBeanSupport;entity=JSFManagedBean20" + displayName="Managed Bean..." kind="action" name="AddManagedBean"> + <EntityData EntityName="AddJSFManagedBeanWizard"> + <AttributeData AttributeName="managed-bean-scope" Mandatory="no"/> + <AttributeData AttributeName="managed-bean-class"/> + <AttributeData AttributeName="managed-bean-name"/> + <AttributeData AttributeName="generate source code" 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"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="%DeleteChildren%" 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> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.jsf.model.impl.NavigationCaseObjectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" + XMLSUBPATH="navigation-case" name="JSFNavigationCase20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.case" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="navigation-case" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="description" xmlname="description.#text"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute name="display-name" xmlname="display-name.#text"/> + <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text"/> + <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text"/> + <XModelAttribute PROPERTIES="id=true" name="from-action" xmlname="from-action.#text"/> + <XModelAttribute PROPERTIES="id=true" name="from-outcome" xmlname="from-outcome.#text"/> + <XModelAttribute PROPERTIES="id=true;category=general" name="if" xmlname="if.#text"/> + <XModelAttribute PROPERTIES="id=true;save=always" name="to-view-id" xmlname="to-view-id.#text"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + <value name="linkAction=OpenPage"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute default="no" name="redirect" xmlname="redirect"> + <Constraint loader="List"> + <value name="yes"/> + <value name="no"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute name="_shape" visibility="false"/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem HIDE="disabled" + HandlerClassName="org.jboss.tools.jsf.model.handlers.OpenPageHandler" + ICON="action.empty" PROPERTIES="actionpath=Open" + displayName="Open Page" kind="action" name="OpenPage"/> + <XActionItem kind="list" name="RunActions"> + <XActionItem HIDE="disabled" + HandlerClassName="org.jboss.tools.jsf.model.handlers.run.RunOnServerHandler" + ICON="action.empty" displayName="Run on Server" kind="action" name="RunPageOnServer"/> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.jsf.model.handlers.SelectOnDiagramHandler" + ICON="action.empty" displayName="Select on Diagram" kind="action" name="Select"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </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> + <XModelEntity + ImplementingClass="org.jboss.tools.jsf.model.impl.NavigationRuleObjectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" + XMLSUBPATH="navigation-rule" name="JSFNavigationRule20"> + <XChildrenEntities> + <XChildEntity name="JSFNavigationCase20"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.rule" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="navigation-rule" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="description" xmlname="description.#text"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute name="display-name" xmlname="display-name.#text"/> + <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text"/> + <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text"/> + <XModelAttribute PROPERTIES="id=true" name="from-view-id" xmlname="from-view-id.#text"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + <value name="linkAction=OpenPage"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute name="_shape" visibility="false"/> + <XModelAttribute name="index" visibility="false"/> + <XModelAttribute COPYABLE="no" name="presentation" visibility="false"/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem + HandlerClassName="org.jboss.tools.jsf.model.handlers.AddNavigationCaseHandler" + ICON="action.new.jsf.case" PROPERTIES="validator.add=true" + WizardClassName="%Default%" displayName="Case..." kind="action" name="CreateCase"> + <EntityData EntityName="JSFNavigationCase20"> + <AttributeData AttributeName="from-outcome" Mandatory="no"/> + <AttributeData AttributeName="from-action" Mandatory="no"/> + <AttributeData AttributeName="to-view-id"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem HIDE="disabled" + HandlerClassName="org.jboss.tools.jsf.model.handlers.OpenPageHandler" + ICON="action.empty" PROPERTIES="actionpath=Open" + displayName="Open Page" kind="action" name="OpenPage"/> + <XActionItem kind="list" name="RunActions"> + <XActionItem HIDE="disabled" + HandlerClassName="org.jboss.tools.jsf.model.handlers.run.RunOnServerHandler" + ICON="action.empty" displayName="Run on Server" kind="action" name="RunPageOnServer"/> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.jsf.model.handlers.SelectOnDiagramHandler" + ICON="action.empty" displayName="Select on Diagram" kind="action" name="Select"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="org.jboss.tools.jsf.model.handlers.DeleteRuleHandler" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </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> + <XModelEntity + ImplementingClass="org.jboss.tools.jsf.model.impl.NavigationRulesObjectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" name="JSFNavigationRules20"> + <XChildrenEntities> + <XChildEntity name="JSFNavigationRule20"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.rules" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="navigation rule list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="Navigation Rules" name="name" xmlname="NAME"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem + HandlerClassName="org.jboss.tools.jsf.model.handlers.AddNavigationRuleHandler" + ICON="main.jsf.rule" PROPERTIES="validator.add=true" + WizardClassName="%Default%" displayName="Rule..." kind="action" name="AddRule"> + <EntityData EntityName="JSFNavigationRule20"> + <AttributeData AttributeName="from-view-id" Mandatory="no"/> + <AttributeData AttributeName="display-name" 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"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="%DeleteChildren%" 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> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.jsf.model.impl.RenderKitObjectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" + XMLSUBPATH="render-kit" name="JSFRenderKit20"> + <XChildrenEntities> + <XChildEntity name="JSFRenderer11"/> + <XChildEntity name="JSFRenderKitExtension"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.renderkit" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="render-kit" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="description" xmlname="description.#text"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute name="display-name" xmlname="display-name.#text"/> + <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text"/> + <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text"/> + <XModelAttribute PROPERTIES="id=true" name="render-kit-id" xmlname="render-kit-id.#text"/> + <XModelAttribute name="render-kit-class" xmlname="render-kit-class.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Renderer..." kind="action" name="CreateRenderer"> + <EntityData EntityName="JSFRenderer11"> + <AttributeData AttributeName="renderer-type"/> + <AttributeData AttributeName="renderer-class"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + displayName="Extension" kind="action" name="CreateExtension"> + <EntityData EntityName="JSFRenderKitExtension"/> + </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"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </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> + <XModelEntity ImplementingClass="%Ordered%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" name="JSFRenderKits20"> + <XChildrenEntities> + <XChildEntity name="JSFRenderKit20"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.renderkits" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="render kit list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="Render Kits" name="name" xmlname="NAME"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="main.jsf.renderkit" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Render Kit..." kind="action" name="AddRenderKit"> + <EntityData EntityName="JSFRenderKit20"> + <AttributeData AttributeName="render-kit-id" Mandatory="no"/> + <AttributeData AttributeName="render-kit-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"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="%DeleteChildren%" 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> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" + XMLSUBPATH="system-event-listener" name="JSFSystemEventListener"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.listener" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="system event listener" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="system-event-listener-class" xmlname="system-event-listener-class.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="save=always;category=general" + name="system-event-class" xmlname="system-event-class.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="source-class" xmlname="source-class.#text"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="id" xmlname="id"/> + <XModelAttribute TRIM="no" name="comment" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <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> + <XDependencies/> + </XModelEntity> + <XEntityExtension name="FileFolder"> + <XChildrenEntities> + <XChildEntity name="FacesConfig20"/> + </XChildrenEntities> + <XActionItem kind="list"/> + </XEntityExtension> + <XEntityExtension name="FileSystemFolder"> + <XChildrenEntities> + <XChildEntity name="FacesConfig20"/> + </XChildrenEntities> + <XActionItem kind="list"/> + </XEntityExtension> + <XEntityExtension name="FileSystemJar"> + <XChildrenEntities> + <XChildEntity name="FacesConfig20"/> + </XChildrenEntities> + <XActionItem kind="list"/> + </XEntityExtension> + <XEntityExtension name="JarFolder"> + <XChildrenEntities> + <XChildEntity name="FacesConfig20"/> + </XChildrenEntities> + <XActionItem kind="list"/> + </XEntityExtension> +</XModelEntityGroup> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -198,17 +198,18 @@ public void loadChildren(Element element, XModelObject o) { + String entity = o.getModelEntity().getName(); if(o.getFileType() == XModelObject.FILE) { super.loadChildren(element, o); for (int i = 0; i < folders.length; i++) { XModelObject c = o.getChildByPath(folders[i]); if(c != null) super.loadChildren(element, c); } - } else if("JSFManagedBean".equals(o.getModelEntity().getName())) { //$NON-NLS-1$ + } else if("JSFManagedBean".equals(entity) || "JSFManagedBean20".equals(entity)) { //$NON-NLS-1$ loadManagedBeanChildren(element, o); - } else if("JSFManagedProperty".equals(o.getModelEntity().getName())) { //$NON-NLS-1$ + } else if("JSFManagedProperty".equals(entity)) { //$NON-NLS-1$ loadManagedPropertyChildren(element, o); - } else if("JSFListEntries".equals(o.getModelEntity().getName())) { //$NON-NLS-1$ + } else if("JSFListEntries".equals(entity)) { //$NON-NLS-1$ loadListEntriesChildren(element, o); } else { super.loadChildren(element, o); @@ -221,17 +222,17 @@ } boolean needToSave(XModelObject o) { if(o == null) return false; - String entity = o.getModelEntity().getName(); - if("JSFApplication".equals(entity) || "JSFApplication12".equals(entity)) { //$NON-NLS-1$ //$NON-NLS-2$ - return (hasSetAttributes(o) - || o.getChildren().length > 1 - || needToSave(o.getChildByPath("Locale Config"))); //$NON-NLS-1$ - } else if("JSFLifecycle".equals(entity) || "JSFLocaleConfig".equals(entity)) { //$NON-NLS-1$ //$NON-NLS-2$ - return (hasSetAttributes(o) || o.getChildren().length > 0); - } else if("JSFFactory".equals(entity)) { //$NON-NLS-1$ - return (hasSetAttributes(o)); + + String s = o.getModelEntity().getProperty("saveDefault"); //$NON-NLS-1$ + if(!"false".equals(s)) return true; //$NON-NLS-1$ + if(hasSetAttributes(o)) return true; + XModelObject[] cs = o.getChildren(); + if(cs.length > 2) return true; + for (int i = 0; i < cs.length; i++) { + if(needToSave(cs[i])) return true; } - return true; + + return false; } private boolean hasSetAttributes(XModelObject o) { @@ -249,6 +250,7 @@ } public boolean saveChildren(Element element, XModelObject o) { + String entity = o.getModelEntity().getName(); if(o.getFileType() == XModelObject.FILE) { for (int i = 0; i < folders.length; i++) { XModelObject c = o.getChildByPath(folders[i]); @@ -256,13 +258,13 @@ } super.saveChildren(element, o); return true; - } else if("JSFManagedBean".equals(o.getModelEntity().getName())) { //$NON-NLS-1$ + } else if("JSFManagedBean".equals(entity) || "JSFManagedBean20".equals(entity)) { //$NON-NLS-1$ saveManagedBeanChildren(element, o); return true; - } else if("JSFManagedProperty".equals(o.getModelEntity().getName())) { //$NON-NLS-1$ + } else if("JSFManagedProperty".equals(entity)) { //$NON-NLS-1$ saveManagedPropertyChildren(element, o); return true; - } else if("JSFListEntries".equals(o.getModelEntity().getName())) { //$NON-NLS-1$ + } else if("JSFListEntries".equals(entity)) { //$NON-NLS-1$ saveListEntriesChildren(element, o); return true; } else { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FileFacesConfigImpl.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FileFacesConfigImpl.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FileFacesConfigImpl.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -31,12 +31,13 @@ } protected boolean hasDTD() { - return !"FacesConfig12".equals(getModelEntity().getName()); //$NON-NLS-1$ + String entity = getModelEntity().getName(); + return ENT_FACESCONFIG_10.equals(entity) || ENT_FACESCONFIG_11.equals(entity); } public void updateRuleIndices() { Map<String,Integer> paths = new HashMap<String,Integer>(); - XModelObject[] rs = getChildByPath(FOLDER_NAVIGATION_RULES).getChildren(ENT_NAVIGATION_RULE); + XModelObject[] rs = getChildByPath(FOLDER_NAVIGATION_RULES).getChildren(); Map<String,XModelObject> pps = new HashMap<String,XModelObject>(); int[] is = new int[rs.length]; for (int i = 0; i < rs.length; i++) { @@ -81,7 +82,7 @@ XModelObject[] os = children.getObjects(); boolean updateRules = false; if(from >= 0 && from < os.length && to >= 0 && to < os.length && from != to) { - updateRules = ENT_NAVIGATION_RULE.equals(os[from].getModelEntity().getName()); + updateRules = os[from].getModelEntity().getName().startsWith(ENT_NAVIGATION_RULE); } boolean b = super.move(from, to, firechange); if(b && updateRules) updateRuleIndices(); @@ -89,11 +90,13 @@ } public XModelObject addRule(String fromViewId) { - XModelObject rule = getModel().createModelObject(ENT_NAVIGATION_RULE, null); + XModelObject rules = getChildByPath(FOLDER_NAVIGATION_RULES); + String ruleEntity = getNavigationRuleEntity(rules); + XModelObject rule = getModel().createModelObject(ruleEntity, null); rule.setAttributeValue(ATT_FROM_VIEW_ID, fromViewId); int i = getRuleCount(fromViewId); rule.setAttributeValue("index", "" + i); //$NON-NLS-1$ //$NON-NLS-2$ - getChildByPath(FOLDER_NAVIGATION_RULES).addChild(rule); + rules.addChild(rule); return rule; } @@ -117,4 +120,8 @@ } } + public static String getNavigationRuleEntity(XModelObject folder) { + if(folder == null || !folder.getModelEntity().getName().startsWith(ENT_NAVIGATION_RULES)) return null; + return folder.getModelEntity().getChildren()[0].getName(); + } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -16,15 +16,27 @@ public static final String DOC_EXTDTD = "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"; //$NON-NLS-1$ public static final String DOC_PUBLICID_11 = "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"; //$NON-NLS-1$ public static final String DOC_EXTDTD_11 = "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"; //$NON-NLS-1$ + + public static final String JAVAEE_URI = "http://java.sun.com/xml/ns/javaee"; //$NON-NLS-1$ public static final String ELM_PROCESS = "process"; //$NON-NLS-1$ + public static final String SUFF_11 = "11"; //$NON-NLS-1$ + public static final String SUFF_12 = "12"; //$NON-NLS-1$ + public static final String SUFF_20 = "20"; //$NON-NLS-1$ + public static final String ENT_FACESCONFIG = "FacesConfig"; //$NON-NLS-1$ public static final String ENT_FACESCONFIG_10 = ENT_FACESCONFIG; - public static final String ENT_FACESCONFIG_11 = ENT_FACESCONFIG + "11"; //$NON-NLS-1$ - public static final String ENT_FACESCONFIG_12 = ENT_FACESCONFIG + "12"; //$NON-NLS-1$ + public static final String ENT_FACESCONFIG_11 = ENT_FACESCONFIG + SUFF_11; + public static final String ENT_FACESCONFIG_12 = ENT_FACESCONFIG + SUFF_12; + public static final String ENT_FACESCONFIG_20 = ENT_FACESCONFIG + SUFF_20; + + public static final String ENT_NAVIGATION_RULES = "JSFNavigationRules"; //$NON-NLS-1$ + public static final String ENT_NAVIGATION_RULE = "JSFNavigationRule"; //$NON-NLS-1$ public static final String ENT_NAVIGATION_CASE = "JSFNavigationCase"; //$NON-NLS-1$ + public static final String ENT_NAVIGATION_RULE_20 = ENT_NAVIGATION_RULE + SUFF_20; + public static final String ENT_NAVIGATION_CASE_20 = ENT_NAVIGATION_CASE + SUFF_20; public static final String ENT_PROCESS = "JSFProcess"; //$NON-NLS-1$ public static final String ENT_PROCESS_GROUP = "JSFProcessGroup"; //$NON-NLS-1$ Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -42,18 +42,27 @@ if(dt.indexOf(DOC_PUBLICID_11) > 0) return ENT_FACESCONFIG_11; if(dt.indexOf("SYSTEM") > 0 && dt.indexOf("web-facesconfig_1_1.dtd") > 0) return ENT_FACESCONFIG_11; //$NON-NLS-1$ //$NON-NLS-2$ } - if(is12(body)) return ENT_FACESCONFIG_12; + String versionSuffix = getVersion(body); + if(SUFF_12.equals(versionSuffix)) { + return ENT_FACESCONFIG_12; + } + if(SUFF_20.equals(versionSuffix)) { + return ENT_FACESCONFIG_20; + } return null; } - private boolean is12(String body) { + private String getVersion(String body) { int i = body.indexOf("<faces-config"); //$NON-NLS-1$ - if(i < 0) return false; + if(i < 0) return null; int j = body.indexOf(">", i); //$NON-NLS-1$ - if(j < 0) return false; + if(j < 0) return null; String s = body.substring(i, j); - return s.indexOf("version=\"1.2\"") > 0 && //$NON-NLS-1$ - s.indexOf("\"http://java.sun.com/xml/ns/javaee\"") > 0; //$NON-NLS-1$ + String uriValue = "" + '"' + JAVAEE_URI + '"'; + if(s.indexOf(uriValue) < 0) return null; + if(s.indexOf("version=\"1.2\"") > 0) return SUFF_12; //$NON-NLS-1$ + if(s.indexOf("version=\"2.0\"") > 0) return SUFF_20; //$NON-NLS-1$ + return null; } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -35,9 +35,13 @@ } fv = AddViewSupport.revalidatePath(fv); p.setProperty(ATT_TO_VIEW_ID, fv); - XModelObject ncase = object.getModel().createModelObject(ENT_NAVIGATION_CASE, p); + String caseEntity = ENT_NAVIGATION_CASE; + if(object.getParent().getParent().getModelEntity().getName().endsWith(SUFF_20)) { + caseEntity = ENT_NAVIGATION_CASE_20; + } + XModelObject ncase = object.getModel().createModelObject(caseEntity, p); ReferenceGroupImpl g = (ReferenceGroupImpl)object; - /*TRIAL_JSF*/ + XModelObject[] rs = g.getReferences(); if(rs.length > 0) { DefaultCreateHandler.addCreatedObject(rs[rs.length - 1], ncase, p); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -22,12 +22,14 @@ } public void executeHandler(XModelObject object, Properties p) throws XModelException { + XModelObject rules = object.getParent().getParent().getChildByPath(FOLDER_NAVIGATION_RULES); + String ruleEntity = FileFacesConfigImpl.getNavigationRuleEntity(rules); String path = object.getAttributeValue(ATT_PATH); JSFNavigationModel nm = (JSFNavigationModel)object.getParent().getParent(); - XModelObject o = object.getModel().createModelObject(ENT_NAVIGATION_RULE, null); + XModelObject o = object.getModel().createModelObject(ruleEntity, null); o.setAttributeValue(ATT_FROM_VIEW_ID, path); o.setAttributeValue("index", "" + nm.getRuleCount(path)); //$NON-NLS-1$ //$NON-NLS-2$ - object.getParent().getParent().getChildByPath(FOLDER_NAVIGATION_RULES).addChild(o); + rules.addChild(o); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -23,6 +23,7 @@ import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.impl.FileSystemImpl; +import org.jboss.tools.common.model.impl.XModelObjectImpl; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.FindObjectHelper; @@ -181,9 +182,14 @@ XModelObject[] rs = ((ReferenceGroupImpl)sample).getReferences(); if(rs == null || rs.length == 0) return; for (int i = 0; i < rs.length; i++) { - XModelObject[] cs = rs[i].getChildren(ENT_NAVIGATION_CASE); + String caseEntity = rule.getModelEntity().getChildren()[0].getName(); + XModelObject[] cs = rs[i].getChildren(); for (int j = 0; j < cs.length; j++) { - rule.addChild(cs[j].copy()); + XModelObject c = cs[j].copy(); + if(c.getModelEntity().getName().equals(caseEntity)) { + ((XModelObjectImpl)c).changeEntity(caseEntity); + } + rule.addChild(c); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -10,12 +10,12 @@ ******************************************************************************/ package org.jboss.tools.jsf.model.handlers; + import java.util.*; import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.jsf.JSFPreference; -import org.jboss.tools.jsf.model.JSFConstants; import org.jboss.tools.jsf.model.helpers.JSFProcessStructureHelper; public class DeleteOutputHandler extends DefaultRemoveHandler { @@ -27,7 +27,7 @@ XModelObject ruleObject = caseObject.getParent(); super.removeFromParent(caseObject); boolean q = "yes".equals(JSFPreference.DO_NOT_CREATE_EMPTY_RULE.getValue()); //$NON-NLS-1$ - if(q && ruleObject.getChildren(JSFConstants.ENT_NAVIGATION_CASE).length == 0) { + if(q && ruleObject.getChildren().length == 0) { group.getModel().changeObjectAttribute(group, "persistent", "true"); //$NON-NLS-1$ //$NON-NLS-2$ super.removeFromParent(ruleObject); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -37,10 +37,10 @@ if(ENT_PROCESS_GROUP.equals(entity)) { return canBeOutputTarget(target); } - if(ENT_NAVIGATION_RULE.equals(entity)) { + if(ENT_NAVIGATION_RULE.equals(entity) || ENT_NAVIGATION_RULE_20.equals(entity)) { return canBeOutputTarget(target); } - if(ENT_NAVIGATION_CASE.equals(entity)) { + if(ENT_NAVIGATION_CASE.equals(entity) || ENT_NAVIGATION_CASE_20.equals(entity)) { return canBeOutputTarget(target); } return false; @@ -79,8 +79,8 @@ } else if(ENT_PROCESS_ITEM.equals(entity)) adoptItem(object, target, p); else if(ENT_PROCESS_GROUP.equals(entity)) adoptGroup(object, target, p); - else if(ENT_NAVIGATION_RULE.equals(entity)) adoptRule(object, target, p); - else if(ENT_NAVIGATION_CASE.equals(entity)) adoptCase(object, target, p); + else if(ENT_NAVIGATION_RULE.equals(entity) || ENT_NAVIGATION_RULE_20.equals(entity)) adoptRule(object, target, p); + else if(ENT_NAVIGATION_CASE.equals(entity) || ENT_NAVIGATION_CASE_20.equals(entity)) adoptCase(object, target, p); } protected void adoptOutput(XModelObject source, XModelObject target, Properties p) throws XModelException { @@ -102,7 +102,8 @@ String n = path; if(n.lastIndexOf('.') > 0) n = n.substring(0, n.lastIndexOf('.')); if(n.lastIndexOf('/') >= 0) n = n.substring(n.lastIndexOf('/') + 1); - XModelObject cs = source.getModel().createModelObject(ENT_NAVIGATION_CASE, null); + String caseEntity = source.getModelEntity().getChildren()[0].getName(); + XModelObject cs = source.getModel().createModelObject(caseEntity, null); cs.setAttributeValue(ATT_TO_VIEW_ID, path); cs.setAttributeValue(ATT_FROM_OUTCOME, n); int i = 0; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -216,7 +216,7 @@ XModelObject g = object.getParent().getParent(); String entity = g.getModelEntity().getName(); String start = null; - if("JSFManagedBean".equals(entity)) { //$NON-NLS-1$ + if("JSFManagedBean".equals(entity) || "JSFManagedBean20".equals(entity)) { //$NON-NLS-1$ String bean = g.getAttributeValue("managed-bean-name"); //$NON-NLS-1$ start = "#{" + bean + "." + key + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else if("JSFManagedProperty".equals(entity)) { //$NON-NLS-1$ Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OpenPageHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OpenPageHandler.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OpenPageHandler.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -20,13 +20,13 @@ String entity = source.getModelEntity().getName(); String attr = null; /*TRIAL_JSF*/ - if(ENT_NAVIGATION_RULE.equals(entity)) { + if(ENT_NAVIGATION_RULE.equals(entity) || ENT_NAVIGATION_RULE_20.equals(entity)) { attr = ATT_FROM_VIEW_ID; } else if(ENT_PROCESS_GROUP.equals(entity) || ENT_PROCESS_ITEM.equals(entity) || ENT_PROCESS_ITEM_OUTPUT.equals(entity)) { attr = ATT_PATH; - } else if(ENT_NAVIGATION_CASE.equals(entity)) { + } else if(ENT_NAVIGATION_CASE.equals(entity) || ENT_NAVIGATION_CASE_20.equals(entity)) { attr = ATT_TO_VIEW_ID; } if(attr == null) return null; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ProcessAdopt.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ProcessAdopt.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ProcessAdopt.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -79,7 +79,8 @@ group.setModified(true); } else { XModelObject rules = process.getParent().getChildByPath(FOLDER_NAVIGATION_RULES); - XModelObject rule = rules.getModel().createModelObject(ENT_NAVIGATION_RULE, null); + String ruleEntity = FileFacesConfigImpl.getNavigationRuleEntity(rules); + XModelObject rule = rules.getModel().createModelObject(ruleEntity, null); rule.setAttributeValue(ATT_FROM_VIEW_ID, path); DefaultCreateHandler.addCreatedObject(rules, rule, p); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/IPathSourceImpl.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/IPathSourceImpl.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/IPathSourceImpl.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -52,9 +52,9 @@ public static String getPath(XModelObject object) { String f = null; String entity = object.getModelEntity().getName(); - if(ENT_NAVIGATION_RULE.equals(entity)) { + if(ENT_NAVIGATION_RULE.equals(entity) || ENT_NAVIGATION_RULE_20.equals(entity)) { f = object.getAttributeValue(ATT_FROM_VIEW_ID); - } else if(ENT_NAVIGATION_CASE.equals(entity)) { + } else if(ENT_NAVIGATION_CASE.equals(entity) || ENT_NAVIGATION_CASE_20.equals(entity)) { f = object.getAttributeValue(ATT_TO_VIEW_ID); } else if(ENT_PROCESS_GROUP.equals(entity)) { f = object.getAttributeValue(ATT_PATH); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFProcessHelper.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFProcessHelper.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFProcessHelper.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -78,7 +78,7 @@ } private void updateProcess0() { reset(); - rules = config.getChildByPath(FOLDER_NAVIGATION_RULES).getChildren(ENT_NAVIGATION_RULE); + rules = config.getChildByPath(FOLDER_NAVIGATION_RULES).getChildren(); for (int i = 0; i < rules.length; i++) { String fvi = rules[i].getAttributeValue(ATT_FROM_VIEW_ID); if(fvi == null) continue; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/OpenCaseHelper.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/OpenCaseHelper.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/OpenCaseHelper.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -78,11 +78,11 @@ for (int i = 0; i < os.length; i++) { XModelObject r = os[i].getChildByPath(JSFConstants.FOLDER_NAVIGATION_RULES); if(r == null) continue; - XModelObject[] rs = r.getChildren(JSFConstants.ENT_NAVIGATION_RULE); + XModelObject[] rs = r.getChildren(); for (int j = 0; j < rs.length; j++) { String fromViewId = rs[j].getAttributeValue(JSFConstants.ATT_FROM_VIEW_ID); if(!OpenCaseHelper.isPatternMatches(fromViewId, viewPath)) continue; - XModelObject[] cs = rs[j].getChildren(JSFConstants.ENT_NAVIGATION_CASE); + XModelObject[] cs = rs[j].getChildren(); for (int k = 0; k < cs.length; k++) { String q1 = cs[k].getAttributeValue(JSFConstants.ATT_FROM_OUTCOME); String q2 = cs[k].getAttributeValue(JSFConstants.ATT_FROM_ACTION); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/NavigationRulesObjectImpl.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/NavigationRulesObjectImpl.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/NavigationRulesObjectImpl.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -22,7 +22,7 @@ XModelObject[] os = children.getObjects(); boolean updateRules = false; if(from >= 0 && from < os.length && to >= 0 && to < os.length && from != to) { - updateRules = ENT_NAVIGATION_RULE.equals(os[from].getModelEntity().getName()); + updateRules = os[from].getModelEntity().getName().startsWith(ENT_NAVIGATION_RULE); } boolean b = super.move(from, to, firechange); if(b && updateRules) ((JSFNavigationModel)getParent()).updateRuleIndices(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -453,10 +453,10 @@ for (int i = 0; i < os.length; i++) { XModelObject r = os[i].getChildByPath(JSFConstants.FOLDER_NAVIGATION_RULES); if(r == null) continue; - XModelObject[] rs = r.getChildren(JSFConstants.ENT_NAVIGATION_RULE); + XModelObject[] rs = r.getChildren(); for (int j = 0; j < rs.length; j++) { if(!OpenCaseHelper.isPatternMatches(rs[j].getAttributeValue(JSFConstants.ATT_FROM_VIEW_ID), viewPath)) continue; - XModelObject[] cs = rs[j].getChildren(JSFConstants.ENT_NAVIGATION_CASE); + XModelObject[] cs = rs[j].getChildren(); for (int k = 0; k < cs.length; k++) { String q = cs[k].getAttributeValue(JSFConstants.ATT_FROM_OUTCOME); if(!list.contains(q)) list.add(q); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JsfTreeListener.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JsfTreeListener.java 2010-01-20 16:13:50 UTC (rev 19827) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JsfTreeListener.java 2010-01-20 16:52:22 UTC (rev 19828) @@ -64,7 +64,7 @@ invalidateConfig(source.getModel()); } else if(entity.startsWith(JSFConstants.ENT_FACESCONFIG)) { invalidateConfig(source.getModel()); - } else if("JSFManagedBean".equals(entity)) { + } else if("JSFManagedBean".equals(entity) || "JSFManagedBean20".equals(entity)) { invalidateFolder(source.getModel(), JSFProjectTreeConstants.BEANS); } else if("JSFReferencedBean".equals(entity)) { invalidateFolder(source.getModel(), JSFProjectTreeConstants.BEANS); @@ -82,7 +82,7 @@ return; } else if("FileSystems".equals(entity)) { invalidateTagLibs(source.getModel()); - } else if("JSFManagedBeans".equals(entity)) { + } else if("JSFManagedBeans".equals(entity) || "JSFManagedBean20".equals(entity)) { invalidateFolder(source.getModel(), JSFProjectTreeConstants.BEANS); } else if("JSFReferencedBeans".equals(entity)) { invalidateFolder(source.getModel(), JSFProjectTreeConstants.BEANS);