January 2010 - jbosstools-commits

JBoss Tools SVN: r19828 - in trunk/jsf/plugins/org.jboss.tools.jsf: resources/meta and 7 other directories.

by jbosstools-commits＠lists.jboss.org

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);

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19827 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692 and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2010-01-20 11:13:50 -0500 (Wed, 20 Jan 2010) New Revision: 19827 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test1.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test2.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test3.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java Log: https://jira.jboss.org/jira/browse/JBIDE-5692 - fixed Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test1.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test1.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test1.jsp 2010-01-20 16:13:50 UTC (rev 19827) @@ -0,0 +1,12 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<html> + <head> + <title></title> + </head> + <body> + <f:view> + test1 + </f:view> + </body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test2.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test2.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test2.jsp 2010-01-20 16:13:50 UTC (rev 19827) @@ -0,0 +1,12 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<html> + <head> + <title></title> + </head> + <body> + <f:view> + test2 + </f:view> + </body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test3.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test3.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test3.jsp 2010-01-20 16:13:50 UTC (rev 19827) @@ -0,0 +1,12 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<html> + <head> + <title></title> + </head> + <body> + <f:view> + test3 + </f:view> + </body> +</html> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-01-20 15:11:52 UTC (rev 19826) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-01-20 16:13:50 UTC (rev 19827) @@ -71,6 +71,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInJarPackageFragment_JBIDE5682; import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382; import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692; import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642; import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test; @@ -194,6 +195,7 @@ suite.addTestSuite(OpenOnInJarPackageFragment_JBIDE5682.class); suite.addTestSuite(MessageResolutionInPreviewTabTest.class); suite.addTestSuite(OpenOnTLDPackedInJar_JBIDE5693.class); + suite.addTestSuite(PreferencesForEditors_JBIDE5692.class); // $JUnit-END$ // added by Max Areshkau Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java 2010-01-20 15:11:52 UTC (rev 19826) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java 2010-01-20 16:13:50 UTC (rev 19827) @@ -30,6 +30,8 @@ */ public class MessageResolutionInPreviewTabTest extends VpeTest { + JSPMultiPageEditor part; + public MessageResolutionInPreviewTabTest(String name) { super(name); } @@ -41,9 +43,8 @@ IEditorInput input = new FileEditorInput(file); assertNotNull("Editor input is null", input); //$NON-NLS-1$ // open and get editor - JSPMultiPageEditor part = openEditor(input); + part = openEditor(input); part.pageChange(part.getPreviewIndex()); - part.setPreviewIndex(2); MozillaPreview mozillaPreview = (MozillaPreview) part.getVisualEditor().getPreviewWebBrowser(); //here we wait for preview initialization, but it's should be less then 1 second @@ -60,5 +61,11 @@ throw getException(); } } + + @Override + protected void tearDown() throws Exception { + part.pageChange(part.getVisualSourceIndex()); + super.tearDown(); + } } Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java 2010-01-20 16:13:50 UTC (rev 19827) @@ -0,0 +1,79 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jsf.test.jbide; + +import org.eclipse.core.resources.IFile; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; + +/** + * + * @author yzhishko + * + */ + +public class PreferencesForEditors_JBIDE5692 extends VpeTest { + + private JSPMultiPageEditor part1; + private JSPMultiPageEditor part2; + private JSPMultiPageEditor part3; + + public PreferencesForEditors_JBIDE5692(String name) { + super(name); + } + + public void testPreferencesForEditors() throws Throwable { + setException(null); + openFirstTestPage(); + openSecondTestPage(); + openThirdTestPage(); + } + + private void openFirstTestPage() throws Throwable{ + IFile file = (IFile) TestUtil.getComponentPath("JBIDE/5692/test1.jsp", //$NON-NLS-1$ + JsfAllTests.IMPORT_PROJECT_NAME); + IEditorInput input = new FileEditorInput(file); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ + // open and get editor + part1 = openEditor(input); + part1.pageChange(part1.getPreviewIndex()); + } + + private void openSecondTestPage() throws Throwable{ + IFile file = (IFile) TestUtil.getComponentPath("JBIDE/5692/test2.jsp", //$NON-NLS-1$ + JsfAllTests.IMPORT_PROJECT_NAME); + IEditorInput input = new FileEditorInput(file); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ + // open and get editor + part2 = openEditor(input); + checkOpenedTab(2,part2.getSelectedPageIndex()); + part2.pageChange(part2.getVisualSourceIndex()); + } + + private void openThirdTestPage() throws Throwable{ + IFile file = (IFile) TestUtil.getComponentPath("JBIDE/5692/test3.jsp", //$NON-NLS-1$ + JsfAllTests.IMPORT_PROJECT_NAME); + IEditorInput input = new FileEditorInput(file); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ + // open and get editor + part3 = openEditor(input); + checkOpenedTab(0,part3.getSelectedPageIndex()); + } + + private void checkOpenedTab(int expected, int actual){ + assertEquals("Tab index is incorrect ", expected, actual); //$NON-NLS-1$ + } + +} Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-01-20 15:11:52 UTC (rev 19826) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-01-20 16:13:50 UTC (rev 19827) @@ -100,7 +100,7 @@ private IVisualEditor visualEditor; private int visualSourceIndex; - + private JSPTextEditor sourceEditor; private int sourceIndex; @@ -222,7 +222,12 @@ } } superPageChange(newPageIndex); + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.DEFAULT_VPE_TAB, selectedPageIndex); + } + public int getSelectedPageIndex() { + return selectedPageIndex; } public void setInput(IEditorInput input) { @@ -811,6 +816,14 @@ this.previewIndex = previewIndex; } + public void setVisualSourceIndex(int visualSourceIndex) { + this.visualSourceIndex = visualSourceIndex; + } + + public int getVisualSourceIndex() { + return visualSourceIndex; + } + } class ResourceChangeListener implements IResourceChangeListener { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-01-20 15:11:52 UTC (rev 19826) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-01-20 16:13:50 UTC (rev 19827) @@ -87,6 +87,7 @@ import org.jboss.tools.vpe.editor.xpl.CustomSashForm; import org.jboss.tools.vpe.editor.xpl.EditorSettings; import org.jboss.tools.vpe.editor.xpl.SashSetting; +import org.jboss.tools.vpe.editor.xpl.CustomSashForm.ICustomSashFormListener; import org.jboss.tools.vpe.messages.VpeUIMessages; import org.jboss.tools.vpe.selbar.SelectionBar; import org.jboss.tools.vpe.selbar.VisibilityEvent; @@ -321,39 +322,6 @@ } } - protected int[] loadSplitterPosition() { - int[] sizes = new int[3]; - try { - IEditorInput input = getEditorInput(); - if (!(input instanceof IFileEditorInput)) - return null; - - IFile file = ((IFileEditorInput) input).getFile(); - String s = file.getPersistentProperty(SPLITTER_POSITION_KEY1); - if (s != null) { - sizes[0] = Integer.parseInt(s); - } else - return null; - - s = file.getPersistentProperty(SPLITTER_POSITION_KEY2); - if (s != null) { - sizes[1] = Integer.parseInt(s); - } else - return null; - - s = file.getPersistentProperty(SPLITTER_POSITION_KEY3); - if (s != null) { - sizes[2] = Integer.parseInt(s); - } else - return null; - - } catch (CoreException e) { - VpePlugin.getPluginLog().logError(e); - return null; - } - return sizes; - } - public void setVisualMode(int type) { switch (type) { case VISUALSOURCE_MODE: @@ -576,10 +544,6 @@ super.safelySanityCheckState(input); } }; - int[] weights = loadSplitterPosition(); - if (weights != null) { - container.setWeights(weights); - } container.setSashBorders(new boolean[] { true, true, true }); controlListener = new ControlListener() { @@ -768,6 +732,12 @@ return null; } }; + container.addCustomSashFormListener(new ICustomSashFormListener() { + public void dividerMoved(int firstControlWeight, int secondControlWeight) { + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS, secondControlWeight); + } + }); } /** @@ -1209,12 +1179,7 @@ selectionBar.setVisible(presfShowSelectionBar); doVisualRefresh = true; } - /* - * Commented to fix https://jira.jboss.org/jira/browse/JBIDE-4941 Do - * not update VPE splitting, weights, tabs for current page, do it - * for newly opened ones only. - */ -// fillContainer(false, null); + boolean prefsShowNonVisualTags = JspEditorPlugin.getDefault() .getPreferenceStore().getBoolean( IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); @@ -1224,6 +1189,7 @@ prefsShowNonVisualTags); doVisualRefresh = true; } + boolean prefsShowBundlesAsEL = JspEditorPlugin .getDefault() .getPreferenceStore() @@ -1241,6 +1207,7 @@ if (doVisualRefresh) { getController().visualRefresh(); } + fillContainer(false, null); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-01-20 15:11:52 UTC (rev 19826) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-01-20 16:13:50 UTC (rev 19827) @@ -330,7 +330,8 @@ * to redraw CustomSashForm with new layout. */ getController().getPageContext().getEditPart().fillContainer(true, newOrientation); - + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, newOrientation); } }; rotateEditorsAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class, @@ -354,6 +355,8 @@ * Update VPE */ controller.visualRefresh(); + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS, this.isChecked()); } }; showBorderAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class, @@ -378,6 +381,8 @@ * Update VPE */ controller.visualRefresh(); + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS, this.isChecked()); } }; showNonVisualTagsAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class, @@ -396,6 +401,8 @@ * Update Selection Bar */ controller.getPageContext().getEditPart().updateSelectionBar(this.isChecked()); + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, this.isChecked()); } }; showSelectionBarAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class, @@ -414,6 +421,8 @@ * Update Text Formatting Bar */ vpeToolBarManager.setToolbarVisibility(this.isChecked()); + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.SHOW_TEXT_FORMATTING, this.isChecked()); } }; showTextFormattingAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class, @@ -433,6 +442,8 @@ */ controller.getPageContext().getBundle().updateShowBundleUsageAsEL(this.isChecked()); controller.visualRefresh(); + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, this.isChecked()); } }; showBundleAsELAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class, Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2010-01-20 15:11:52 UTC (rev 19826) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2010-01-20 16:13:50 UTC (rev 19827) @@ -1131,7 +1131,7 @@ protected void fireDividerMoved(){ if(customSashFormListeners!=null && customSashFormListeners.size()>0){ int[] weights = getWeights(); - if(weights!=null && weights.length==2){ + if(weights!=null && weights.length==3){ int firstControlWeight = weights[0]; int secondControlWeight = weights[1]; for (Iterator<ICustomSashFormListener> listenerItr = customSashFormListeners.iterator(); listenerItr.hasNext();) {

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19826 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2010-01-20 10:11:52 -0500 (Wed, 20 Jan 2010) New Revision: 19826 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoContentAssistantProposal.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java Log: JBIDE-3290: sorting/filtering is not updating correctly in code completion of source page in VPE Predicate EL proposals are added for attribute value regions in XML/XHTML/JSP editors and for text regions in XML/XHTML editors. The predicative proposals, when applied, change the word/part of word right before cursor to EL expression by inserting '#{' character sequence before the word/part of word beginning and '} ' character sequence right after proposed text. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2010-01-20 14:51:57 UTC (rev 19825) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2010-01-20 15:11:52 UTC (rev 19826) @@ -996,6 +996,74 @@ } /** + * Returns EL Predicate Text Region Information Object + * + * + * @return + */ + protected TextRegion getELPredicatePrefix(ContentAssistRequest request) { + if (!DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(request.getRegion().getType()) && + !DOMRegionContext.XML_CONTENT.equals(request.getRegion().getType()) && + !DOMRegionContext.BLOCK_TEXT.equals(request.getRegion().getType())) + return null; + + String text = request.getDocumentRegion().getFullText(request.getRegion()); + int startOffset = request.getDocumentRegion().getStartOffset() + request.getRegion().getStart(); + + boolean isAttributeValue = false; + boolean hasOpenQuote = false; + boolean hasCloseQuote = false; + char quoteChar = (char)0; + if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(request.getRegion().getType())) { + isAttributeValue = true; + if (text.startsWith("\"") || text.startsWith("'")) {//$NON-NLS-1$ //$NON-NLS-2$ + quoteChar = text.charAt(0); + hasOpenQuote = true; + } + if (hasOpenQuote && text.endsWith(String.valueOf(quoteChar))) { + hasCloseQuote = true; + } + } + + int inValueOffset = getOffset() - startOffset; + if (inValueOffset<0 || // There is no a word part before cursor + (text != null && text.length() < inValueOffset)) { // probably, the attribute value ends before the document position + return null; + } + + String matchString = getELPredicateMatchString(text, inValueOffset); + if (matchString == null) + return null; + + TextRegion tr = new TextRegion(startOffset, getOffset() - matchString.length() - startOffset, + matchString.length(), matchString, false, false, + isAttributeValue, hasOpenQuote, hasCloseQuote, quoteChar); + + return tr; + } + + /** + * Returns predicate string for the EL-related query. + * The predicate string is the word/part of word right before the cursor position, including the '.' and '_' characters, + * which is to be replaced by the EL CA proposal ('#{' and '}' character sequences are to be inserted too) + * + * @param text + * @param offset + * @return + */ + protected String getELPredicateMatchString(String text, int offset) { + int beginningOffset = offset - 1; + while(beginningOffset >=0 && + (Character.isJavaIdentifierPart(text.charAt(beginningOffset)) || + '.' == text.charAt(beginningOffset) || + '_' == text.charAt(beginningOffset))) { + beginningOffset--; + } + beginningOffset++; // move it to point the first valid character + return text.substring(beginningOffset, offset); + } + + /** * Returns EL Prefix Text Region Information Object * * @deprecated Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoContentAssistantProposal.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoContentAssistantProposal.java 2010-01-20 14:51:57 UTC (rev 19825) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoContentAssistantProposal.java 2010-01-20 15:11:52 UTC (rev 19826) @@ -21,8 +21,12 @@ import org.eclipse.jface.viewers.StyledString; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; +import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; +import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; +import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceConstants; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** * @author Igels @@ -129,6 +133,28 @@ private int fOriginalReplacementLength; + /** + * Returns true in case of the region at specified offset is a node name region + * + * @param document + * @param offset + * @return + */ + private boolean isTagName(IDocument document, int offset) { + if (!(document instanceof IStructuredDocument)) + return false; + + int lastOffset = offset; + IStructuredDocumentRegion sdRegion = ((IStructuredDocument)document).getRegionAtCharacterOffset(offset); + while (sdRegion == null && lastOffset >= 0) { + lastOffset--; + sdRegion = ((IStructuredDocument)document).getRegionAtCharacterOffset(lastOffset); + } + + ITextRegion region = sdRegion == null ? null : sdRegion.getRegionAtCharacterOffset(offset); + + return DOMRegionContext.XML_TAG_NAME.equals(region == null ? null : region.getType()); + } // Fix for JBIDE-5125 >>> @Override @@ -138,10 +164,14 @@ if (offset < fReplacementOffset) return false; boolean validated = startsWith(document, offset, getReplacementString()); - if (!validated && getReplacementString() != null && getReplacementString().indexOf(":") != -1) { //$NON-NLS-1$ + if (!validated && isTagName(document, fReplacementOffset) && getReplacementString() != null && getReplacementString().indexOf(":") != -1) { //$NON-NLS-1$ String replacementString = getReplacementString().substring(getReplacementString().indexOf(":") + 1); //$NON-NLS-1$ validated = startsWith(document, offset, replacementString); } + if (!validated && getReplacementString() != null && getReplacementString().startsWith("#{")) { //$NON-NLS-1$ + String replacementString = getReplacementString().substring(getReplacementString().indexOf("#{") + 2); //$NON-NLS-1$ + validated = startsWith(document, offset, replacementString); + } // it would be better to use "originalCursorPosition" instead of // getReplacementOffset(), but we don't have that info. int newLength = offset - getReplacementOffset(); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2010-01-20 14:51:57 UTC (rev 19825) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2010-01-20 15:11:52 UTC (rev 19826) @@ -55,6 +55,29 @@ } /** + * Calculates and adds the tag proposals to the Content Assist Request object + * The method is to be overridden here because xhtml allows to use EL-s inside a text region + * + * @param contentAssistRequest Content Assist Request object + * @param childPosition the + */ + + @Override + protected void addTagInsertionProposals( + ContentAssistRequest contentAssistRequest, int childPosition) { + + // Need to check if an EL Expression is opened here. + // If it is true we don't need to start any new tag proposals + TextRegion prefix = getELPrefix(contentAssistRequest); + if (prefix != null && prefix.isELStarted()) { + return; + } + + addTagNameProposals(contentAssistRequest, childPosition, true); + addAttributeValueELPredicateProposals(contentAssistRequest); + } + + /** * Calculates and adds the EL proposals to the Content Assist Request object */ @Override Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2010-01-20 14:51:57 UTC (rev 19825) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2010-01-20 15:11:52 UTC (rev 19826) @@ -150,6 +150,28 @@ } /** + * Calculates and adds the tag proposals to the Content Assist Request object + * The method is to be overridden here because jsp disallows to use EL-s inside a text region + * + * @param contentAssistRequest Content Assist Request object + * @param childPosition the + */ + + @Override + protected void addTagInsertionProposals( + ContentAssistRequest contentAssistRequest, int childPosition) { + + // Need to check if an EL Expression is opened here. + // If it is true we don't need to start any new tag proposals + TextRegion prefix = getELPrefix(contentAssistRequest); + if (prefix != null && prefix.isELStarted()) { + return; + } + + addTagNameProposals(contentAssistRequest, childPosition, true); + } + + /** * Calculates and adds the attribute name proposals to the Content Assist Request object * * @param contentAssistRequest Content Assist Request object Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2010-01-20 14:51:57 UTC (rev 19825) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2010-01-20 15:11:52 UTC (rev 19826) @@ -105,6 +105,7 @@ } addTagNameProposals(contentAssistRequest, childPosition, true); + addAttributeValueELPredicateProposals(contentAssistRequest); } private void addTagNameProposalsForPrefix( @@ -283,8 +284,77 @@ contentAssistRequest.addProposal(proposal); } + + addAttributeValueELPredicateProposals(contentAssistRequest); } + /** + * Calculates and adds EL predicate proposals based on the last word typed + * To be used only outside the EL. + * + * @param contentAssistRequest + */ + protected void addAttributeValueELPredicateProposals(ContentAssistRequest contentAssistRequest) { + // Need to check if the cursor is placed right after a word part. + // If there is no word part found then just quit + TextRegion prefix = getELPredicatePrefix(contentAssistRequest); + if (prefix == null || prefix.isELStarted()) { + return; + } + String matchString = "#{" + prefix.getText(); //$NON-NLS-1$ + String query = matchString; + if (query == null) + query = ""; //$NON-NLS-1$ + String stringQuery = matchString; + + int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset(); + + KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, query, stringQuery); + TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext()); + + for (int i = 0; proposals != null && i < proposals.length; i++) { + TextProposal textProposal = proposals[i]; + + int replacementOffset = beginChangeOffset; + int replacementLength = prefix.getLength(); + String replacementString = "#{" + prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); //$NON-NLS-1$ + + char quoteChar = prefix.isAttributeValue() && prefix.hasOpenQuote() ? prefix.getQuoteChar() : '"'; + int cursorPosition = replacementString.length(); + + if (!prefix.isELClosed()) { + replacementString += "}"; //$NON-NLS-1$ + } + + if (prefix.isAttributeValue() && prefix.hasOpenQuote() && !prefix.hasCloseQuote()) { + replacementString += String.valueOf(quoteChar); + } + + Image image = textProposal.getImage(); + + // JBIDE-512, JBIDE-2541 related changes ===>>> +// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); + String displayString = textProposal.getLabel(); + if (displayString == null) + displayString = textProposal.getReplacementString() == null ? replacementString : textProposal.getReplacementString(); + // <<<=== JBIDE-512, JBIDE-2541 related changes + + IContextInformation contextInformation = null; + String additionalProposalInfo = (textProposal.getContextInfo() == null ? "" : textProposal.getContextInfo()); //$NON-NLS-1$ + int relevance = textProposal.getRelevance(); + if (relevance == TextProposal.R_NONE) { + relevance = TextProposal.R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE; + } + + AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(replacementString, + replacementOffset, replacementLength, cursorPosition, image, displayString, + contextInformation, additionalProposalInfo, relevance); + + contentAssistRequest.addProposal(proposal); + } + } + + @Override protected void addAttributeValueELProposals(ContentAssistRequest contentAssistRequest) { if (!isJsfProject())

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19825 - trunk/jmx/docs/reference/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2010-01-20 09:51:57 -0500 (Wed, 20 Jan 2010) New Revision: 19825 Added: trunk/jmx/docs/reference/en/modules/references.xml trunk/jmx/docs/reference/en/modules/summary.xml trunk/jmx/docs/reference/en/modules/tasks.xml Log: <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif"> <p>https://jira.jboss.org/jira/browse/JBDS-907 restructured JMX guide.</p> </body></html> Added: trunk/jmx/docs/reference/en/modules/references.xml =================================================================== --- trunk/jmx/docs/reference/en/modules/references.xml (rev 0) +++ trunk/jmx/docs/reference/en/modules/references.xml 2010-01-20 14:51:57 UTC (rev 19825) @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<chapter id="references" xreflabel="references"> + <?dbhtml filename="references.html"?> + <title>References</title> + + <section id="mbean_explorer" xreflabel="mbean_explorer"> + <?dbhtml filename="mbean_explorer.html"?> + + <title>MBean Explorer</title> + <para>The <property>MBean Explorer</property> displays the MBean features (both attributes and operations) in its + hierarchy. Double-clicking on a feature will open a <property>MBean Editor</property>, display the page + corresponding to the feature type and select the feature.</para> + + <figure> + <title>MBean Explorer Features</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/mbean-explorer-features.png"/> + </imageobject> + </mediaobject> + </figure> + + <para>Since it's possible to have many MBean Editors opened at the same time, the <property>MBean Explorer</property> + has the Link With Editor button + + <inlinemediaobject> + <imageobject> + <imagedata fileref="images/link-with-editor_0.2.0.png"/> + </imageobject> + </inlinemediaobject> + + to synchronize selections between the active <property>MBean Editor</property> and + the <property>MBean Explorer</property> (and vice versa).</para> + + <para>The <property>MBean Explorer</property> has also a filter text that can be used to filter among all the MBeans + the few ones, which interest you.</para> + + <para>For example, if you are only interested by MBeans related to memory, typing memo will show + any node (domain, mbean, attribute, or operation) that matches that text, as well as + that node's parents and children. So if an MBean matches, all attributes and operations from + that bean will show. If, however, an attribute or operation name (a leaf node) matches, + only that node and its parents in the tree will show.</para> + + <figure> + <title>Query Filter</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/mbean-explorer-query.png"/> + </imageobject> + </mediaobject> + </figure> + + + <para>The <emphasis> + <property>Collapse All</property></emphasis> button + + <inlinemediaobject> + <imageobject> + <imagedata fileref="images/collaps_all.png"/> + </imageobject> + </inlinemediaobject> + + on the <property>MBean Explorer</property> toolbar is used to collapse all the MBeans and + display only the domains. It is also possible to double click on a node to expand/collapse it. </para> + + </section> + <section id="mbean_editor" xreflabel="mbean_editor"> + <?dbhtml filename="mbean_editor.html"?> + + <title>MBean Editor</title> + + <figure> + <title>MBean Editor Pages</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/mbean-editor_0.2.0.png"/> + </imageobject> + </mediaobject> + </figure> + + <para>The <property>MBean Editor</property> is composed of several pages:</para> + + <itemizedlist> + <listitem> + <para>the <emphasis> + <property>Attributes</property></emphasis> page</para> + </listitem> + <listitem> + <para>the <emphasis> + <property>Operations</property></emphasis> page</para> + </listitem> + <listitem> + <para>the <emphasis> + <property>Notifications</property></emphasis> page </para> + </listitem> + <listitem> + <para>the <emphasis> + <property>Info</property></emphasis> page </para> + </listitem> + </itemizedlist> + + <para> The <emphasis> + <property>Attributes</property> + </emphasis> and <emphasis> + <property>Operations</property> + </emphasis> pages display a list for either the MBean attributes or operations as well as + details for the selection.</para> + + <para> It is possible to toggle the layout between the list and the details either vertically + (by default) or horizontally with the help of the special icons + + <inlinemediaobject> + <imageobject> + <imagedata fileref="images/mbean-editor-layout-buttons_0.2.0.png"/> + </imageobject> + </inlinemediaobject> + + in the right top corner of the editor.</para> + + <figure> + <title>MBean Editor Horizontal Layout</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/mbean-editor-horizontal-layout_0.2.0.png"/> + </imageobject> + </mediaobject> + </figure> + + <section> + <title>Notifications Page</title> + <para>One more page in the <property>MBean Editor</property> is the <emphasis> + <property>Notifications</property></emphasis> page, which gives the possibility to + subscribe (resp. unsubscribe) to a MBean to receive its notifications by checking (resp. + unchecking) the <emphasis> + <property>Subscribe</property></emphasis> button in the right top corner. </para> + <para>The list of notifications is refreshed every time a new notification is + received:</para> + + <figure> + <title>MBean Editor Notifications Page</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/notifications.png"/> + </imageobject> + </mediaobject> + </figure> + + <note> + <title>Note</title> + <para>It is only possible to subscribe to MBean, which emits notifications (they must be + NotificationBroadcaster).</para> + </note> + + </section> + + </section> + + </chapter> Added: trunk/jmx/docs/reference/en/modules/summary.xml =================================================================== --- trunk/jmx/docs/reference/en/modules/summary.xml (rev 0) +++ trunk/jmx/docs/reference/en/modules/summary.xml 2010-01-20 14:51:57 UTC (rev 19825) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<chapter> + <?dbhtml filename="summary.html"?> + <title>Summary</title> + <para>In conclusion, with this document you could easily start with JXM Tools. + The chapters above walked you through the steps on how to do Tomcat,Eclipse Equinox or JBoss Instances managing and how to create new JMX connections. + The document also includes the reference of JMX Tools features. + + If you have questions or suggestions concerned both the documentation and tools behavior, + you are welcome to JBoss Tools Users forum. + Please, use Jira to report bugs and requests on documentation.</para> + + <section> + <title>Other relevant resources on the topic</title> + <para>All JBoss Developer Studio/JBoss Tools release documentation you can find at + <ulink url="http://docs.jboss.org/tools">http://docs.jboss.org/tools</ulink> in the corresponding release directory. + </para> + <para>The latest documentation builds are available at <ulink url="http://download.jboss.org/jbosstools/nightly-docs">http://download.jboss.org/jbosstools/nightly-docs</ulink>. </para> + <para>You can find a set of benefits and other extra information on:</para> + <itemizedlist> + <listitem> + <para> + <ulink url="http://www.jboss.org/community/wiki/JBossMX">JBoss Wiki</ulink> + </para> + </listitem> + <listitem><para>For more information about JMX technology please visit + <ulink url="http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/"> + JMX Technology Home Page</ulink></para> + </listitem> + </itemizedlist> + </section> +</chapter> \ No newline at end of file Added: trunk/jmx/docs/reference/en/modules/tasks.xml =================================================================== --- trunk/jmx/docs/reference/en/modules/tasks.xml (rev 0) +++ trunk/jmx/docs/reference/en/modules/tasks.xml 2010-01-20 14:51:57 UTC (rev 19825) @@ -0,0 +1,259 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<chapter id="tasks" xreflabel="tasks"> + <?dbhtml filename="tasks.html"?> + <title>JMX Tools Tasks</title> + <para>This chapter will give you answers on most popular questions asked by <property>JMX + plugin</property> users.</para> + <section> + <title>Quick Start</title> + + <para>To start using the <property>JMX Tools</property>, it's necessary to open + <property>MBean Explorer</property>. Go to <emphasis><property>Window > Show View > Other</property></emphasis> and then select + <property>MBean Explorer</property> and click <emphasis><property>OK</property>.</emphasis></para> + + <para>The <property>MBean Explorer</property> lists all of the domains, mbeans, attributes, and operations inside a + connection. When you double-click on a MBean in the <emphasis><property>MBean Explorer</property>,</emphasis> it opens a multi-page + editor to manage the MBean. The <property>MBean Editor</property> is composed of these pages:</para> + + <itemizedlist> + <listitem> + <para><emphasis><property>Attributes page</property>,</emphasis> to get/set the attributes of the MBean</para> + </listitem> + <listitem> + <para><emphasis><property>Operations page</property>,</emphasis> to invoke operations on the MBean</para> + </listitem> + <listitem> + <para><emphasis><property>Notifications page</property>,</emphasis> to receive notifications from the MBean</para> + </listitem> + <listitem> + <para><emphasis><property>Info page</property>,</emphasis> which displays general information about the MBean </para> + </listitem> + </itemizedlist> + + </section> + <section> + <title>Tomcat Managing</title> + + <para>It's possible to manage Tomcat using <property>JMX Tools</property>.</para> + + <para>Currently, JMX Tooling is able to connect to Tomcat without authentication or with + password-based authentication.</para> + <para>Using SSL for authentication is not supported: you need to make sure that the System + property <emphasis> + <property>com.sun.management.jmxremote.ssl</property> + </emphasis> is set to false. </para> + <para>More information to manage Tomcat can be found in Tomcat management + documentation.</para> + <para>Instructions to manage remotely Tomcat are available in Tomcat's monitoring + documentation.</para> + + </section> + + <section> + <title>Eclipse Equinox Managing</title> + + <para>You can manage Equinox through the Equinox monitoring framework.</para> + <para>Once you have installed the Equinox monitoring framework and restarted Eclipse:</para> + + <itemizedlist> + <listitem> + <para>Go to <emphasis> + <property>Window > Open Perspective > Other</property> + </emphasis> and select the <property>JMX perspective</property></para> + </listitem> + + <listitem> + <para>Select <emphasis> + <property>JMX Server > Open Connection</property> + </emphasis> and click on <emphasis> + <property>OK</property> + </emphasis></para> + </listitem> + + <listitem> + <para>Switch to the <property>MBean Explorer</property> by going to <emphasis> + <property>Window > Show View > Other</property> + </emphasis> and selecting the MBean Explorer</para> + </listitem> + + <listitem> + <para>Click on the <emphasis> + <property>New Connection</property></emphasis> icon + + <inlinemediaobject> + <imageobject> + <imagedata fileref="images/new_connection_icon.png"/> + </imageobject> + </inlinemediaobject> + + in the <property>MBean Explorer</property> menu + bar </para> + </listitem> + + <listitem> + <para>Select the <emphasis> + <property>Advanced tab</property></emphasis> and set the JMX URL to <emphasis> + <property>service:jmx:rmi:///jndi/rmi://:8118/jmxserver</property> + </emphasis></para> + </listitem> + </itemizedlist> + + <para>You now have access to the MBeans exposed by Equinox.</para> + </section> + + + <section> + <title>Managing JBoss Instances</title> + + <para>Managing JBoss instances is not supported with the <property>JMX Tools</property> + alone. You must also download and install the <property>AS Tools</property> portion of + the <property>JBoss Tools</property> distribution. Even after installing the proper + tooling, you cannot create a JBoss JMX connection yourself or through the Connection + Wizard. The first step is to create a JBoss Server. The full instructions for this can + be found in the AS Tools section, however, the short summary is: </para> + <itemizedlist> + <listitem> + <para>Open the <property>JBoss Servers View</property> or the <property>Servers + View</property></para> + </listitem> + + <listitem> + <para>Right-click in the view and select <emphasis> + <property>New > Server</property> + </emphasis></para> + </listitem> + + <listitem> + <para>In the <emphasis> + <property>JBoss Community</property> + </emphasis> section, select a server version</para> + </listitem> + + <listitem> + <para>If a runtime has not yet been created, you'll be prompted for the + server's home directory, JDK, and configuration</para> + </listitem> + + <listitem> + <para>Finish the wizard and note that you have a new entry in both the + <property>JBoss Server View</property> and the <property>MBean + Explorer</property></para> + </listitem> + + <listitem> + <para>Start the server by right-clicking it and selecting <emphasis> + <property>Start</property></emphasis></para> + </listitem> + <listitem> + <para>Note that once the server is started, the JMX connection can be + expanded</para> + </listitem> + </itemizedlist> + + <para>Now you can explore MBeans exposed by a JBoss instance.</para> + </section> + <section id="extensions" xreflabel="extensions"> + <title>Extension Task</title> + <para>This section will outline how to contribute your own Server type with some default + behavior.</para> + + <section> + <title>Why we should do that?</title> + + <para>You might be asking yourself why you'd need to extend this framework if JMX is + a standard. Perhaps you want a connection to be automatically created after some specific + action, or perhaps you want your connection wizard to do more than simply set a host and + port. JBoss, for example, requires setting some credentials on the client machine, but + using JBoss classes to do it. This requires that the connection have access to JBoss + jars.</para> + </section> + + <section> + <title>Core Extensions</title> + + <para>To create your own JMX Connection type, you must use the + org.jboss.tools.jmx.core.MBeanServerConnectionProvider extension point. This point takes + one child, a connectionProvider with a class that implements + org.jboss.tools.jmx.core.IConnectionProvider.</para> + + <para>An IConnectionProvider is responsible for creation and deletion of IConnectionWrapper + objects. It must also keep a list of listeners that it is expected to inform when a + connection is added or removed from its list. </para> + + <para>Each IConnectionWrapper is expected to handle running arbitrary JMX runnables or getting + a "Root" object representing all JMX nodes. There are some utility methods the + IConnectionWrapper can make use of.</para> + </section> + + <section> + <title>UI Extensions</title> + <para>There are two extension points currently approved for use in the UI</para> + <itemizedlist> + <listitem> + <para>org.jboss.tools.jmx.ui.providerUI - provide an icon, id, displayable name, and + wizardPage class for creation of new connections</para> + </listitem> + <listitem> + <para>org.jboss.tools.jmx.ui.attribute.controls - allows you to map class types to some + Control to present them in the MBean Editor</para> + <para>We hope, this guide helped you to get started with the JBoss JMX Tools. Besides, for additional information you are welcome on <ulink + url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss forum</ulink>.</para> + </listitem> + </itemizedlist> + </section> + + </section> + <section id="connection" xreflabel="connection"> + + <title>Connections Creation Task</title> + + <para>The <property>MBean Explorer</property> supports several different types of connections. + The tooling itself comes only with a default connection type, however other + adopters can provide additional connection types that may require additional + or non-spec behavior. Connections can be in either the connected state or + the disconnected state. Some connection types (such as the default connection type) + allow you to control the current state. Other connection types may not. </para> + + <para>Similarly, some connection types may be able to be created, and others may not. + The default connection type, for example, can be created and deleted by you + at will. The AS Tools connection type, which represents a JBoss server, does not + allow you this level of control. A JBoss JMX connection is created when a JBoss server is created + in the server's view, and deleted when said server is deleted. The JMX connection for + this server is in the connected state only when the server is started. </para> + + + <section><title>The Default Connection</title> + + <para> There are two ways to connect to an application with remote management enabled:</para> + + <para> The first step is the same for both - to connect to a MBean Server, click on the + <emphasis> + <property>New Connection</property></emphasis> icon + + <inlinemediaobject> + <imageobject> + <imagedata fileref="images/new_connection_icon.png"/> + </imageobject> + </inlinemediaobject> + + in the <property>MBean Explorer</property> menu bar.</para> + + <para>Then to follow the simple one you just need to specify host, port (and optionally user + name and password) and click <emphasis> + <property>OK</property>.</emphasis></para> + + <para>The default JMX URL is <emphasis> + <property>service:jmx:rmi:///jndi/rmi://localhost:3000/jmxrmi</property>.</emphasis></para> + + <para>In case you need to connect to an application which has not used the "standard" JMX URL + (e.g. Eclipse Equinox), you need chose more advance way, where it's necessary to specify + explicitly a JMX URL in the Advanced tab of the JMX Connection window.</para> + + <note> + <title>Note</title> + <para>Only JMX URL based on RMI are supported.</para> + </note> + </section> + </section> +</chapter> +

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19824 - in trunk/jmx/docs/reference/en: modules and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2010-01-20 09:50:54 -0500 (Wed, 20 Jan 2010) New Revision: 19824 Modified: trunk/jmx/docs/reference/en/master.xml trunk/jmx/docs/reference/en/modules/introduction.xml Log: <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif"> <p>https://jira.jboss.org/jira/browse/JBDS-907 restructured JMX guide.</p> </body></html> Modified: trunk/jmx/docs/reference/en/master.xml =================================================================== --- trunk/jmx/docs/reference/en/master.xml 2010-01-20 09:34:52 UTC (rev 19823) +++ trunk/jmx/docs/reference/en/master.xml 2010-01-20 14:50:54 UTC (rev 19824) @@ -8,8 +8,9 @@ <!ENTITY connection SYSTEM "modules/connection.xml"> <!ENTITY how_to SYSTEM "modules/how_to.xml"> <!ENTITY extensions SYSTEM "modules/extensions.xml"> - - +<!ENTITY tasks SYSTEM "modules/tasks.xml"> +<!ENTITY references SYSTEM "modules/references.xml"> +<!ENTITY summary SYSTEM "modules/summary.xml"> <!ENTITY seamlink "../../seam/html_single/index.html"> <!ENTITY aslink "../../as/html_single/index.html"> <!ENTITY esblink "../../esb_ref_guide/html_single/index.html"> @@ -41,13 +42,13 @@ </inlinemediaobject> </corpauthor> - <copyright> - <year>2007</year> + <copyright> + <year>2007</year> <year>2008</year> - <year>2009</year> - <year>2010</year> - <holder>JBoss by Red Hat</holder> - </copyright> + <year>2009</year> + <year>2010</year> + <holder>JBoss by Red Hat</holder> + </copyright> <releaseinfo> Version: 1.1.0.CR1 </releaseinfo> @@ -57,15 +58,17 @@ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jmx_ref_guide/pdf/JM...">PDF version</ulink> </para> </abstract> - - </bookinfo> - - + </bookinfo> + <toc/> &introduction; - &mbean_explorer; - &mbean_editor; - &connection; + &tasks; + &references; + &summary; +  + </book> Modified: trunk/jmx/docs/reference/en/modules/introduction.xml =================================================================== --- trunk/jmx/docs/reference/en/modules/introduction.xml 2010-01-20 09:34:52 UTC (rev 19823) +++ trunk/jmx/docs/reference/en/modules/introduction.xml 2010-01-20 14:50:54 UTC (rev 19824) @@ -3,8 +3,12 @@ <?dbhtml filename="introduction.html"?> <title>Introduction</title> - - <para><property>JMX Tools</property> allows to setup multiple JMX connections and provides view + <para><property>JBoss Tools</property>' JMX project is a fork of <ulink + url="http://code.google.com/p/eclipse-jmx/">eclipse-jmx</ulink>, a project by Jeff Mesnil. + It was forked with permission. </para> + <section> + <title>What is JMX Tools?</title> + <para><property>JMX Tools</property> allows to setup multiple JMX connections and provides view for exploring the JMX tree and execute operations directly from Eclipse.</para> <para>This chapter covers the basics of working with <property>JMX plugin</property>, which is @@ -18,29 +22,8 @@ </imageobject> </mediaobject> </figure> - - <section> - <title> Requirements </title> - <para>Requirements to use <property>JMX Tools</property> are the following:</para> - - <itemizedlist> - <listitem> - <para><property>JMX Tools</property> is developed on Eclipse 3.4.x milestones</para> - </listitem> - <listitem> - <para><property>JMX Tools</property> requires that Eclipse is run on a JDK 1.5.0 or above - (due to dependencies on JMX packages which were introduced in Java 1.5.0)</para> - </listitem> - </itemizedlist> </section> - <section> - <title>History</title> - <para><property>JBoss Tools</property>' JMX project is a fork of <ulink - url="http://code.google.com/p/eclipse-jmx/">eclipse-jmx</ulink>, a project by Jeff Mesnil. - It was forked with permission. </para> - </section> - <section><title>Key Features of JMX Tools</title> <para>For a start, we propose you to look through the table of main features of JMX Tools:</para> <table> @@ -77,21 +60,28 @@ <link linkend="mbean_editor">MBean Editor</link> </entry> </row> - - - </tbody> - + </tbody> </tgroup> </table> - - - - </section> - - <section> + <title>Requirements and Installation</title> + <section> + <title> Requirements</title> + <para>Requirements to use <property>JMX Tools</property> are the following:</para> + + <itemizedlist> + <listitem> + <para><property>JMX Tools</property> is developed on Eclipse 3.4.x milestones</para> + </listitem> + <listitem> + <para><property>JMX Tools</property> requires that Eclipse is run on a JDK 1.5.0 or above + (due to dependencies on JMX packages which were introduced in Java 1.5.0)</para> + </listitem> + </itemizedlist> + </section> + <section> <title>Installation</title> <para>Here, we are going to explain how to install the <property>JMX plugin</property> into Eclipse.</para> @@ -110,50 +100,5 @@ url="http://labs.jboss.com/wiki/InstallingJBossTools">InstallingJBossTools</ulink> section.</para> </section> - - - <section> - <title>Quick Start</title> - - <para>To start using the <property>JMX Tools</property>, it's necessary to open - <property>MBean Explorer</property>. Go to <emphasis><property>Window > Show View > Other</property></emphasis> and then select - <property>MBean Explorer</property> and click <emphasis><property>OK</property>.</emphasis></para> - - <para>The <property>MBean Explorer</property> lists all of the domains, mbeans, attributes, and operations inside a - connection. When you double-click on a MBean in the <emphasis><property>MBean Explorer</property>,</emphasis> it opens a multi-page - editor to manage the MBean. The <property>MBean Editor</property> is composed of these pages:</para> - - <itemizedlist> - <listitem> - <para><emphasis><property>Attributes page</property>,</emphasis> to get/set the attributes of the MBean</para> - </listitem> - <listitem> - <para><emphasis><property>Operations page</property>,</emphasis> to invoke operations on the MBean</para> - </listitem> - <listitem> - <para><emphasis><property>Notifications page</property>,</emphasis> to receive notifications from the MBean</para> - </listitem> - <listitem> - <para><emphasis><property>Info page</property>,</emphasis> which displays general information about the MBean </para> - </listitem> - </itemizedlist> - - </section> - <section> - <title>Other relevant resources on the topic</title> - - <para>You can find a set of benefits and other extra information on:</para> - <itemizedlist> - <listitem> - <para> - <ulink url="http://www.jboss.org/community/wiki/JBossMX">JBoss Wiki</ulink> - </para> - </listitem> - - </itemizedlist> - - - - </section> - + </section> </chapter>

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19823 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2010-01-20 04:34:52 -0500 (Wed, 20 Jan 2010) New Revision: 19823 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValueDecodeParamSection.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/messages.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/javamapping/JavaBeanEditPart.java Log: JBIDE-5687 change the decoder parameter tab Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-01-20 09:30:35 UTC (rev 19822) +++ trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-01-20 09:34:52 UTC (rev 19823) @@ -36,6 +36,8 @@ org.milyn.delivery, org.milyn.delivery.sax, org.milyn.io, + org.milyn.javabean, + org.milyn.javabean.decoders, org.milyn.json, org.milyn.payload, org.milyn.smooks.edi, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2010-01-20 09:30:35 UTC (rev 19822) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2010-01-20 09:34:52 UTC (rev 19823) @@ -146,6 +146,7 @@ <propertyTabs contributorId="org.jboss.tools.smooks.configuration.editors.MultiPageEditor"> <propertyTab + afterTab="org.jboss.tools.smooks.ui.propertySection.decodeParamTab" category="properties" id="org.jboss.tools.smooks.ui.propertySection.propertiesTab" label="Properties"> @@ -162,13 +163,12 @@ label="Rule Bases"> </propertyTab> <propertyTab - afterTab="org.jboss.tools.smooks.ui.propertySection.propertiesTab" + afterTab="org.jboss.tools.smooks.ui.propertySection.csvrecordTab" category="properties" id="org.jboss.tools.smooks.ui.propertySection.decodeParamTab" - label="Decode Parameter"> + label="Decode"> </propertyTab> <propertyTab - afterTab="org.jboss.tools.smooks.ui.propertySection.propertiesTab" category="properties" id="org.jboss.tools.smooks.ui.propertySection.csvrecordTab" label="CSV Record Properties"> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValueDecodeParamSection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValueDecodeParamSection.java 2010-01-20 09:30:35 UTC (rev 19822) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValueDecodeParamSection.java 2010-01-20 09:34:52 UTC (rev 19823) @@ -10,23 +10,24 @@ ******************************************************************************/ package org.jboss.tools.smooks.editor.propertySections; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; import java.util.List; +import java.util.Map; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.command.AddCommand; import org.eclipse.emf.edit.command.RemoveCommand; import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; -import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.jface.viewers.CellEditor; -import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.ICellModifier; -import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TableViewer; @@ -34,13 +35,13 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; @@ -49,11 +50,13 @@ import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.editors.ModelPanelCreator; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.model.javabean12.DecodeParamType; import org.jboss.tools.smooks.model.javabean12.Javabean12Factory; import org.jboss.tools.smooks.model.javabean12.Javabean12Package; +import org.jboss.tools.smooks.model.javabean12.ValueType; +import org.milyn.javabean.DataDecoder; /** * @author Dart @@ -63,7 +66,28 @@ private Composite controlComposite; private TableViewer paramterViewer; + private CCombo decoderCombo; + private static List<String> DECODERS = new ArrayList<String>(); + + static { + Map<Class, Class<? extends DataDecoder>> map = DataDecoder.Factory.getInstalledDecoders(); + Collection<Class<? extends DataDecoder>> decoders = map.values(); + for (Iterator<Class<? extends DataDecoder>> iterator = decoders.iterator(); iterator.hasNext();) { + Class<? extends DataDecoder> dataDecoderClass = iterator.next(); + if (dataDecoderClass != null) { + String name = dataDecoderClass.getSimpleName(); + if (name.endsWith("Decoder")) { + name = name.substring(0, name.length() - "Decoder".length()); + } + if (!DECODERS.contains(name)) { + DECODERS.add(name); + } + } + } + Collections.sort(DECODERS); + } + /* * (non-Javadoc) * @@ -82,19 +106,82 @@ controlComposite = factory.createComposite(section, SWT.NONE); - controlComposite.setLayout(new FillLayout()); + GridLayout gridLayout = new GridLayout(); + gridLayout.numColumns = 2; + controlComposite.setLayout(gridLayout); + section.setClient(controlComposite); + createDecoderCombo(factory, controlComposite); + createDecodeParamViewer(factory, controlComposite); } - private void createDecodeParamViewer(TabbedPropertySheetWidgetFactory factory, Composite sashForm) { + private void createDecoderCombo(TabbedPropertySheetWidgetFactory factory, Composite parent) { + factory.createLabel(controlComposite, "Decoder :"); + decoderCombo = factory.createCCombo(parent, SWT.READ_ONLY); + // decoderCombo.setEditable(false); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + decoderCombo.setLayoutData(gd); + + for (Iterator<?> iterator = DECODERS.iterator(); iterator.hasNext();) { + String decoderName = (String) iterator.next(); + decoderCombo.add(decoderName); + } + + decoderCombo.addSelectionListener(new SelectionListener() { + + public void widgetSelected(SelectionEvent e) { + changeDecoder(); + } + + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + } + + private void changeDecoder() { ISmooksModelProvider provider = getSmooksModelProvider(); + if (provider != null) { + AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) provider.getEditingDomain(); + String newDecoder = decoderCombo.getText(); + Object model = getPresentSelectedModel(); + model = AdapterFactoryEditingDomain.unwrap(model); + if (model != null && model instanceof ValueType) { + String decoder = ((ValueType) model).getDecoder(); + if (newDecoder.equals(decoder)) { + // same decoder + return; + } + Command setCommand = SetCommand.create(editingDomain, model, + Javabean12Package.Literals.VALUE_TYPE__DECODER, newDecoder); + editingDomain.getCommandStack().execute(setCommand); + initDecodeParamViewer(); + } + } + } + private String[] getDecoderParametersName(String decoder) { + if (decoder != null) { + if ("Date".equals(decoder)) { + return new String[] { "format", "locale-language", "locale-country" }; + } + } + return null; + } + + private void createDecodeParamViewer(TabbedPropertySheetWidgetFactory factory, Composite sashForm) { GridData gd = new GridData(GridData.FILL_BOTH); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + factory.createLabel(sashForm, "Decoder Parameters :").setLayoutData(gd); + Composite viewerComposite = factory.createComposite(sashForm, SWT.NONE); + gd = new GridData(GridData.FILL_BOTH); + gd.horizontalSpan = 2; + viewerComposite.setLayoutData(gd); GridLayout gridLayout = new GridLayout(); gridLayout.numColumns = 2; viewerComposite.setLayout(gridLayout); @@ -111,75 +198,9 @@ viewerContianer.setLayout(layout); paramterViewer = new TableViewer(viewerContianer, SWT.FULL_SELECTION); - if (provider != null) { - AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) provider.getEditingDomain(); + paramterViewer.setContentProvider(new DecodeParamViewerContentProvider()); + paramterViewer.setLabelProvider(new DecodeParamTypeLabelProvider()); - paramterViewer.setContentProvider(new AdapterFactoryContentProvider(editingDomain.getAdapterFactory())); - - paramterViewer.setLabelProvider(new DecoratingLabelProvider(new AdapterFactoryLabelProvider(editingDomain - .getAdapterFactory()) { - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider# - * getText(java.lang.Object) - */ - @Override - public String getText(Object object) { - Object obj = AdapterFactoryEditingDomain.unwrap(object); - if (obj instanceof EObject) { - return super.getText(obj); - } - return super.getText(object); - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider - * #getColumnText(java.lang.Object, int) - */ - @Override - public String getColumnText(Object object, int columnIndex) { - Object obj = AdapterFactoryEditingDomain.unwrap(object); - if (columnIndex == 0) { - // if (obj instanceof DecodeParamType) { - // String name = ((DecodeParamType) obj).getName(); - // if (name == null) - // name = ""; //$NON-NLS-1$ - // return name; - // } - if (obj instanceof org.jboss.tools.smooks.model.javabean12.DecodeParamType) { - String name = ((org.jboss.tools.smooks.model.javabean12.DecodeParamType) obj).getName(); - if (name == null) - name = ""; //$NON-NLS-1$ - return name; - } - } - - if (columnIndex == 1) { - // if (obj instanceof DecodeParamType) { - // String value = ((DecodeParamType) obj).getValue(); - // if (value == null) - // value = ""; //$NON-NLS-1$ - // return value; - // } - if (obj instanceof org.jboss.tools.smooks.model.javabean12.DecodeParamType) { - String name = ((org.jboss.tools.smooks.model.javabean12.DecodeParamType) obj).getValue(); - if (name == null) - name = ""; //$NON-NLS-1$ - return name; - } - } - return super.getColumnText(object, columnIndex); - } - - }, SmooksConfigurationActivator.getDefault().getWorkbench().getDecoratorManager().getLabelDecorator())); - } - paramterViewer.setFilters(new ViewerFilter[] { new DecodeParamTypeFilter() }); TableColumn nameColumn = new TableColumn(paramterViewer.getTable(), SWT.NONE); @@ -197,180 +218,131 @@ public void modify(Object element, String property, Object value) { if (element instanceof TableItem) { - element = ((TableItem) element).getData(); - element = AdapterFactoryEditingDomain.unwrap(element); - if (element == null) - return; - EStructuralFeature feature = null; - if (property.equals("name")) { //$NON-NLS-1$ - // if (element instanceof DecodeParamType) { - // feature = - // JavabeanPackage.Literals.DECODE_PARAM_TYPE__NAME; - // } - if (element instanceof org.jboss.tools.smooks.model.javabean12.DecodeParamType) { - feature = Javabean12Package.Literals.DECODE_PARAM_TYPE__NAME; + Object currentElement = ((TableItem) element).getData(); + Object model = getPresentSelectedModel(); + model = AdapterFactoryEditingDomain.unwrap(model); + if (model != null && model instanceof ValueType && currentElement instanceof DecodeParam) { + String pname = ((DecodeParam) currentElement).getName(); + DecodeParamType paramType = findDecodeParamType(pname, (ValueType) model); + Command command = null; + EditingDomain editingDomain = getSmooksModelProvider().getEditingDomain(); + if (property.equals("value")) { + if (value != null) { + String svalue = ((String) value).trim(); + if ("".equals(svalue)) { + if(paramType != null){ + command = RemoveCommand.create(editingDomain, paramType); + } + } else { + // if param is empty , add it + if (paramType == null) { + paramType = Javabean12Factory.eINSTANCE.createDecodeParamType(); + paramType.setName(pname); + paramType.setValue((String) value); + command = AddCommand.create(editingDomain, (ValueType) model, + Javabean12Package.Literals.VALUE_TYPE__DECODE_PARAM, paramType); + } else { + command = SetCommand.create(editingDomain, paramType, + Javabean12Package.Literals.DECODE_PARAM_TYPE__VALUE, value); + } + } + } } - } - if (property.equals("value")) { //$NON-NLS-1$ - // if (element instanceof DecodeParamType) { - // feature = - // JavabeanPackage.Literals.DECODE_PARAM_TYPE__VALUE; - // } - if (element instanceof org.jboss.tools.smooks.model.javabean12.DecodeParamType) { - feature = Javabean12Package.Literals.DECODE_PARAM_TYPE__VALUE; + if (command != null) { + editingDomain.getCommandStack().execute(command); + ((DecodeParam) currentElement).setValue((String) value); + paramterViewer.update(currentElement, new String[] { property }); } } - - if (feature != null) { - Command c = SetCommand.create(getSmooksModelProvider().getEditingDomain(), element, feature, - value); - getSmooksModelProvider().getEditingDomain().getCommandStack().execute(c); - } } } public Object getValue(Object element, String property) { element = AdapterFactoryEditingDomain.unwrap(element); - if (property.equals("name")) { //$NON-NLS-1$ - // if (element instanceof DecodeParamType) { - // String name = ((DecodeParamType) element).getName(); - // if (name == null) - // name = ""; //$NON-NLS-1$ - // return name; - // } - if (element instanceof org.jboss.tools.smooks.model.javabean12.DecodeParamType) { - String name = ((org.jboss.tools.smooks.model.javabean12.DecodeParamType) element).getName(); + if (property.equals("value")) { //$NON-NLS-1$ + if (element instanceof DecodeParam) { + String name = ((DecodeParam) element).getValue(); if (name == null) name = ""; //$NON-NLS-1$ return name; } } - if (property.equals("value")) { //$NON-NLS-1$ - // if (element instanceof DecodeParamType) { - // String value = ((DecodeParamType) element).getValue(); - // if (value == null) - // value = ""; //$NON-NLS-1$ - // return value; - // } - if (element instanceof org.jboss.tools.smooks.model.javabean12.DecodeParamType) { - String value = ((org.jboss.tools.smooks.model.javabean12.DecodeParamType) element).getValue(); - if (value == null) - value = ""; //$NON-NLS-1$ - return value; - } - } return null; } public boolean canModify(Object element, String property) { - return true; + if (property.equals("value")) { //$NON-NLS-1$ + if (element instanceof DecodeParam) { + return true; + } + } + return false; } }); paramterViewer.getTable().setHeaderVisible(true); paramterViewer.getTable().setLinesVisible(true); - Composite buttonComposite = factory.createComposite(viewerComposite, SWT.NONE); - gd = new GridData(GridData.FILL_VERTICAL); - gd.widthHint = 130; - buttonComposite.setLayoutData(gd); - GridLayout gl2 = new GridLayout(); - buttonComposite.setLayout(gl2); + } - Button newRuleButton = factory.createButton(buttonComposite, - Messages.ValueDecodeParamSection_NewParamButtonText, SWT.NONE); - newRuleButton.addSelectionListener(new SelectionAdapter() { + private void initDecoderCombo() { + decoderCombo.select(-1); + Object model = getPresentSelectedModel(); + model = AdapterFactoryEditingDomain.unwrap(model); + if (model != null && model instanceof ValueType) { + String decoder = ((ValueType) model).getDecoder(); + if (decoder != null) { + decoder = decoder.trim(); + int index = DECODERS.indexOf(decoder); + decoderCombo.select(index); + } + } + } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse - * .swt.events.SelectionEvent) - */ - @Override - public void widgetSelected(SelectionEvent e) { - Object model = null; - EStructuralFeature feature = null; - Object element = getPresentSelectedModel(); - element = AdapterFactoryEditingDomain.unwrap(element); - if (element == null) - return; - // if (element instanceof ValueType) { - // model = JavabeanFactory.eINSTANCE.createDecodeParamType(); - // ((DecodeParamType) - // model).setName(Messages.ValueDecodeParamSection_NullText); - // ((DecodeParamType) - // model).setValue(Messages.ValueDecodeParamSection_NullText); - // feature = JavabeanPackage.Literals.VALUE_TYPE__DECODE_PARAM; - // } - if (element instanceof org.jboss.tools.smooks.model.javabean12.ValueType) { - model = Javabean12Factory.eINSTANCE.createDecodeParamType(); - ((org.jboss.tools.smooks.model.javabean12.DecodeParamType) model) - .setName(Messages.ValueDecodeParamSection_NullText); - ((org.jboss.tools.smooks.model.javabean12.DecodeParamType) model) - .setValue(Messages.ValueDecodeParamSection_NullText); - feature = Javabean12Package.Literals.VALUE_TYPE__DECODE_PARAM; - } - if (model != null && feature != null && element != null) { - EditingDomain domain = getSmooksModelProvider().getEditingDomain(); - Command command = AddCommand.create(domain, element, feature, model); - domain.getCommandStack().execute(command); - paramterViewer.refresh(); - } - - super.widgetSelected(e); + private void initDecodeParamViewer() { + paramterViewer.setInput("NULL"); + Object model = getPresentSelectedModel(); + model = AdapterFactoryEditingDomain.unwrap(model); + if (model != null && model instanceof ValueType) { + String decoder = ((ValueType) model).getDecoder(); + String[] params = getDecoderParametersName(decoder); + if (params != null) { + paramterViewer.setInput(newDecodeParam(params, ((ValueType) model))); } + } + } - }); - Button deleteRuleButton = factory.createButton(buttonComposite, - Messages.ValueDecodeParamSection_DeleteButtonText, SWT.NONE); - deleteRuleButton.addSelectionListener(new SelectionAdapter() { + private DecodeParamType findDecodeParamType(String name, ValueType valueType) { + List<?> ps = valueType.getDecodeParam(); + for (Iterator<?> iterator = ps.iterator(); iterator.hasNext();) { + DecodeParamType dp = (DecodeParamType) iterator.next(); + String dpn = dp.getName(); + if (dpn != null) + dpn = dpn.trim(); - /* - * (non-Javadoc) - * - * @see - * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse - * .swt.events.SelectionEvent) - */ - @Override - public void widgetSelected(SelectionEvent e) { - IStructuredSelection selection = (IStructuredSelection) paramterViewer.getSelection(); - List<?> selectedRules = selection.toList(); - ISmooksModelProvider provider = getSmooksModelProvider(); - if (provider != null) { - EditingDomain domain = provider.getEditingDomain(); - Command command = RemoveCommand.create(domain, selectedRules); - domain.getCommandStack().execute(command); - } - super.widgetSelected(e); + if (name.equals(dpn)) { + return dp; } - - }); - gd = new GridData(GridData.FILL_HORIZONTAL); - newRuleButton.setLayoutData(gd); - - gd = new GridData(GridData.FILL_HORIZONTAL); - deleteRuleButton.setLayoutData(gd); + } + return null; } - private void initDecodeParamViewer() { - ISmooksModelProvider provider = getSmooksModelProvider(); - if (provider != null) { - AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) provider.getEditingDomain(); - - paramterViewer.setContentProvider(new AdapterFactoryContentProvider(editingDomain.getAdapterFactory())); - - paramterViewer.setLabelProvider(new DecodeParamTypeLabelProvider(new AdapterFactoryLabelProvider( - editingDomain.getAdapterFactory()))); - - Object model = getPresentSelectedModel(); - model = AdapterFactoryEditingDomain.unwrap(model); - if (model != null) { - paramterViewer.setInput(model); + private List<DecodeParam> newDecodeParam(String[] params, ValueType valueType) { + List<DecodeParam> list = new ArrayList<DecodeParam>(); + for (int i = 0; i < params.length; i++) { + String name = params[i]; + DecodeParam p = new DecodeParam(); + p.setName(name); + DecodeParamType dp = findDecodeParamType(name, valueType); + if (dp != null) { + String dpv = dp.getValue(); + if (dpv != null) + dpv = dpv.trim(); + p.setValue(dpv); } + list.add(p); } + return list; } protected void createDecodeParamGUIContents(Object model, ISmooksModelProvider provider, IEditorPart part, @@ -399,14 +371,69 @@ @Override public void refresh() { super.refresh(); + initDecoderCombo(); initDecodeParamViewer(); } + private class DecodeParamViewerContentProvider implements IStructuredContentProvider { + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // TODO Auto-generated method stub + + } + + public void dispose() { + // TODO Auto-generated method stub + + } + + public Object[] getElements(Object inputElement) { + if (inputElement instanceof Collection<?>) { + return ((Collection<?>) inputElement).toArray(); + } + return new Object[] {}; + } + } + + private class DecodeParam { + String name; + String value; + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name + * the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the value + */ + public String getValue() { + return value; + } + + /** + * @param value + * the value to set + */ + public void setValue(String value) { + this.value = value; + } + + } + private class DecodeParamTypeLabelProvider extends LabelProvider implements ITableLabelProvider { - private AdapterFactoryLabelProvider labelProvider = null; - public DecodeParamTypeLabelProvider(AdapterFactoryLabelProvider labelProvider) { - this.labelProvider = labelProvider; + public DecodeParamTypeLabelProvider() { } /* @@ -417,9 +444,9 @@ * .lang.Object, int) */ public Image getColumnImage(Object element, int columnIndex) { - if (labelProvider != null && columnIndex == 0) { - return labelProvider.getImage(element); - } + // if (labelProvider != null && columnIndex == 0) { + // return labelProvider.getImage(element); + // } return null; } @@ -432,8 +459,8 @@ // name = ""; //$NON-NLS-1$ // return name; // } - if (obj instanceof org.jboss.tools.smooks.model.javabean12.DecodeParamType) { - String name = ((org.jboss.tools.smooks.model.javabean12.DecodeParamType) obj).getName(); + if (obj instanceof DecodeParam) { + String name = ((DecodeParam) obj).getName(); if (name == null) name = ""; //$NON-NLS-1$ return name; @@ -447,11 +474,11 @@ // value = ""; //$NON-NLS-1$ // return value; // } - if (obj instanceof org.jboss.tools.smooks.model.javabean12.DecodeParamType) { - String name = ((org.jboss.tools.smooks.model.javabean12.DecodeParamType) obj).getValue(); - if (name == null) - name = ""; //$NON-NLS-1$ - return name; + if (obj instanceof DecodeParam) { + String value = ((DecodeParam) obj).getValue(); + if (value == null) + value = ""; //$NON-NLS-1$ + return value; } } return ""; //$NON-NLS-1$ @@ -471,7 +498,7 @@ @Override public boolean select(Viewer viewer, Object parentElement, Object element) { element = AdapterFactoryEditingDomain.unwrap(element); - if (element instanceof org.jboss.tools.smooks.model.javabean12.DecodeParamType) { + if (element instanceof DecodeParam) { return true; } return false; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/messages.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/messages.properties 2010-01-20 09:30:35 UTC (rev 19822) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/messages.properties 2010-01-20 09:34:52 UTC (rev 19823) @@ -16,4 +16,4 @@ ValueDecodeParamSection_NullText=<null> ValueDecodeParamSection_ParamNameColumnText=Name ValueDecodeParamSection_ParamValueColumnText=Value -ValueDecodeParamSection_SectionTitle=Decode Parameters +ValueDecodeParamSection_SectionTitle=Decode Configuration Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigEditPart.java 2010-01-20 09:30:35 UTC (rev 19822) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigEditPart.java 2010-01-20 09:34:52 UTC (rev 19823) @@ -46,30 +46,39 @@ * */ public class AbstractResourceConfigEditPart extends TreeContainerEditPart { - - /* (non-Javadoc) - * @see org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart#createFigure() + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart#createFigure + * () */ @Override protected IFigure createFigure() { - IFigure figure = super.createFigure(); - if(figure instanceof TreeContainerFigure){ - ((TreeContainerFigure)figure).setSource(isSource()); + IFigure figure = super.createFigure(); + if (figure instanceof TreeContainerFigure) { + ((TreeContainerFigure) figure).setSource(isSource()); } return figure; } - - protected boolean isSource(){ + + protected boolean isSource() { return true; } - @Override protected String generateFigureID() { return SmooksGraphUtil.generateFigureID((TreeNodeModel) getModel()); } + protected org.eclipse.emf.common.command.Command getDeleteEMFCommand(EditingDomain domain, Object data, + EStructuralFeature feature) { + return RemoveCommand.create(domain, ((EObject) data).eContainer(), + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(feature, data)); + } + @Override protected void createEditPolicies() { super.createEditPolicies(); @@ -91,14 +100,7 @@ EStructuralFeature feature = getHostFeature((EObject) data); if (feature != null) { - // FeatureMapUtil - // .createEntry(Javabean12Package.Literals.JAVABEAN12_DOCUMENT_ROOT__BEAN,data); - org.eclipse.emf.common.command.Command c = RemoveCommand - .create( - domain, - ((EObject) data).eContainer(), - SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, - FeatureMapUtil.createEntry(feature, data)); + org.eclipse.emf.common.command.Command c = getDeleteEMFCommand(domain, data, feature); if (c != null && c.canExecute()) { GEFAdapterCommand rc = new GEFAdapterCommand(domain, c); command.add(rc); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/javamapping/JavaBeanEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/javamapping/JavaBeanEditPart.java 2010-01-20 09:30:35 UTC (rev 19822) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/javamapping/JavaBeanEditPart.java 2010-01-20 09:34:52 UTC (rev 19823) @@ -11,12 +11,15 @@ package org.jboss.tools.smooks.graphical.editors.editparts.javamapping; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import org.eclipse.draw2d.IFigure; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CompoundCommand; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.ui.IEditorPart; @@ -27,6 +30,8 @@ import org.jboss.tools.smooks.graphical.editors.template.SmooksFreemarkerTemplateGraphicalEditor; import org.jboss.tools.smooks.model.javabean12.BeanType; import org.jboss.tools.smooks.model.javabean12.Javabean12Package; +import org.jboss.tools.smooks.model.javabean12.WiringType; +import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; /** * @author Dart @@ -54,7 +59,54 @@ } return null; } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.graphical.editors.editparts. + * AbstractResourceConfigEditPart + * #getDeleteCommand(org.eclipse.emf.edit.domain.EditingDomain, + * java.lang.Object, org.eclipse.emf.ecore.EStructuralFeature) + */ + @Override + protected Command getDeleteEMFCommand(EditingDomain domain, Object data, EStructuralFeature feature) { + CompoundCommand compoundCommand = new CompoundCommand(); + Command deleteCommand = super.getDeleteEMFCommand(domain, data, feature); + if (data instanceof BeanType) { + String beanId = ((BeanType) data).getBeanId(); + Object container = ((BeanType) data).eContainer(); + if (beanId != null && container != null && container instanceof SmooksResourceListType) { + List<?> children = ((SmooksResourceListType) container).getAbstractResourceConfig(); + for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) { + Object child = (Object) iterator.next(); + child = AdapterFactoryEditingDomain.unwrap(child); + if (child instanceof BeanType && child != data) { + List<?> wirings = ((BeanType) child).getWiring(); + for (Iterator<?> iterator2 = wirings.iterator(); iterator2.hasNext();) { + WiringType wiring = (WiringType) iterator2.next(); + String refId = wiring.getBeanIdRef(); + if (refId != null) + refId = refId.trim(); + if (beanId.equals(refId)) { + Command setCommand = SetCommand.create(domain, wiring, + Javabean12Package.Literals.WIRING_TYPE__BEAN_ID_REF, null); + compoundCommand.append(setCommand); + } + } + } + } + } + } + + if(compoundCommand.isEmpty()){ + return deleteCommand; + }else{ + compoundCommand.append(deleteCommand); + return compoundCommand; + } + } + /* * (non-Javadoc) *

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19822 - workspace/dart/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/test/editor.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2010-01-20 04:30:35 -0500 (Wed, 20 Jan 2010) New Revision: 19822 Modified: workspace/dart/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/test/editor/X2XTest.java Log: Modified: workspace/dart/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/test/editor/X2XTest.java =================================================================== --- workspace/dart/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/test/editor/X2XTest.java 2010-01-20 07:10:16 UTC (rev 19821) +++ workspace/dart/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/test/editor/X2XTest.java 2010-01-20 09:30:35 UTC (rev 19822) @@ -53,8 +53,8 @@ public class X2XTest extends AbstractSmooksUIBotTest { private String fileName = "edi-to-java.xml"; - - public void testNewCSV2JavaFile(){ + + public void testNewCSV2JavaFile() { fileName = "csv-to-java.xml"; SWTGefBot gefBot = new SWTGefBot(); this.newSmooksConfigFile(getTestProjectName(), fileName); @@ -63,15 +63,18 @@ bot.menu(IDEWorkbenchMessages.Workbench_window).menu("Maximize Active View or Editor").click(); final SWTBot innerBot = editor.bot(); this.selectInputNode(innerBot); - + innerBot.comboBoxWithLabel("Input Type:").setSelection("CSV"); -// innerBot.button("Browse").click(); -// workspaceFileSelectionWithSmooksFileSelectionWizardPage(bot, "File Selection", new String[] { -// getTestProjectName(), "src", "ediresources" }, "edi-to-xml-order-mapping.xml"); -// innerBot.button("Add").click(); -// workspaceFileSelectionWithSmooksFileSelectionWizardPage(bot, "EDI File Selection", new String[] { -// getTestProjectName(), "src", "ediresources" }, "input-message.edi"); + // innerBot.button("Browse").click(); + // workspaceFileSelectionWithSmooksFileSelectionWizardPage(bot, + // "File Selection", new String[] { + // getTestProjectName(), "src", "ediresources" }, + // "edi-to-xml-order-mapping.xml"); + // innerBot.button("Add").click(); + // workspaceFileSelectionWithSmooksFileSelectionWizardPage(bot, + // "EDI File Selection", new String[] { + // getTestProjectName(), "src", "ediresources" }, "input-message.edi"); } @@ -86,58 +89,56 @@ final SWTBot innerBot = editor.bot(); + // Select at the Input Task node this.selectInputNode(innerBot); + // configurate the EDI reader in the configuration panel innerBot.comboBoxWithLabel("Input Type:").setSelection("EDI"); - innerBot.button("Browse").click(); + // Open File Selection Dialog to set file path workspaceFileSelectionWithSmooksFileSelectionWizardPage(bot, "File Selection", new String[] { getTestProjectName(), "src", "ediresources" }, "edi-to-xml-order-mapping.xml"); - innerBot.button("Add").click(); workspaceFileSelectionWithSmooksFileSelectionWizardPage(bot, "EDI File Selection", new String[] { getTestProjectName(), "src", "ediresources" }, "input-message.edi"); + // Validate the edi-to-xml SWTBotTree inputModelViewer = innerBot.tree(); assertTrue(inputModelViewer.getAllItems().length > 0); assertNotNull(inputModelViewer.getTreeItem("Order")); - // SWTBotGefFigureCanvas tt1 = new - // SWTBotGefFigureCanvas(getGraph(innerBot)); - // tt1.contextMenu("Add Task").menu("Java Mapping").click(); + // add task node via pop menu selectNode(innerBot, TaskTypeManager.TASK_ID_INPUT, 3); - final SWTBotMenu menu1 = findProcessMapViewerContext(getGraph(innerBot), "Add Task"); - bot.getDisplay().syncExec(new Runnable() { + SWTBotMenu addJavaMappingMenu = findProcessMapViewerContext(getGraph(innerBot), "Java Mapping"); + addJavaMappingMenu.click(); - public void run() { - SWTBotMenu m = menu1.menu("Java Mapping");// .menu("Java Mapping"); - m.click(); - } - }); + // select at the java mapping task selectNode(innerBot, TaskTypeManager.TASK_ID_JAVA_MAPPING, 1); SWTBotGefEditor editor1 = gefBot.gefEditor(fileName); + // add java class model via pop menu , at first , we need to active the root edit part editor1.rootEditPart().click(); - - // add java class model editor1.clickContextMenu("Java Class "); + // open java bean creation dialog bot.shell("New Java Class Model").activate(); - bot.textWithLabel("Bean ID :").setText("order1"); bot.textWithLabel("Java Class :").setText("edi2java.example.model.Order"); + // expand all tree node to add the java bean model expandTreeNode(bot.tree().getAllItems()); - + bot.button("Finish").click(); // change bean id editor1.clickContextMenu("Properties"); editor1.rootEditPart().click(); - // mapping + /** start to mapping **/ + + //move the input figure location to the top-left editor1.mouseDrag("EDI Input Model", 0, 0); SWTBotGefEditPart editPart = editor1.getEditPart("Order"); @@ -154,30 +155,32 @@ SWTBotGefEditPart order_id = editor1.getEditPart("order-id"); SWTBotGefEditPart orderId = editor1.getEditPart("orderId"); dragLink(editor1, order_id, orderId, false, false); + SWTBotGefEditPart status_code = editor1.getEditPart("status-code"); SWTBotGefEditPart orderStatus = editor1.getEditPart("orderStatus"); dragLink(editor1, status_code, orderStatus, false, false); + SWTBotGefEditPart net_amount = editor1.getEditPart("net-amount"); SWTBotGefEditPart netAmount = editor1.getEditPart("netAmount"); dragLink(editor1, net_amount, netAmount, false, false); + SWTBotGefEditPart total_amount = editor1.getEditPart("total-amount"); SWTBotGefEditPart totalAmount = editor1.getEditPart("totalAmount"); dragLink(editor1, total_amount, totalAmount, false, false); + SWTBotGefEditPart tax1 = editor1.getEditPart("tax1"); SWTBotGefEditPart tax = editor1.getEditPart("tax"); dragLink(editor1, tax1, tax, false, false); + SWTBotGefEditPart date1 = editor1.getEditPart("date1"); SWTBotGefEditPart date = editor1.getEditPart("date"); - date.select(); -// state.click(); -// editor1.mouseMoveLeftClick("state"); - editor1.clickContextMenu("Delete"); -// dragLink(editor1, date1, date, false, false); + dragLink(editor1, date1, date, false, false); editor1.clickContextMenu("Auto Layout"); final FigureCanvas canvas = getFigureCanvas(gefBot); + // sometimes the editor's size isn't big enough , we need to scroll it UIThreadRunnable.syncExec(new VoidResult() { /* @@ -241,15 +244,17 @@ SWTBotGefEditPart price = editor1.getEditPart("price"); dragLink(editor1, price1, price, false, false); + // show property view editor1.clickContextMenu("Properties"); editor1.rootEditPart().click(); + // active customer,then property view will change customer.click(); editor1.clickContextMenu("Properties"); final SWTBot viewBot = bot.viewByTitle("Properties").bot(); - final String tabText = "Decode Parameter"; + final String tabText = "Decode"; viewBot.textWithLabel("Name :").setText("Order"); - + UIThreadRunnable.syncExec(new VoidResult() { /* @@ -262,39 +267,39 @@ } }); -// selectTabbedPropertyView(viewBot , tabText); -// viewBot.button("New Parameter").click(); -// viewBot.table().click(0, 0); -// viewBot.text().setText("format"); -// viewBot.table().click(0, 1); -// viewBot.text().setText("EEE MMM dd HH:mm:ss z yyyy"); -// viewBot.table().click(0, 0); - // viewBot.label(""); - // viewBot.cTabItem(1).activate(); - // - // bot.sleep(6000); - - // run smooks config file -// bot.activeEditor(); -// bot.menu(IDEWorkbenchMessages.Workbench_window).menu("Maximize Active View or Editor").click(); + date.click(); + editor1.clickContextMenu("Properties"); + // change to the decode tab + selectTabbedPropertyView(viewBot, tabText); + viewBot.ccomboBox().setSelection("Date"); + viewBot.table().click(0, 1); + viewBot.text().setText("EEE MMM dd HH:mm:ss z yyyy"); + viewBot.table().click(1, 1); + viewBot.text().setText("en"); + viewBot.table().click(2, 1); + viewBot.text().setText("IE"); editor.saveAndClose(); + + // select the smooks config file SWTBot viewbot = bot.viewByTitle("Package Explorer").bot(); final SWTBotTreeItem item = viewbot.tree().expandNode(getTestProjectName()).getNode(fileName); item.select(); + // open run config dialog via menubar bot.menu("Run").menu("Run Configurations...").click(); bot.activeShell().activate(); bot.tree().getTreeItem("Smooks Configuration").doubleClick(); bot.textWithLabel("Project:").setText(getTestProjectName()); bot.textWithLabel("Configuration:").setText(fileName); bot.button("Run").click(); - + + // get the result text from Console viewer SWTBot consoleBot = bot.viewByTitle("Console").bot(); String text = consoleBot.styledText().getText(); System.out.println(text); + + // TODO validate the result } - - private SWTBotGefEditPart getTopLevelEditPart(SWTBotGefEditor editor, String label) { SWTBotGefEditPart part = editor.getEditPart(label); if (part.part() instanceof TreeContainerEditPart) {

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19821 - workspace/examples.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2010-01-20 02:10:16 -0500 (Wed, 20 Jan 2010) New Revision: 19821 Modified: workspace/examples/project-examples-3.1M4.xml Log: JBDS-1061: remove bpel examples so that it doesn't appear in JBDS Modified: workspace/examples/project-examples-3.1M4.xml =================================================================== --- workspace/examples/project-examples-3.1M4.xml 2010-01-20 03:49:01 UTC (rev 19820) +++ workspace/examples/project-examples-3.1M4.xml 2010-01-20 07:10:16 UTC (rev 19821) @@ -1,25 +1,5 @@ <projects> - <project> - <category>BPEL</category> - <name>hello_world</name> - <shortDescription>A simple BPEL example</shortDescription> - <description>This example is to show a simple BPEL2.0 example.</description> - <size>10000</size> - <url> - http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/bpel-examples/he... - </url> - </project> - <project> - <category>BPEL</category> - <name>simple_correlation</name> - <shortDescription>A correlation BPEL example</shortDescription> - <description>This example is to show how to use the correlation in the BPEL2.0 example.</description> - <size>11000</size> - <url> - http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/bpel-examples/si... - </url> - </project> </projects>

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19820 - in trunk/documentation/guides: Beginners_Guide and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2010-01-19 22:49:01 -0500 (Tue, 19 Jan 2010) New Revision: 19820 Added: trunk/documentation/guides/Beginners_Guide/ trunk/documentation/guides/Beginners_Guide/pom.xml trunk/documentation/guides/Beginners_Guide/publican.cfg trunk/documentation/guides/JBDS_3.0_Release_Notes/ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Article_Info.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Author_Group.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Component_Versions.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Fixed_Issues.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Known_Issues.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/New_Features.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Overview.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Release_Notes.ent trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Release_Notes.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Revision_History.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/images/ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/master.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/pom.xml trunk/documentation/guides/JBDS_3.0_Release_Notes/publican.cfg Log: adding Beginners Guide and JBDS 3.0 Release Notes to repo Added: trunk/documentation/guides/Beginners_Guide/pom.xml =================================================================== --- trunk/documentation/guides/Beginners_Guide/pom.xml (rev 0) +++ trunk/documentation/guides/Beginners_Guide/pom.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,157 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.jboss.tools</groupId> + <artifactId>converter-ref-guide${translation}</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jdocbook</packaging> + <name>Beginners_Guide</name> + <profiles> + <profile> + <id>release</id> + <properties> + <master>master_output.xml</master> + <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-release.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-release.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf> + </properties> + </profile> + <profile> + <id>releaseJBDS</id> + <properties> + <master>master_output.xml</master> + <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf> + <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir> + </properties> + </profile> + <profile> + <id>diffmk</id> + <properties> + <master>master_output.xml</master> + <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-diff.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-diff.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf-diff.xsl</xsl-pdf> + </properties> + </profile> + </profiles> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.0-200803311251UTC-MPJDOCBOOK-8</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>com.jboss</groupId> + <artifactId>jbossent-docbook-xslt</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>com.jboss</groupId> + <artifactId>jbossent-jdocbook-style</artifactId> + <version>1.0.0</version> + <type>jdocbook-style</type> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + <dependency> + <groupId>org.jboss.tools</groupId> + <artifactId>jbosstools-docbook-xslt</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + <version>0.95</version> + </dependency> + </dependencies> + + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${pom.basedir}/en-US</sourceDirectory> + <imageResource> + <directory>${pom.basedir}/en-US</directory> + <includes> + <include>images/**/*</include> + </includes> + </imageResource> + <cssResource> + <directory>${pom.basedir}/${cssdir}</directory> + </cssResource> + + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>${xsl-pdf}</stylesheetResource> + <finalName>${pom.name}.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>${xsl-chunked}</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>${xsl-single}</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>eclipse</formatName> + <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/eclipse.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> +  +  + <docbookVersion>1.72.0</docbookVersion> + </options> + </configuration> + </plugin> + </plugins> + </build> + + <distributionManagement> + <repository> +  +  +  + <id>repository.jboss.org</id> + <url>file://${maven.repository.root}</url> + </repository> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>dav:https://snapshots.jboss.org/maven2</url> + </snapshotRepository> + </distributionManagement> + + <properties> + <stylesdir>../../../documentation/jbosstools-docbook-xslt/src/main/resources/</stylesdir> + <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf> + <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/org/css/</cssdir> + <translation>en-US</translation> + </properties> + + +</project> Added: trunk/documentation/guides/Beginners_Guide/publican.cfg =================================================================== --- trunk/documentation/guides/Beginners_Guide/publican.cfg (rev 0) +++ trunk/documentation/guides/Beginners_Guide/publican.cfg 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,8 @@ +# Config::Simple 4.59 +# Fri Nov 27 08:57:18 2009 + +xml_lang: en-US +type: Book +brand: JBoss +debug: 1 + Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Article_Info.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Article_Info.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Article_Info.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,3 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<articleinfo><title>Release Notes</title><subtitle>Information about the changes made to this JBoss Developer Studio release.</subtitle><productname>JBoss Developer Studio</productname><productnumber>3.0</productnumber><edition>0</edition><pubsnumber>0</pubsnumber><abstract><para>These release notes contain important information related to the JBoss Developer Studio. New features, known problems, resources, and other current issues are addressed here.</para></abstract><corpauthor><inlinemediaobject><imageobject><imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata></imageobject></inlinemediaobject></corpauthor><xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></articleinfo> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Author_Group.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Author_Group.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Author_Group.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE Article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> +<authorgroup><author><firstname>Isaac</firstname><surname>Rooskov</surname><email>irooskov(a)redhat.com</email></author></authorgroup> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Component_Versions.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Component_Versions.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Component_Versions.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,29 @@ +<?xml version='1.0' encoding='utf-8' ?> +<section id="Component_Versions"> + <title>Component Versions</title> + <para> + This section details the versions of the components which create the JBoss Developer Studio that can be found in this release. + </para> + <itemizedlist> + <listitem> + <para> + Eclipse 3.5 (Galileo) + </para> + </listitem> + <listitem> + <para> + JBoss Tools 3.1.0 + </para> + </listitem> + <listitem> + <para> + JBoss Enterprise Application Platform 5.0 + </para> + </listitem> + </itemizedlist> + <note> + <para> + The Enterprise Application Platform Server has been redefined for the enterprise market to a level where direct association to a community release can no longer be drawn. + </para> + </note> +</section> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Fixed_Issues.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Fixed_Issues.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Fixed_Issues.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,51 @@ +<?xml version='1.0' encoding='utf-8' ?> +<section id="Issues-fixed-in-this-release"> + <title> + Issues fixed in this release + </title> + + <para> + Following is a list of issues fixed in this release: + </para> + <formalpara> + <title>ESB Editor</title> + <para> + <itemizedlist> + <listitem> + <para> + <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5548">JBIDE-5548</ulink>: In the ESB Configuration Editor, when selecting a JBR Listener, JBR Bus or JBR Provider, new functionality has been added to allow a user to configure the properties: <property>synchronous</property>, <property>serviceInvokerTimeout</property> and <property>asyncResponse</property> through the new child object <property>Config</property>. These new configurable properties allow a user increased control over the execution of the JBR components. + </para> + </listitem> + <listitem> + <para> + <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5547">JBIDE-5547</ulink>: In the ESB Configuration Editor, when selecting a FTP Listener in read-only mode new functionality has been added to allow a user to configure the properties: <property>maxNodes</property>, <property>timeToLiveSeconds</property> and <property>maxAgeSeconds</property> through the new child object <property>Cache</property>. In addition the following properties have been added to allow a user to select their own values for the: <property>Class</property>, <property>Config File</property> and <property>Cache Listener</property> available through the new child object <property>Remote Filesystem Strategy</property>. These new configurable properties allow a user increased control over the execution of the FTP Listener. + </para> + </listitem> + </itemizedlist> + </para> + </formalpara> + <formalpara> + <title>Hibernate</title> + <para> + <itemizedlist> + <listitem> + <para> + <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5499">JBIDE-5499</ulink>: + </para> + </listitem> + </itemizedlist> + </para> + </formalpara> + <formalpara> + <title>XML Structured Editor</title> + <para> + <itemizedlist> + <listitem> + <para> + <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5521">JBIDE-5521</ulink>: The Web Servlet Mapping dialog box now contains a drop-down list for the <guilabel>Servlet-Name</guilabel> field so that servlets that have been entered into the <filename>web.xml</filename> file can be selected easily. + </para> + </listitem> + </itemizedlist> + </para> + </formalpara> + </section> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Known_Issues.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Known_Issues.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Known_Issues.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding='utf-8' ?> +<section id="Known_Issues_with_this_release"> + <title> + Known Issues with this release + </title> + <para> + Following is a list of known issues at the time of release. + </para> + <formalpara> + <title>General Known Issues</title> + <para> + <itemizedlist> + <listitem> + <para> + </para> + </listitem> + </itemizedlist> + </para> + </formalpara> +</section> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/New_Features.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/New_Features.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/New_Features.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='utf-8' ?> +<section id="New_Features"> + <title>New Features in JBoss Developer Studio 3.0</title> + <para> + New product information to go here + </para> +</section> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Overview.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Overview.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Overview.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,50 @@ +<?xml version='1.0' encoding='utf-8' ?> +<section id="Overview"> + <title>Overview</title> + <para> + JBoss Developer Studio provides an integrated development environment for developers to build rich Web and enterprise applications, and SOA services. The technologies used include: + </para> + <itemizedlist> + <listitem> + <para> + Hibernate + </para> + </listitem> + <listitem> + <para> + JBoss Seam + </para> + </listitem> + <listitem> + <para> + RichFaces + </para> + </listitem> + <listitem> + <para> + JBoss jBPM + </para> + </listitem> + <listitem> + <para> + JBoss ESB + </para> + </listitem> + <listitem> + <para> + JBoss Portal + </para> + </listitem> + <listitem> + <para> + JBoss Drools + </para> + </listitem> + </itemizedlist> + <para> + JBoss Developer Studio includes both certified visual tooling and a runtime platform that Red Hat supports for 5 years, ensuring developers of a stable, upgradable, deployable and supportable platform. + </para> + <para> + JBoss Developer Studio is available for Windows, Linux and MacOS. + </para> + </section> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Release_Notes.ent =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Release_Notes.ent (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Release_Notes.ent 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,4 @@ +<!ENTITY PRODUCT "JBoss Developer Studio"> +<!ENTITY BOOKID "Release_Notes"> +<!ENTITY YEAR "2009"> +<!ENTITY HOLDER "Red Hat"> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Release_Notes.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Release_Notes.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Release_Notes.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,11 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<article> + <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> + <xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> + <xi:include href="New_Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> + <xi:include href="Component_Versions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> + <xi:include href="Fixed_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> + <xi:include href="Known_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> + <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> +</article> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Revision_History.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Revision_History.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/Revision_History.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,3 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<appendix><title>Revision History</title><simpara><revhistory><revision><revnumber>0</revnumber><date>Mon Dec 21 2009</date><author><firstname>Isaac</firstname><surname>Rooskov</surname><email>irooskov(a)redhat.com</email></author><revdescription><simplelist><member>Initial creation of book by publican</member></simplelist></revdescription></revision></revhistory></simpara></appendix> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/master.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/master.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/en-US/master.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" +"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd" + +[<!ENTITY Overview SYSTEM "Overview.xml"> +<!ENTITY NewFeatures SYSTEM "New_Features.xml"> +<!ENTITY ComponentVersions SYSTEM "Component_Versions.xml"> +<!ENTITY FixedIssues SYSTEM "Fixed_Issues.xml"> +<!ENTITY KnownIssues SYSTEM "Known_Issues.xml"> +]> + +<article> + + <articleinfo> + <title>Release Notes</title> + <corpauthor> + <inlinemediaobject> + <imageobject role="fo"> + <imagedata format="PNG" fileref="images/jbosstools_logo.png" /> + </imageobject> + <imageobject role="html"> + <imagedata/> + </imageobject> + </inlinemediaobject> + </corpauthor> + + <author> + <firstname>Isaac</firstname> + <surname>Rooskov</surname> + <email>irooskov(a)redhat.com</email> + </author> + <copyright> + <year>2010</year> + <holder>JBoss by Red Hat</holder> + </copyright> + <releaseinfo> + Version: 1.0 + </releaseinfo> + + + + </articleinfo> + + <toc/> + &Overview; + &NewFeatures; + &ComponentVersions; + &FixedIssues; + &KnownIssues; + +</article> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/pom.xml =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/pom.xml (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/pom.xml 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,157 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.jboss.tools</groupId> + <artifactId>converter-ref-guide${translation}</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jdocbook</packaging> + <name>Release_Notes</name> + <profiles> + <profile> + <id>release</id> + <properties> + <master>master_output.xml</master> + <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-release.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-release.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf> + </properties> + </profile> + <profile> + <id>releaseJBDS</id> + <properties> + <master>master_output.xml</master> + <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf> + <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir> + </properties> + </profile> + <profile> + <id>diffmk</id> + <properties> + <master>master_output.xml</master> + <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-diff.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-diff.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf-diff.xsl</xsl-pdf> + </properties> + </profile> + </profiles> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.0-200803311251UTC-MPJDOCBOOK-8</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>com.jboss</groupId> + <artifactId>jbossent-docbook-xslt</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>com.jboss</groupId> + <artifactId>jbossent-jdocbook-style</artifactId> + <version>1.0.0</version> + <type>jdocbook-style</type> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + <dependency> + <groupId>org.jboss.tools</groupId> + <artifactId>jbosstools-docbook-xslt</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + <version>0.95</version> + </dependency> + </dependencies> + + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${pom.basedir}/en-US</sourceDirectory> + <imageResource> + <directory>${pom.basedir}/en-US</directory> + <includes> + <include>images/**/*</include> + </includes> + </imageResource> + <cssResource> + <directory>${pom.basedir}/${cssdir}</directory> + </cssResource> + + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>${xsl-pdf}</stylesheetResource> + <finalName>${pom.name}.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>${xsl-chunked}</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>${xsl-single}</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>eclipse</formatName> + <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/eclipse.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> +  +  + <docbookVersion>1.72.0</docbookVersion> + </options> + </configuration> + </plugin> + </plugins> + </build> + + <distributionManagement> + <repository> +  +  +  + <id>repository.jboss.org</id> + <url>file://${maven.repository.root}</url> + </repository> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>dav:https://snapshots.jboss.org/maven2</url> + </snapshotRepository> + </distributionManagement> + + <properties> + <stylesdir>../../../documentation/jbosstools-docbook-xslt/src/main/resources/</stylesdir> + <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf> + <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/org/css/</cssdir> + <translation>en-US</translation> + </properties> + + +</project> Added: trunk/documentation/guides/JBDS_3.0_Release_Notes/publican.cfg =================================================================== --- trunk/documentation/guides/JBDS_3.0_Release_Notes/publican.cfg (rev 0) +++ trunk/documentation/guides/JBDS_3.0_Release_Notes/publican.cfg 2010-01-20 03:49:01 UTC (rev 19820) @@ -0,0 +1,7 @@ +# Config::Simple 4.59 +# Mon Dec 21 12:14:29 2009 + +xml_lang: en-US +type: Article +brand: JBoss +

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19819 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-01-19 13:56:22 -0500 (Tue, 19 Jan 2010) New Revision: 19819 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/FileUtils.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingPreviewPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-5408 - use system tmp folder instead of ".settings" and "Finish without Preview changes page" were fixed Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/FileUtils.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/FileUtils.java 2010-01-19 18:13:13 UTC (rev 19818) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/FileUtils.java 2010-01-19 18:56:22 UTC (rev 19819) @@ -28,7 +28,7 @@ File[] files = path.listFiles(); for (int i = 0; i < files.length; i++) { if (files[i].isDirectory()) { - tmp = delete(files[i]);; + tmp = delete(files[i]); } else { tmp = deleteFile(files[i]); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2010-01-19 18:13:13 UTC (rev 19818) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2010-01-19 18:56:22 UTC (rev 19819) @@ -260,8 +260,7 @@ } if (resource != null) { final IPath projPath = proj.getResource().getLocation(); - IPath place2Gen = projPath.append(".settings"); //$NON-NLS-1$ - place2Gen = place2Gen.append(NewHibernateMappingPreviewPage.HIBERNATE_NEW_HBM_XML_FOLDER_NAME); + IPath place2Gen = previewPage.getRootPlace2Gen().append(proj.getElementName()); // IPath tmpPath = resource.getLocation(); tmpPath = tmpPath.makeRelativeTo(projPath); @@ -286,9 +285,8 @@ Configuration config = entry.getValue(); HibernateMappingGlobalSettings hmgs = new HibernateMappingGlobalSettings(); - final IPath projPath = entry.getKey().getProject().getLocation(); - IPath place2Gen = projPath.append(".settings"); //$NON-NLS-1$ - place2Gen = place2Gen.append(NewHibernateMappingPreviewPage.HIBERNATE_NEW_HBM_XML_FOLDER_NAME); + //final IPath projPath = entry.getKey().getProject().getLocation(); + IPath place2Gen = previewPage.getRootPlace2Gen().append(entry.getKey().getElementName()); places2Gen.put(entry.getKey(), place2Gen); File folder2Gen = new File(place2Gen.toOSString()); @@ -315,9 +313,8 @@ Set<IJavaProject> projs = previewPage.getJavaProjects(); for (IJavaProject proj : projs) { // cleanup gen folder - final IPath projPath = proj.getProject().getLocation(); - IPath place2Gen = projPath.append(".settings"); //$NON-NLS-1$ - place2Gen = place2Gen.append(NewHibernateMappingPreviewPage.HIBERNATE_NEW_HBM_XML_FOLDER_NAME); + //final IPath projPath = proj.getProject().getLocation(); + IPath place2Gen = previewPage.getRootPlace2Gen().append(proj.getElementName()); File folder2Gen = new File(place2Gen.toOSString()); FileUtils.delete(folder2Gen); } @@ -356,6 +353,10 @@ } cleanUpGenFolders(); } else { + if (previewPage.getChange() == null) { + Map<IJavaProject, IPath> places2Gen = getPlaces2Gen(); + previewPage.setPlaces2Gen(places2Gen); + } previewPage.performFinish(); // refresh Set<IJavaProject> projs = previewPage.getJavaProjects(); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingPreviewPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingPreviewPage.java 2010-01-19 18:13:13 UTC (rev 19818) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingPreviewPage.java 2010-01-19 18:56:22 UTC (rev 19819) @@ -18,6 +18,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.UUID; import java.util.Map.Entry; import org.eclipse.core.filebuffers.FileBuffers; @@ -43,6 +44,7 @@ import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.text.edits.TextEdit; import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.eclipse.console.utils.FileUtils; /** * Preview wizard page for new hibernate mappings. @@ -54,6 +56,8 @@ public static final String HIBERNATE_NEW_HBM_XML_FOLDER_NAME = "hibernateNewHbmXml"; //$NON-NLS-1$ + protected IPath rootPlace2GenBase = null; + protected IPath rootPlace2Gen = null; protected Map<IJavaProject, IPath> places2Gen; protected Set<IPath> paths2Disconnect = new HashSet<IPath>(); @@ -64,6 +68,11 @@ @Override public void dispose() { performDisconnect(); + IPath place2Gen = getRootPlace2Gen(); + if (place2Gen != null) { + File folder2Gen = new File(place2Gen.toOSString()); + FileUtils.delete(folder2Gen); + } super.dispose(); } @@ -166,6 +175,26 @@ } return str.toString(); } + + public IPath getRootPlace2GenBase() { + if (rootPlace2GenBase != null) { + return rootPlace2GenBase; + } + String systemTmpDir = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$ + rootPlace2GenBase = new Path(systemTmpDir); + rootPlace2GenBase = rootPlace2GenBase.append(HIBERNATE_NEW_HBM_XML_FOLDER_NAME); + return rootPlace2GenBase; + } + + public IPath getRootPlace2Gen() { + if (rootPlace2Gen != null) { + return rootPlace2Gen; + } + rootPlace2Gen = getRootPlace2GenBase(); + String uuidName = UUID.randomUUID().toString(); + rootPlace2Gen = rootPlace2Gen.append(uuidName); + return rootPlace2Gen; + } /** * Try to create one change according with input file (fileSrc). @@ -184,7 +213,7 @@ } final IPath basePath = proj.getResource().getParent().getLocation(); final IPath projPath = proj.getResource().getLocation(); - final IPath place2Gen = projPath.append(".settings").append(HIBERNATE_NEW_HBM_XML_FOLDER_NAME); //$NON-NLS-1$ + final IPath place2Gen = getRootPlace2Gen().append(proj.getElementName()); IPath filePathFrom = new Path(fileSrc.getPath()); IPath filePathTo = filePathFrom.makeRelativeTo(place2Gen); filePathTo = projPath.append(filePathTo);

14 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits January 2010