October 2008 - jbosstools-commits

JBoss Tools SVN: r10853 - trunk/as/docs/reference/en/images/webtools.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2008-10-15 10:07:57 -0400 (Wed, 15 Oct 2008) New Revision: 10853 Removed: trunk/as/docs/reference/en/images/webtools/webtools_0.png Log: https://jira.jboss.org/jira/browse/JBDS-446 - deleting unnecessary screen; Deleted: trunk/as/docs/reference/en/images/webtools/webtools_0.png =================================================================== (Binary files differ)

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10852 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: model/ui/attribute/editor and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-15 09:53:29 -0400 (Wed, 15 Oct 2008) New Revision: 10852 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/multipage/DefaultMultipageEditor.java Log: Selection improved Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-10-15 13:42:13 UTC (rev 10851) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-10-15 13:53:29 UTC (rev 10852) @@ -848,9 +848,15 @@ if(postponedTextSelection.selected != null) { Display.getDefault().asyncExec(postponedTextSelection); } + if(newPageIndex != getSourcePageIndex()) { + synchronizeSelectionWithText(); + } activateSite(); } - + + protected void synchronizeSelectionWithText() { + } + protected void updateSelectionProvider() { } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java 2008-10-15 13:42:13 UTC (rev 10851) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java 2008-10-15 13:53:29 UTC (rev 10852) @@ -270,6 +270,10 @@ PropertyChangeEvent event = new PropertyChangeEvent(this, IPropertyEditor.VALUE, oldValue, stringValue); valueChangeListener.valueChange(event); revalidateValue(); + if(this.valueProvider == null) { + //disposed already + return; + } this.valueProvider.addValueChangeListener(this); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java 2008-10-15 13:42:13 UTC (rev 10851) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java 2008-10-15 13:53:29 UTC (rev 10852) @@ -70,7 +70,10 @@ protected boolean validate() { boolean result = false; if (emptyStringAllowed) result = true; - if (textField == null) result = false; + if (textField == null) { + result = false; + return result; + } String txt = textField.getText(); if (txt == null) { result = false; @@ -308,7 +311,11 @@ if (isValid != oldState) fireStateChanged(IS_VALID, oldState, isValid); - + + if(textField == null) { + //disposed + return; + } String newValue = textField.getText(); if (!newValue.equals(oldValue)) { fireValueChanged(VALUE, oldValue, newValue); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/multipage/DefaultMultipageEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/multipage/DefaultMultipageEditor.java 2008-10-15 13:42:13 UTC (rev 10851) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/multipage/DefaultMultipageEditor.java 2008-10-15 13:53:29 UTC (rev 10852) @@ -95,14 +95,17 @@ } else { if (treeFormPage != null) { selectionProvider.setHost(treeFormPage.getSelectionProvider()); - if(getTextSelectionProvider() == null) return; - ISelection s = getTextSelectionProvider().getSelection(); - if(s == null || s.isEmpty() || !(s instanceof IStructuredSelection)) return; - Object o = ((IStructuredSelection)s).getFirstElement(); - if(!(o instanceof XModelObject) || o == getModelObject()) return; - treeFormPage.getSelectionProvider().setSelection(s); } } } + + protected void synchronizeSelectionWithText() { + if(getTextSelectionProvider() == null || treeFormPage == null) return; + ISelection s = getTextSelectionProvider().getSelection(); + if(s == null || s.isEmpty() || !(s instanceof IStructuredSelection)) return; + Object o = ((IStructuredSelection)s).getFirstElement(); + if(!(o instanceof XModelObject) || o == getModelObject()) return; + treeFormPage.getSelectionProvider().setSelection(s); + } }

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10851 - in trunk/seam/plugins/org.jboss.tools.seam.pages.xml: src/org/jboss/tools/seam/pages/xml/model and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-15 09:42:13 -0400 (Wed, 15 Oct 2008) New Revision: 10851 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java Log: JBIDE-2855 pages.xml 2.1 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-10-15 13:41:35 UTC (rev 10850) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-10-15 13:42:13 UTC (rev 10851) @@ -7,8 +7,10 @@ <MAPPING name="FileVersions"> <PAIR name="SeamPage_1.2" value="FileSeamPage12"/> <PAIR name="SeamPage_2.0" value="FileSeamPage20"/> + <PAIR name="SeamPage_2.1" value="FileSeamPage21"/> <PAIR name="SeamPages1.2" value="FileSeamPages12"/> <PAIR name="SeamPages2.0" value="FileSeamPages20"/> + <PAIR name="SeamPages2.1" value="FileSeamPages21"/> </MAPPING> <MAPPING name="FilteredTreeConstraints"> <PAIR name="FileSystems$144" value="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesFilteredTreeConstraint"/> @@ -325,6 +327,151 @@ <XDependencies/> </XModelEntity> <XModelEntity + ImplementationLoadingClass="org.jboss.tools.seam.pages.xml.model.SeamPageFileLoader" + ImplementingClass="org.jboss.tools.seam.pages.xml.model.FileSeamPageImpl" + ObjectEditorClass="%XML%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="page" name="FileSeamPage21"> + <XChildrenEntities> + <XChildEntity name="SeamPageParam20"/> + <XChildEntity name="SeamPageHeader21"/> + <XChildEntity name="SeamPageRewrite21"/> + <XChildEntity maxCount="1" name="SeamPageBeginConversation21"/> + <XChildEntity maxCount="1" name="SeamPageEndConversation21"/> + <XChildEntity maxCount="1" name="SeamPageStartTask"/> + <XChildEntity maxCount="1" name="SeamPageBeginTask"/> + <XChildEntity maxCount="1" name="SeamPageEndTask"/> + <XChildEntity maxCount="1" name="SeamPageCreateProcess"/> + <XChildEntity maxCount="1" name="SeamPageResumeProcess"/> + <XChildEntity name="SeamPageIn"/> + <XChildEntity maxCount="1" name="SeamPageRaiseEvent20"/> + <XChildEntity name="SeamPageAction21"/> + <XChildEntity name="SeamPageNavigation21"/> + <XChildEntity name="SeamPageNavigationRule21"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.file" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="components" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/> + <XModelAttributeReference + attributes="action,view id,switch,no conversation view id,conversation required,login required,scheme,timeout,bundle,conversation" + entity="SeamPage12" name="page"/> + <XModelAttribute PROPERTIES="category=advanced" + name="concurrent request timeout" xmlname="concurrent-request-timeout"/> + <XModelAttribute PROPERTIES="category=advanced" name="expires" xmlname="expires"/> + <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <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 PROPERTIES="save=always" + default="http://jboss.com/products/seam/pages" 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://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" + name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> + <XModelAttribute name="encoding"> + <Constraint loader="ListString"> + <value name="ISO-8859-1"/> + <value name="UTF-8"/> + </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> + <XActionItemReference entity="SeamPage21" name="CreateActions" path="CreateActions"/> + <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="FileSeamPage21_EditorActionList"> + <XChildrenEntities/> + <XEntityRenderer/> + <XModelAttributes/> + <XActionItem kind="list"> + <XActionItemReference entity="SeamPage21" name="CreateActions" path="CreateActions"/> + <XActionItemReference entity="SeamPage21" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamPage21" name="VerifyActions" path="VerifyActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementationLoadingClass="org.jboss.tools.seam.pages.xml.model.SeamPages12FileLoader" ImplementingClass="org.jboss.tools.seam.pages.xml.model.FileSeamPagesImpl" ObjectEditorClass="%XML%" @@ -630,6 +777,156 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity + ImplementationLoadingClass="org.jboss.tools.seam.pages.xml.model.SeamPagesFileLoader" + ImplementingClass="org.jboss.tools.seam.pages.xml.model.FileSeamPagesImpl" + ObjectEditorClass="%XML%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="pages" name="FileSeamPages21"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="SeamPageFolderConversation" required="yes"/> + <XChildEntity maxCount="1" name="SeamPageFolderPage21" required="yes"/> + <XChildEntity maxCount="1" name="SeamPageFolderException21" required="yes"/> + <XChildEntity maxCount="1" name="SeamPagesDiagram" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.file" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pages configuration" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/> + <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="no conversation view id,login view id" + entity="FileSeamPages12" name="page2"/> + <XModelAttribute PROPERTIES="category=advanced" name="http port" xmlname="http-port"/> + <XModelAttribute PROPERTIES="category=advanced" name="https port" xmlname="https-port"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <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 PROPERTIES="save=always" + default="http://jboss.com/products/seam/pages" 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://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" + name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> + <XModelAttribute name="namespaceMapping"/> + <XModelAttribute name="encoding"> + <Constraint loader="ListString"> + <value name="ISO-8859-1"/> + <value name="UTF-8"/> + </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 ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Redirect%" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true;sourcepath=Pages;actionpath=CreateActions/AddPage" + WizardClassName="%Default%" displayName="Page..." kind="action" name="AddPage"/> + <XActionItem HandlerClassName="%Redirect%" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true;sourcepath=Conversations;actionpath=CreateActions/AddConversation" + WizardClassName="%Default%" displayName="Conversation..." + kind="action" name="AddConversation"/> + <XActionItem HandlerClassName="%Redirect%" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true;sourcepath=Exceptions;actionpath=CreateActions/AddException" + WizardClassName="%Default%" displayName="Exception..." + kind="action" name="AddException"/> + </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 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="FileSeamPages21_EditorActionList"> + <XChildrenEntities/> + <XEntityRenderer/> + <XModelAttributes/> + <XActionItem kind="list"> + <XActionItemReference entity="FileSeamPages21" name="CreateActions" path="CreateActions"/> + <XActionItemReference entity="FileSeamPages21" name="Properties" path="Properties"/> + <XActionItemReference entity="FileSeamPages21" name="VerifyActions" path="VerifyActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="page" name="SeamPage12"> @@ -905,6 +1202,139 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" + XMLSUBPATH="page" name="SeamPage21"> + <XChildrenEntities> + <XChildEntity name="SeamPageParam20"/> + <XChildEntity name="SeamPageHeader21"/> + <XChildEntity name="SeamPageRewrite21"/> + <XChildEntity maxCount="1" name="SeamPageBeginConversation21"/> + <XChildEntity maxCount="1" name="SeamPageEndConversation21"/> + <XChildEntity maxCount="1" name="SeamPageStartTask"/> + <XChildEntity maxCount="1" name="SeamPageBeginTask"/> + <XChildEntity maxCount="1" name="SeamPageEndTask"/> + <XChildEntity maxCount="1" name="SeamPageCreateProcess"/> + <XChildEntity maxCount="1" name="SeamPageResumeProcess"/> + <XChildEntity name="SeamPageIn"/> + <XChildEntity maxCount="1" name="SeamPageRaiseEvent20"/> + <XChildEntity name="SeamPageAction21"/> + <XChildEntity name="SeamPageNavigation21"/> + <XChildEntity name="SeamPageNavigationRule21"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam-pages.page" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="page" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="action,view id,switch,no conversation view id,conversation required,login required,scheme,timeout,bundle,conversation,restrict,description" + entity="SeamPage12" name="page"/> + <XModelAttribute PROPERTIES="category=advanced" + name="concurrent request timeout" xmlname="concurrent-request-timeout"/> + <XModelAttribute PROPERTIES="category=advanced" name="expires" xmlname="expires"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" 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;key=SeamPage_AddParam" + WizardClassName="%Default%" displayName="Param..." kind="action" name="AddParam"> + <EntityData EntityName="SeamPageParam20"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddParam" + WizardClassName="%Default%" displayName="Header..." kind="action" name="AddHeader"> + <EntityData EntityName="SeamPageHeader21"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddParam" + WizardClassName="%Default%" displayName="Rewrite..." kind="action" name="AddRewrite"> + <EntityData EntityName="SeamPageRewrite21"> + <AttributeData AttributeName="pattern"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddIn" + WizardClassName="%Default%" displayName="In..." kind="action" name="AddIn"> + <EntityData EntityName="SeamPageIn"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="scope" Mandatory="no"/> + <AttributeData AttributeName="value"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddAction" + WizardClassName="%Default%" displayName="Action..." kind="action" name="AddAction"> + <EntityData EntityName="SeamPageAction21"> + <AttributeData AttributeName="execute"/> + <AttributeData AttributeName="if" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddNavigation" + WizardClassName="%Default%" displayName="Navigation..." + kind="action" name="AddNavigation"> + <EntityData EntityName="SeamPageNavigation21"> + <AttributeData AttributeName="from action" Mandatory="no"/> + <AttributeData AttributeName="evaluate" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler" + ICON="action.empty" + PROPERTIES="validator.add=true;entity=SeamPageNavigationRule21;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect21;key=SeamPage_AddRule" + WizardClassName="%Default%" displayName="Navigation Rule..." + kind="action" name="AddRule"> + <EntityData EntityName="AddSeamPageRule"> + <AttributeData AttributeName="kind" Mandatory="no"/> + <AttributeData AttributeName="view id"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem HIDE="disabled" + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.OpenPageHandler" + ICON="action.empty" PROPERTIES="actionpath=Open" + displayName="Open Page" kind="action" name="OpenPage"/> + <XActionItem + HandlerClassName="org.jboss.tools.seam.pages.xml.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 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.seam.xml.ui.editor.form.SeamXMLFormLayoutData" XMLSUBPATH="action" name="SeamPageAction"> <XChildrenEntities/> @@ -919,7 +1349,14 @@ </XModelAttribute> <XModelAttribute PROPERTIES="id=true;save=always;category=general" name="execute" xmlname="execute"/> - <XModelAttribute PROPERTIES="category=general" name="if" xmlname="if"/> + <XModelAttribute PROPERTIES="category=general" name="if" xmlname="if"> + <Constraint loader="%ListEL%"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -948,6 +1385,43 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="action" name="SeamPageAction21"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam-pages.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference attributes="execute,if" + entity="SeamPageAction" name="action"/> + <XModelAttribute PROPERTIES="category=general" name="on postback" xmlname="on-postback"> + <Constraint loader="%ListEL%"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="SeamPageAction" name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageAction" name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageAction" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamPageAction" name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="%SeamPageTask%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="begin-conversation" name="SeamPageBeginConversation"> @@ -1022,6 +1496,42 @@ </XModelEntity> <XModelEntity ImplementingClass="%SeamPageTask%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" + XMLSUBPATH="begin-conversation" name="SeamPageBeginConversation21"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.component" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="begin-conversation" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true" default="command" name="name" visibility="false"/> + <XModelAttributeReference + attributes="join,nested,pageflow,flush mode,if" + entity="SeamPageBeginConversation" name="bc"/> + <XModelAttribute PROPERTIES="category=general" name="conversation" xmlname="conversation"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="SeamPageBeginConversation" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageBeginConversation" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageBeginConversation" + name="Properties" path="Properties"/> + <XActionItemReference entity="SeamPageBeginConversation" + name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%SeamPageTask%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="begin-task" name="SeamPageBeginTask"> <XChildrenEntities/> <XEntityRenderer> @@ -1219,6 +1729,48 @@ </XModelEntity> <XModelEntity ImplementingClass="%SeamPageTask%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" + XMLSUBPATH="end-conversation" name="SeamPageEndConversation21"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.component" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="end conversation" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true" default="command" name="name" visibility="false"/> + <XModelAttributeReference attributes="before redirect,if" + entity="SeamPageEndConversation" name="ec"/> + <XModelAttribute PROPERTIES="category=general" name="root" xmlname="before-redirect"> + <Constraint loader="List"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="SeamPageEndConversation" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageEndConversation" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageEndConversation" + name="Properties" path="Properties"/> + <XActionItemReference entity="SeamPageEndConversation" + name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%SeamPageTask%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="end-task" name="SeamPageEndTask"> <XChildrenEntities/> <XEntityRenderer> @@ -1370,6 +1922,68 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="exception" name="SeamPageException21"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="SeamPageEndConversation21"/> + <XChildEntity maxCount="1" name="SeamPageHTTPError"/> + <XChildEntity maxCount="1" name="SeamPageRedirect21"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam-pages.exception" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="exception" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" name="class" xmlname="class"> + <Constraint loader="QClassName"/> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="log" xmlname="log"> + <Constraint loader="%ListEL%"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="log level" xmlname="logLevel"> + <Constraint loader="%ListEL%"> + <value/> + <value name="info"/> + <value name="warn"/> + <value name="error"/> + <value name="fatal"/> + <value name="debug"/> + <value name="trace"/> + <value name="INFO"/> + <value name="WARN"/> + <value name="ERROR"/> + <value name="FATAL"/> + <value name="DEBUG"/> + <value name="TRACE"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="SeamPageException12" name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageException12" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageException12" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamPageException12" name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="%Ordered%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" name="SeamPageFolderConversation"> <XChildrenEntities> @@ -1508,23 +2122,54 @@ </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"/> + <XActionItemReference entity="SeamPageFolderException12" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageFolderException12" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageFolderException12" + name="Properties" path="Properties"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Ordered%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" name="SeamPageFolderException21"> + <XChildrenEntities> + <XChildEntity name="SeamPageException21"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="default.folder" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="exception list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="Exceptions" 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.seam.pages.xml.model.handlers.AddExceptionHandler" + ICON="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true;entity=SeamPageException21;childEntity=SeamPageRedirect21" + WizardClassName="%Default%" + displayName="Exception With Redirect..." kind="action" name="AddException"> + <EntityData EntityName="AddSeamPageException"> + <AttributeData AttributeName="class"/> + <AttributeData AttributeName="view id"/> + </EntityData> + </XActionItem> </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> + <XActionItemReference entity="SeamPageFolderException12" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageFolderException12" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageFolderException12" + name="Properties" path="Properties"/> </XActionItem> <XDependencies/> </XModelEntity> @@ -1630,6 +2275,45 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Ordered%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" name="SeamPageFolderPage21"> + <XChildrenEntities> + <XChildEntity name="SeamPage21"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="default.folder" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="page list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="Pages" 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="action.new.struts.webapp.res_ref" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Page..." kind="action" name="AddPage"> + <EntityData EntityName="SeamPage21"> + <AttributeData AttributeName="view id"/> + <AttributeData AttributeName="action" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItemReference entity="SeamPageFolderPage20" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageFolderPage20" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageFolderPage20" name="Properties" path="Properties"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPageHTTPErrorImpl" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" @@ -1691,6 +2375,36 @@ </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" + XMLSUBPATH="header" name="SeamPageHeader21"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam-pages.attribute" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="header" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="SeamPageParam12" name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageParam12" name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageParam12" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamPageParam12" name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="in" name="SeamPageIn"> <XChildrenEntities/> <XEntityRenderer> @@ -1938,6 +2652,69 @@ <XModelEntity ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPageNavigationImpl" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="navigation" name="SeamPageNavigation21"> + <XChildrenEntities> + <XChildEntity name="SeamPageRule21"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam-pages.rule" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="navigation" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + name="from action" xmlname="from-action"/> + <XModelAttribute PROPERTIES="category=general" name="evaluate" xmlname="evaluate"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;generate=true" name="_id_" visibility="false"/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler" + ICON="action.empty" + PROPERTIES="validator.add=true;entity=SeamPageRule21;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect21;key=SeamPage_AddRule" + WizardClassName="%Default%" displayName="Add Rule..." kind="action" name="AddRule"> + <EntityData EntityName="AddSeamPageRule"> + <AttributeData AttributeName="kind" Mandatory="no"/> + <AttributeData AttributeName="view id"/> + <AttributeData AttributeName="if outcome" Mandatory="no"/> + <AttributeData AttributeName="if" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <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="org.jboss.tools.seam.pages.xml.model.impl.SeamPageNavigationImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%EntityOrdered%" XMLSUBPATH="navigation" name="SeamPageNavigationRule12"> <XChildrenEntities> <XChildEntity maxCount="1" name="SeamPageBeginConversation"/> @@ -2088,6 +2865,83 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPageNavigationImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="navigation" name="SeamPageNavigationRule21"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="SeamPageBeginConversation21"/> + <XChildEntity maxCount="1" name="SeamPageEndConversation21"/> + <XChildEntity maxCount="1" name="SeamPageStartTask"/> + <XChildEntity maxCount="1" name="SeamPageBeginTask"/> + <XChildEntity maxCount="1" name="SeamPageEndTask"/> + <XChildEntity maxCount="1" name="SeamPageCreateProcess"/> + <XChildEntity maxCount="1" name="SeamPageResumeProcess"/> + <XChildEntity name="SeamPageOut"/> + <XChildEntity maxCount="1" name="SeamPageRaiseEvent20"/> + <XChildEntity maxCount="1" name="SeamPageRender"/> + <XChildEntity maxCount="1" name="SeamPageRedirect21"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam-pages.rule" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="navigation" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + name="from action" xmlname="from-action"/> + <XModelAttribute PROPERTIES="category=general" name="evaluate" xmlname="evaluate"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;generate=true" name="_id_" visibility="false"/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPageRule_AddOut" + WizardClassName="%Default%" displayName="Add Out..." kind="action" name="AddOut"> + <EntityData EntityName="SeamPageOut"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="scope" Mandatory="no"/> + <AttributeData AttributeName="value"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem HIDE="disabled" + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.OpenPageHandler" + ICON="action.empty" PROPERTIES="actionpath=Open" + displayName="Open Page" kind="action" name="OpenPage"/> + <XActionItem + HandlerClassName="org.jboss.tools.seam.pages.xml.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 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.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="out" name="SeamPageOut"> @@ -2462,6 +3316,80 @@ </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPageRedirectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="redirect" name="SeamPageRedirect21"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="SeamPageMessage"/> + <XChildEntity name="SeamPageParam20"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam-pages.redirect" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="redirect" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true" default="target" name="name" visibility="false"/> + <XModelAttribute PROPERTIES="category=general" name="view id" xmlname="view-id"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + <value name="linkAction=OpenPage"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="url" xmlname="url"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + <value name="linkAction=OpenPage"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Message..." kind="action" name="AddMessage"> + <EntityData EntityName="SeamPageMessage"> + <AttributeData AttributeName="message"/> + <AttributeData AttributeName="severity" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPage_AddParam" + WizardClassName="%Default%" displayName="Add Param..." + kind="action" name="AddParam"> + <EntityData EntityName="SeamPageParam20"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem HIDE="disabled" + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.OpenPageHandler" + ICON="action.empty" PROPERTIES="actionpath=Open" + displayName="Open Page" kind="action" name="OpenPage"/> + <XActionItem + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.SelectOnDiagramHandler" + ICON="action.empty" displayName="Select on Diagram" kind="action" name="Select"/> + <XActionItemReference entity="SeamPageRedirect20" name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageRedirect20" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageRedirect20" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamPageRedirect20" name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPageRedirectImpl" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="render" name="SeamPageRender"> <XChildrenEntities> @@ -2576,6 +3504,35 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" + XMLSUBPATH="rewrite" name="SeamPageRewrite21"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam-pages.attribute" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="header" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general;save=always" + name="pattern" xmlname="pattern"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="SeamPageParam12" name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageParam12" name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageParam12" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamPageParam12" name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPageRuleImpl" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%EntityOrdered%" @@ -2727,6 +3684,66 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPageRuleImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="rule" name="SeamPageRule21"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="SeamPageBeginConversation21"/> + <XChildEntity maxCount="1" name="SeamPageEndConversation21"/> + <XChildEntity maxCount="1" name="SeamPageStartTask"/> + <XChildEntity maxCount="1" name="SeamPageBeginTask"/> + <XChildEntity maxCount="1" name="SeamPageEndTask"/> + <XChildEntity maxCount="1" name="SeamPageCreateProcess"/> + <XChildEntity maxCount="1" name="SeamPageResumeProcess"/> + <XChildEntity name="SeamPageOut"/> + <XChildEntity maxCount="1" name="SeamPageRaiseEvent20"/> + <XChildEntity maxCount="1" name="SeamPageRender"/> + <XChildEntity maxCount="1" name="SeamPageRedirect21"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam-pages.rule" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="rule" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + name="if outcome" xmlname="if-outcome"/> + <XModelAttribute PROPERTIES="category=general" name="if" xmlname="if"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true;key=SeamPageRule_AddOut" + WizardClassName="%Default%" displayName="Add Out..." kind="action" name="AddOut"> + <EntityData EntityName="SeamPageOut"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="scope" Mandatory="no"/> + <AttributeData AttributeName="value"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem HIDE="disabled" + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.OpenPageHandler" + ICON="action.empty" PROPERTIES="actionpath=Open" + displayName="Open Page" kind="action" name="OpenPage"/> + <XActionItem + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.SelectOnDiagramHandler" + ICON="action.empty" displayName="Select on Diagram" kind="action" name="Select"/> + <XActionItemReference entity="SeamPageRule20" name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamPageRule20" name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamPageRule20" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamPageRule20" name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="%SeamPageTask%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="start-task" name="SeamPageStartTask"> @@ -3227,6 +4244,8 @@ <XChildEntity name="FileSeamPage12"/> <XChildEntity name="FileSeamPages20"/> <XChildEntity name="FileSeamPage20"/> + <XChildEntity name="FileSeamPage21"/> + <XChildEntity name="FileSeamPages21"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -3267,6 +4286,8 @@ <XChildEntity name="FileSeamPage12"/> <XChildEntity name="FileSeamPages20"/> <XChildEntity name="FileSeamPage20"/> + <XChildEntity name="FileSeamPage21"/> + <XChildEntity name="FileSeamPages21"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -3307,6 +4328,8 @@ <XChildEntity name="FileSeamPage12"/> <XChildEntity name="FileSeamPages20"/> <XChildEntity name="FileSeamPage20"/> + <XChildEntity name="FileSeamPage21"/> + <XChildEntity name="FileSeamPages21"/> </XChildrenEntities> <XActionItem kind="list"/> </XEntityExtension> @@ -3316,6 +4339,8 @@ <XChildEntity name="FileSeamPage12"/> <XChildEntity name="FileSeamPages20"/> <XChildEntity name="FileSeamPage20"/> + <XChildEntity name="FileSeamPage21"/> + <XChildEntity name="FileSeamPages21"/> </XChildrenEntities> <XActionItem kind="list"/> </XEntityExtension> Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java 2008-10-15 13:41:35 UTC (rev 10850) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java 2008-10-15 13:42:13 UTC (rev 10851) @@ -17,19 +17,22 @@ public String SUFF_12 = "12"; //$NON-NLS-1$ public String SUFF_20 = "20"; //$NON-NLS-1$ + public String SUFF_21 = "21"; //$NON-NLS-1$ public String ENT_FILE_SEAM_PAGES = "FileSeamPages"; //$NON-NLS-1$ public String ENT_FILE_SEAM_PAGES_12 = ENT_FILE_SEAM_PAGES + SUFF_12; - public String ENT_FILE_SEAM_PAGE = "FileSeamPage"; + public String ENT_FILE_SEAM_PAGE = "FileSeamPage"; //$NON-NLS-1$ public String ENT_FILE_SEAM_PAGE_12 = ENT_FILE_SEAM_PAGE + SUFF_12; public String ENT_FILE_SEAM_PAGES_20 = ENT_FILE_SEAM_PAGES + SUFF_20; - public String ENT_FILE_SEAM_PAGE_20 = ENT_FILE_SEAM_PAGE + SUFF_20; //$NON-NLS-1$ + public String ENT_FILE_SEAM_PAGE_20 = ENT_FILE_SEAM_PAGE + SUFF_20; + public String ENT_FILE_SEAM_PAGES_21 = ENT_FILE_SEAM_PAGES + SUFF_21; + public String ENT_FILE_SEAM_PAGE_21 = ENT_FILE_SEAM_PAGE + SUFF_21; public String ENT_SEAM_PAGE = "SeamPage"; //$NON-NLS-1$ public String ENT_SEAM_PAGE_12 = ENT_SEAM_PAGE + SUFF_12; public String ENT_SEAM_PAGE_20 = ENT_SEAM_PAGE + SUFF_20; - public String ENT_NAVIGATION = "SeamPageNavigation"; - public String ENT_NAVIGATION_RULE = "SeamPageNavigationRule"; + public String ENT_NAVIGATION = "SeamPageNavigation"; //$NON-NLS-1$ + public String ENT_NAVIGATION_RULE = "SeamPageNavigationRule"; //$NON-NLS-1$ public String ENT_EXCEPTION = "SeamPageException"; Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java 2008-10-15 13:41:35 UTC (rev 10850) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java 2008-10-15 13:42:13 UTC (rev 10851) @@ -36,8 +36,10 @@ return null; } else if(p.is12) { return p.isSingle ? ENT_FILE_SEAM_PAGE_12 : ENT_FILE_SEAM_PAGES_12; + } else if(p.is20) { + return p.isSingle ? ENT_FILE_SEAM_PAGE_20 : ENT_FILE_SEAM_PAGES_20; } else { - return p.isSingle ? ENT_FILE_SEAM_PAGE_20 : ENT_FILE_SEAM_PAGES_20; + return p.isSingle ? ENT_FILE_SEAM_PAGE_21 : ENT_FILE_SEAM_PAGES_21; } } @@ -45,6 +47,7 @@ boolean recognized = false; boolean is12 = false; boolean isSingle = false; + boolean is20 = false; Parser(String body) { int i = body.indexOf("<page"); //$NON-NLS-1$ @@ -62,6 +65,7 @@ if(s.indexOf("\"http://jboss.com/products/seam/pages\"") < 0) { //$NON-NLS-1$ return; } + if(s.indexOf("2.0") >= 0) is20 = true; } recognized = true; } Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java 2008-10-15 13:41:35 UTC (rev 10850) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java 2008-10-15 13:42:13 UTC (rev 10851) @@ -107,6 +107,8 @@ ? SUFF_12 : (entity.getName().endsWith(SUFF_20)) ? SUFF_20 + : (entity.getName().endsWith(SUFF_21)) + ? SUFF_21 : null; if(suff == null) { System.out.println("Unknown suffix in seam page entity " + entity.getName()); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2008-10-15 13:41:35 UTC (rev 10850) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2008-10-15 13:42:13 UTC (rev 10851) @@ -88,8 +88,10 @@ public static String getPageSuffix(String entity) { if(entity.endsWith(SUFF_12)) { return SUFF_12; + } else if(entity.endsWith(SUFF_20)) { + return SUFF_20; } else { - return SUFF_20; + return SUFF_21; } }

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10850 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-15 09:41:35 -0400 (Wed, 15 Oct 2008) New Revision: 10850 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.xml Log: JBIDE-2855 pages.xml 2.1 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.xml 2008-10-15 13:16:40 UTC (rev 10849) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.xml 2008-10-15 13:41:35 UTC (rev 10850) @@ -6,14 +6,14 @@ <xmlEditor class="org.jboss.tools.seam.ui.pages.editor.SeamPagesEditor" contributorClass="org.jboss.tools.seam.ui.pages.editor.PagesMultiPageContributor" - entities="FileSeamPages12,FileSeamPages20" + entities="FileSeamPages12,FileSeamPages20,FileSeamPages21" icon="images/xstudio/editors/seam-pages.gif" name="Seam Pages"> </xmlEditor> <xmlEditor class="org.jboss.tools.jst.web.ui.editors.WebCompoundEditor" contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" - entities="FileSeamPage12,FileSeamPage20" + entities="FileSeamPage12,FileSeamPage20,FileSeamPage21" icon="images/xstudio/editors/seam-pages.gif" name="Seam Page"> </xmlEditor>

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10849 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2008-10-15 09:16:40 -0400 (Wed, 15 Oct 2008) New Revision: 10849 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnsTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-2810 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java 2008-10-15 10:25:57 UTC (rev 10848) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java 2008-10-15 13:16:40 UTC (rev 10849) @@ -13,10 +13,12 @@ import java.util.List; import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -28,13 +30,13 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { Element sourceElement = (Element)sourceNode; - nsIDOMElement td = visualDocument.createElement("td"); + nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD); if(isHeader(sourceElement)) { - td.setAttribute("class", "dr-table-headercell rich-table-headercell"); + td.setAttribute(HTML.ATTR_CLASS, "dr-table-headercell rich-table-headercell"); //$NON-NLS-1$ } else if(isFooter(sourceElement)) { - td.setAttribute("class", "dr-table-footercell rich-table-footercell"); + td.setAttribute(HTML.ATTR_CLASS, "dr-table-footercell rich-table-footercell"); //$NON-NLS-1$ } else { - td.setAttribute("class", "dr-table-cell rich-table-cell"); + td.setAttribute(HTML.ATTR_CLASS, "dr-table-cell rich-table-cell"); //$NON-NLS-1$ } ComponentUtil.copyAttributes(sourceNode, td); VpeCreationData creationData = new VpeCreationData(td); @@ -51,11 +53,11 @@ } private boolean isHeader(Element sourceElement) { - return icludedInFacet(sourceElement, "header"); + return icludedInFacet(sourceElement, RichFaces.NAME_FACET_HEADER); } private boolean isFooter(Element sourceElement) { - return icludedInFacet(sourceElement, "footer"); + return icludedInFacet(sourceElement, RichFaces.NAME_FACET_FOOTER); } private boolean icludedInFacet(Element sourceElement, String facetName) { @@ -63,7 +65,7 @@ if(parent!=null) { if(ComponentUtil.isFacet(parent, facetName)) { return true; - } else if (parent.getNodeName().endsWith(":columnGroup")) { + } else if (parent.getNodeName().endsWith(RichFaces.TAG_COLUMN_GROUP)) { return ComponentUtil.isFacet(parent.getParentNode(), facetName); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnsTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnsTemplate.java 2008-10-15 10:25:57 UTC (rev 10848) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnsTemplate.java 2008-10-15 13:16:40 UTC (rev 10849) @@ -16,11 +16,11 @@ import java.util.List; import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; -import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil; import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.Constants; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -36,7 +36,7 @@ public class RichFacesColumnsTemplate extends AbstractRichFacesTemplate { /** The Constant DEFAULT_CLASSES. */ - private static final String DEFAULT_CLASSES = "dr-table-cell rich-table-cell"; + private static final String DEFAULT_CLASSES = "dr-table-cell rich-table-cell"; //$NON-NLS-1$ /** * Create. @@ -54,7 +54,7 @@ */ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { final Element sourceElement = (Element) sourceNode; - final nsIDOMElement td = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD); + final nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD); prepareData(sourceElement); final VpeCreationData data = new VpeCreationData(td); // Create mapping to Encode body @@ -62,7 +62,7 @@ String clazz = DEFAULT_CLASSES; if(ComponentUtil.isNotBlank(this.sourceStyleClass)){ - clazz = clazz+" "+this.sourceStyleClass; + clazz = clazz+Constants.WHITE_SPACE+this.sourceStyleClass; } if(ComponentUtil.isNotBlank(this.sourceWidth)){ td.setAttribute(RichFaces.ATTR_WIDTH, this.sourceWidth); @@ -83,7 +83,7 @@ */ private void prepareData(Element sourceElement) { this.sourceStyleClass = ComponentUtil.getAttribute(sourceElement, RichFaces.ATTR_STYLE_CLASS); - this.sourceStyle = ComponentUtil.getAttribute(sourceElement, HTML.ATTR_STYLE); + this.sourceStyle = ComponentUtil.getAttribute(sourceElement, RichFaces.ATTR_STYLE); this.sourceWidth = ComponentUtil.getAttribute(sourceElement, RichFaces.ATTR_WIDTH); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java 2008-10-15 10:25:57 UTC (rev 10848) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java 2008-10-15 13:16:40 UTC (rev 10849) @@ -15,9 +15,12 @@ import java.util.StringTokenizer; import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.Constants; +import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -36,68 +39,68 @@ initStyleClasses(sourceElement); - nsIDOMElement table = visualDocument.createElement("table"); + nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE); ComponentUtil.copyAttributes(sourceNode, table); VpeCreationData creationData = new VpeCreationData(table); - ComponentUtil.setCSSLink(pageContext, "dataTable/dataTable.css", "richFacesDataGrid"); - String tableClass = sourceElement.getAttribute("styleClass"); - table.setAttribute("class", "dr-table rich-table " + (tableClass==null?"":tableClass)); + ComponentUtil.setCSSLink(pageContext, "dataTable/dataTable.css", "richFacesDataGrid"); //$NON-NLS-1$ //$NON-NLS-2$ + String tableClass = sourceElement.getAttribute(RichFaces.ATTR_STYLE_CLASS); + table.setAttribute(HTML.ATTR_CLASS, "dr-table rich-table " + (tableClass==null?Constants.EMPTY:tableClass)); //$NON-NLS-1$ // Encode colgroup definition. int columnsLength = getColumnsCount(sourceElement); - nsIDOMElement colgroup = visualDocument.createElement("colgroup"); - colgroup.setAttribute("span", String.valueOf(columnsLength)); + nsIDOMElement colgroup = visualDocument.createElement(HTML.TAG_COLGROUP); + colgroup.setAttribute(HTML.ATTR_SPAN, String.valueOf(columnsLength)); table.appendChild(colgroup); //Encode Caption encodeCaption(creationData, sourceElement, visualDocument, table); // Encode Header - Element header = ComponentUtil.getFacet(sourceElement, "header"); + Element header = ComponentUtil.getFacet(sourceElement, RichFaces.NAME_FACET_HEADER); if(header!=null) { - nsIDOMElement thead = visualDocument.createElement("thead"); + nsIDOMElement thead = visualDocument.createElement(HTML.TAG_THEAD); table.appendChild(thead); - String headerClass = (String) sourceElement.getAttribute("headerClass"); + String headerClass = (String) sourceElement.getAttribute(RichFaces.ATTR_HEADER_CLASS); encodeTableHeaderOrFooterFacet(creationData, thead, columnsLength, visualDocument, header, - "dr-table-header rich-table-header", - "dr-table-header-continue rich-table-header-continue", - "dr-table-headercell rich-table-headercell", - headerClass, "td"); + "dr-table-header rich-table-header", //$NON-NLS-1$ + "dr-table-header-continue rich-table-header-continue", //$NON-NLS-1$ + "dr-table-headercell rich-table-headercell", //$NON-NLS-1$ + headerClass, HTML.TAG_TD); } // Encode Footer - Element footer = ComponentUtil.getFacet(sourceElement, "footer"); + Element footer = ComponentUtil.getFacet(sourceElement, RichFaces.NAME_FACET_FOOTER); if (footer != null) { - nsIDOMElement tfoot = visualDocument.createElement("tfoot"); + nsIDOMElement tfoot = visualDocument.createElement(HTML.TAG_TFOOT); table.appendChild(tfoot); - String footerClass = (String) sourceElement.getAttribute("footerClass"); + String footerClass = (String) sourceElement.getAttribute(RichFaces.ATTR_FOOTER_CLASS); encodeTableHeaderOrFooterFacet(creationData, tfoot, columnsLength, visualDocument, footer, - "dr-table-footer rich-table-footer", - "dr-table-footer-continue rich-table-footer-continue", - "dr-table-footercell rich-table-footercell", - footerClass, "td"); + "dr-table-footer rich-table-footer", //$NON-NLS-1$ + "dr-table-footer-continue rich-table-footer-continue", //$NON-NLS-1$ + "dr-table-footercell rich-table-footercell", //$NON-NLS-1$ + footerClass, HTML.TAG_TD); } - nsIDOMElement tbody = visualDocument.createElement("tbody"); + nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY); table.appendChild(tbody); // Create mapping to Encode body List<Node> children = ComponentUtil.getChildren(sourceElement); - sourceElement.getAttribute("elements"); + sourceElement.getAttribute(RichFaces.ATTR_ELEMENTS); int elementsCount = getElementsCount(sourceElement, columnsLength); if(columnsLength>0) { int rowIndex = 0; for(int elementIndex = 0; elementIndex<elementsCount; rowIndex++) { - nsIDOMElement tr = visualDocument.createElement("tr"); + nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR); tbody.appendChild(tr); - tr.setAttribute("class", "dr-table-row rich-table-row " + getRowClass(rowIndex)); + tr.setAttribute(HTML.ATTR_CLASS, "dr-table-row rich-table-row " + getRowClass(rowIndex)); //$NON-NLS-1$ for(int columnIndex = 0; columnIndex<columnsLength && elementIndex<elementsCount; columnIndex++) { - nsIDOMElement td = visualDocument.createElement("td"); + nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD); tr.appendChild(td); - td.setAttribute("class", "dr-table-cell rich-table-cell " + getColumnClass(columnIndex)); + td.setAttribute(HTML.ATTR_CLASS, "dr-table-cell rich-table-cell " + getColumnClass(columnIndex)); //$NON-NLS-1$ if(!children.isEmpty()) { VpeChildrenInfo childInfo = new VpeChildrenInfo(td); for (Node child : children) { @@ -114,23 +117,23 @@ } private void initStyleClasses(Element sourceElement) { - String columnClassesString = sourceElement.getAttribute("columnClasses"); - String rowClassesString = sourceElement.getAttribute("rowClasses"); + String columnClassesString = sourceElement.getAttribute(RichFaces.ATTR_COLUMN_CLASSES); + String rowClassesString = sourceElement.getAttribute(RichFaces.ATTR_ROW_CLASSES); columnClasses = parceClasses(columnClassesString); rowClasses = parceClasses(rowClassesString); } private String[] parceClasses(String classes) { if(classes==null) { - return new String[]{""}; + return new String[]{Constants.EMPTY}; } ArrayList<String> list = new ArrayList<String>(); - StringTokenizer st = new StringTokenizer(classes, ",", false); + StringTokenizer st = new StringTokenizer(classes, Constants.COMMA, false); while(st.hasMoreElements()) { list.add((String)st.nextElement()); } if(list.isEmpty()) { - return new String[]{""}; + return new String[]{Constants.EMPTY}; } return (String[])list.toArray(new String[list.size()]); } @@ -147,7 +150,7 @@ int count = 0; // check for exact value in component try { - int span = Integer.parseInt(sourceElement.getAttribute("columns")); + int span = Integer.parseInt(sourceElement.getAttribute(RichFaces.ATTR_COLUMNS)); count = span > 0 ? span : 0; } catch (NumberFormatException e) { // Ignore wrong formatted attribute @@ -159,7 +162,7 @@ int elements = 0; // check for exact value in component try { - int span = Integer.parseInt(sourceElement.getAttribute("elements")); + int span = Integer.parseInt(sourceElement.getAttribute(RichFaces.ATTR_ELEMENTS)); elements = span>0 ? span : columnCount * defaultRows; } catch (NumberFormatException e) { elements = columnCount * defaultRows; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2008-10-15 10:25:57 UTC (rev 10848) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2008-10-15 13:16:40 UTC (rev 10849) @@ -26,6 +26,7 @@ /** jsf tags which are used with richFaces. */ public static final String TAG_COLUMN = "column"; //$NON-NLS-1$ + public static final String TAG_COLUMNS = "columns"; //$NON-NLS-1$ /** The Constant TAG_FACET. */ public static final String TAG_FACET = "facet"; //$NON-NLS-1$ public static final String TAG_COLUMN_GROUP = "columnGroup"; //$NON-NLS-1$ @@ -73,6 +74,7 @@ public static final String ATTR_CAPTION_CLASS = "captionClass"; //$NON-NLS-1$ public static final String ATTR_CAPTION_STYLE = "captionStyle"; //$NON-NLS-1$ public static final String ATTR_COLUMNS = "columns"; //$NON-NLS-1$ + public static final String ATTR_ELEMENTS = "elements"; //$NON-NLS-1$ public static final String NAME_FACET_HEADER = "header"; //$NON-NLS-1$ public static final String NAME_FACET_FOOTER = "footer"; //$NON-NLS-1$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml 2008-10-15 10:25:57 UTC (rev 10848) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml 2008-10-15 13:16:40 UTC (rev 10849) @@ -7,7 +7,7 @@ <TBODY> <TR CLASS="dr-table-row rich-table-row"> <TD CLASS="dr-table-cell rich-table-cell"> - <DIV CLASS="dr-pnl rich-panel" TITLE="rich:panel"> + <DIV CLASS="dr-pnl rich-panel" > <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url$.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif$;/"> <SPAN> #{data.number}</SPAN> @@ -18,7 +18,7 @@ </DIV> </TD> <TD CLASS="dr-table-cell rich-table-cell"> - <DIV CLASS="dr-pnl rich-panel" TITLE="rich:panel"> + <DIV CLASS="dr-pnl rich-panel" > <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url$.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif$;/"> <SPAN> #{data.number}</SPAN> @@ -31,23 +31,23 @@ </TR> <TR CLASS="dr-table-row rich-table-row"> <TD CLASS="dr-table-cell rich-table-cell"> - <DIV CLASS="dr-pnl rich-panel" TITLE="rich:panel"> + <DIV CLASS="dr-pnl rich-panel" > <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url$.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif$;/"> <SPAN> #{data.number}</SPAN> </DIV> - <DIV CLASS="dr-pnl-b rich-panel-body" TITLE="rich:panel"> + <DIV CLASS="dr-pnl-b rich-panel-body" > <SPAN> #{data.field1}</SPAN> </DIV> </DIV> </TD> <TD CLASS="dr-table-cell rich-table-cell"> - <DIV CLASS="dr-pnl rich-panel" TITLE="rich:panel"> + <DIV CLASS="dr-pnl rich-panel" > <DIV CLASS="dr-pnl-h rich-panel-header" STYLE="/background-image: url$.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif$;/"> <SPAN> #{data.number}</SPAN> </DIV> - <DIV CLASS="dr-pnl-b rich-panel-body" TITLE="rich:panel"> + <DIV CLASS="dr-pnl-b rich-panel-body" > <SPAN> #{data.field1}</SPAN> </DIV> </DIV> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml 2008-10-15 10:25:57 UTC (rev 10848) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml 2008-10-15 13:16:40 UTC (rev 10849) @@ -9,9 +9,17 @@ <head> </head> <body> -  - <rich:dataList rows="5"> - <h:outputText value="testList" /> - </rich:dataList> +<h1>dataList</h1> + +<rich:dataList var="data" value="#{bean.dtList}" rows="4" id="dataList" > + <h:outputText value="field1:"></h:outputText> + <h:outputText value="#{data.field1} " /> + <h:outputText value="field2:"></h:outputText> + <h:outputText value="#{data.field2} " /> + <h:outputText value="field3:"></h:outputText> + <h:outputText value="#{data.field3}" /> + <h:outputText value="number:"></h:outputText> + <h:outputText value="#{data.number}" /> +</rich:dataList> </body> </html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataList.xhtml.xml 2008-10-15 13:16:40 UTC (rev 10849) @@ -0,0 +1,17 @@ +<tests> + <test id="dataList"> + <UL VAR="data" VALUE="#{bean.dtList}" ROWS="4" ID="dataList" + CLASS="dr-list rich-datalist"> + <LI CLASS="dr-list-item rich-list-item"> + <SPAN> field1:</SPAN> + <SPAN > #{data.field1}</SPAN> + <SPAN> field2:</SPAN> + <SPAN> #{data.field2}</SPAN> + <SPAN> field3:</SPAN> + <SPAN> #{data.field3}</SPAN> + <SPAN> number:</SPAN> + <SPAN> #{data.number}</SPAN> + </LI> + </UL> + </test> +</tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-15 10:25:57 UTC (rev 10848) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-15 13:16:40 UTC (rev 10849) @@ -87,7 +87,7 @@ } public void testDataList() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/dataList.xhtml");//$NON-NLS-1$ } public void testDataOrderedList() throws Throwable { Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-10-15 10:25:57 UTC (rev 10848) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-10-15 13:16:40 UTC (rev 10849) @@ -19,8 +19,10 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.VpeDebug; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; +import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Document; @@ -77,6 +79,7 @@ TestUtil.waitForJobs(); + TestUtil.delay(2000); VpeController controller = getVpeController((JSPMultiPageEditor) editor); // get xml test file @@ -118,9 +121,9 @@ nsIDOMElement vpeElement = findElementById(controller, elementId); assertNotNull(vpeElement); - // DOMTreeDumper dumper = new DOMTreeDumper( - // VpeDebug.VISUAL_DUMP_PRINT_HASH); - // dumper.dumpToStream(System.out, vpeElement); + DOMTreeDumper dumper = new DOMTreeDumper( + VpeDebug.VISUAL_DUMP_PRINT_HASH); + dumper.dumpToStream(System.out, vpeElement); // get test element by id - get <test id="..." > element and get his // first child Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2008-10-15 10:25:57 UTC (rev 10848) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2008-10-15 13:16:40 UTC (rev 10849) @@ -21,7 +21,6 @@ import org.jboss.tools.common.model.util.XMLUtil; import org.jboss.tools.vpe.editor.util.Constants; -import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMAttr; import org.mozilla.interfaces.nsIDOMNamedNodeMap; import org.mozilla.interfaces.nsIDOMNode; @@ -122,17 +121,17 @@ throws ComparisonException { if (!modelNode.getNodeName().equalsIgnoreCase(vpeNode.getNodeName())) { - throw new ComparisonException("name of tag is \"" - + vpeNode.getNodeName() + "\"but must be \"" - + modelNode.getNodeName() + "\""); + throw new ComparisonException("name of tag is \"" //$NON-NLS-1$ + + vpeNode.getNodeName() + "\"but must be \"" //$NON-NLS-1$ + + modelNode.getNodeName() + "\""); //$NON-NLS-1$ } if ((modelNode.getNodeValue() != null) && (!modelNode.getNodeValue().trim().equalsIgnoreCase( vpeNode.getNodeValue().trim()))) { - throw new ComparisonException("value of " + vpeNode.getNodeName() - + " is \"" + vpeNode.getNodeValue().trim() - + "\" but must be \"" + modelNode.getNodeValue().trim() - + "\""); + throw new ComparisonException("value of " + vpeNode.getNodeName() //$NON-NLS-1$ + + " is \"" + vpeNode.getNodeValue().trim() //$NON-NLS-1$ + + "\" but must be \"" + modelNode.getNodeValue().trim() //$NON-NLS-1$ + + "\""); //$NON-NLS-1$ } // compare node's attributes if (modelNode.getNodeType() == Node.ELEMENT_NODE) { @@ -205,18 +204,22 @@ for (String illegalAttributeName : illegalAttributes) { if (vpeAttributes.getNamedItem(illegalAttributeName.trim()) != null) - throw new ComparisonException("illegal attribute :" + throw new ComparisonException("illegal attribute :" //$NON-NLS-1$ + illegalAttributeName); } } else { + + if (vpeAttributes.getNamedItem( + name) == null) + throw new ComparisonException("there is not : \"" + name //$NON-NLS-1$ + + "\" attribute"); //$NON-NLS-1$ + nsIDOMAttr vpeAttr = (nsIDOMAttr) vpeAttributes.getNamedItem( name).queryInterface(nsIDOMAttr.NS_IDOMATTR_IID); - if (vpeAttr == null) - throw new ComparisonException("there is not : \"" + name - + "\" attribute"); + // if (HTML.ATTR_STYLE.equalsIgnoreCase(name)) { // @@ -255,12 +258,10 @@ // } // // } - else { compareComplexStrings(modelAttr.getNodeValue().trim(), vpeAttr.getNodeValue().trim()); - } } } } @@ -276,13 +277,13 @@ Matcher matcher = Pattern.compile(regex).matcher(vpeString); if (!matcher.find()) { - throw new ComparisonException("string is\"" + vpeString - + "\" but pattern is \"" + regex + "\""); + throw new ComparisonException("string is\"" + vpeString //$NON-NLS-1$ + + "\" but pattern is \"" + regex + "\""); //$NON-NLS-1$ //$NON-NLS-2$ } } else if (!modelString.equals(vpeString)) { - throw new ComparisonException("string is\"" + vpeString - + "\" but must be \"" + modelString + "\""); + throw new ComparisonException("string is\"" + vpeString //$NON-NLS-1$ + + "\" but must be \"" + modelString + "\""); //$NON-NLS-1$ //$NON-NLS-2$ } }

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10848 - in trunk/esb/plugins: org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2008-10-15 06:25:57 -0400 (Wed, 15 Oct 2008) New Revision: 10848 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java Log: JBIDE-2889: fix the bad refresh issue JBIDE-2902: could not publish esb project JBIDE-2888: set server supplied esb runtime as default Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2008-10-15 09:04:53 UTC (rev 10847) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2008-10-15 10:25:57 UTC (rev 10848) @@ -50,7 +50,7 @@ <supported> <facet id="jst.jboss.esb" - version="4.2,4.3"> + version="4.2,4.3,4.4"> </facet> <runtime-component id="org.jboss.ide.eclipse.as.runtime.component" Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2008-10-15 09:04:53 UTC (rev 10847) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2008-10-15 10:25:57 UTC (rev 10848) @@ -12,5 +12,8 @@ public final static String ESB_CONFIG_QUEUE_SERVICE_JBM = "jbm-queue-service.xml"; public final static String ESB_CONFIG_QUEUE_SERVICE_JBMQ = "jbmq-queue-service.xml"; + public final static String DEFAULT_ESB_CONFIG_RESOURCE_FOLDER = "resources"; + public final static String DEFAULT_ESB_SOURCE_FOLDER = "src"; + public final static String ESB_PROJECT_NATURE = "org.jboss.tools.esb.project.ESBNature"; } Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java 2008-10-15 09:04:53 UTC (rev 10847) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java 2008-10-15 10:25:57 UTC (rev 10848) @@ -6,6 +6,7 @@ import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.jboss.tools.esb.core.ESBProjectConstant; public class JBossESBFacetDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IJBossESBFacetDataModelProperties{ @@ -28,15 +29,17 @@ return JBOSSESB_PROJECT_FACET; } else if(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER.equals(propertyName)){ - return "esbcontent"; + return "esbcontent";//ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER; } else if(IJBossESBFacetDataModelProperties.ESB_SOURCE_FOLDER.equals(propertyName)){ - return "src"; + return ESBProjectConstant.DEFAULT_ESB_SOURCE_FOLDER; } else if(propertyName.equals(RUNTIME_ID)){ return ""; }else if(propertyName.equals(FACET_ID)){ return IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID; + } else if( propertyName.equals(RUNTIME_IS_SERVER_SUPPLIED)){ + return true; } return super.getDefaultProperty(propertyName); } Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2008-10-15 09:04:53 UTC (rev 10847) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2008-10-15 10:25:57 UTC (rev 10848) @@ -40,40 +40,60 @@ IJavaProject javaPrj = JavaCore.create(project); IPath output = javaPrj.getOutputLocation(); // if the jboss-esb.xml file is not in META-INF folder, try to get it from other folder of the project + List<IModuleResource> mrs = getConfigModuleFile(project, configFolder); + + IModuleResource[] esbContent = getModuleResources(Path.EMPTY, configFolder); + IModuleResource[] classes = getModuleResources(Path.EMPTY, project.getWorkspace().getRoot().getFolder(output)); + IModuleResource[] allResource = new IModuleResource[esbContent.length + classes.length + mrs.size()]; + System.arraycopy(esbContent, 0, allResource, 0, esbContent.length); + System.arraycopy(classes, 0, allResource, esbContent.length, classes.length); + if(mrs.size() > 0){ + IModuleResource[] mr = mrs.toArray(new IModuleResource[]{}); + System.arraycopy(mr, 0, allResource, esbContent.length + classes.length, mr.length); + } + return allResource; + } + + private List<IModuleResource> getConfigModuleFile(IProject project, IFolder configFolder) throws CoreException { List<IModuleResource> mrs = new ArrayList<IModuleResource>(); IFolder metainf = configFolder.getFolder(ESBProjectConstant.META_INF); IResource res = metainf.findMember(ESBProjectConstant.ESB_CONFIG_JBOSSESB); + IModuleFile tmpmf; if(res == null){ - mrs.add(getModuleResourcesOutofESBContent(new Path(ESBProjectConstant.META_INF), project, ESBProjectConstant.ESB_CONFIG_JBOSSESB)); + tmpmf = getModuleResourcesOutofESBContent(new Path(ESBProjectConstant.META_INF), project, ESBProjectConstant.ESB_CONFIG_JBOSSESB); + if( tmpmf != null){ + mrs.add(tmpmf); + } } //check the deployment.xml just like jboss-esb.xml res = metainf.findMember(ESBProjectConstant.ESB_CONFIG_DEPLOYMENT); if(res == null){ - mrs.add(getModuleResourcesOutofESBContent(new Path(ESBProjectConstant.META_INF), project, ESBProjectConstant.ESB_CONFIG_DEPLOYMENT)); + tmpmf = getModuleResourcesOutofESBContent(new Path(ESBProjectConstant.META_INF), project, ESBProjectConstant.ESB_CONFIG_DEPLOYMENT); + if(tmpmf != null){ + mrs.add(tmpmf); + } } res = configFolder.findMember(ESBProjectConstant.ESB_CONFIG_QUEUE_SERVICE_JBM); if(res == null){ - mrs.add(getModuleResourcesOutofESBContent(Path.EMPTY, project, ESBProjectConstant.ESB_CONFIG_QUEUE_SERVICE_JBM)); + tmpmf = getModuleResourcesOutofESBContent(Path.EMPTY, project, ESBProjectConstant.ESB_CONFIG_QUEUE_SERVICE_JBM); + if(tmpmf != null){ + mrs.add(tmpmf); + } } res = configFolder.findMember(ESBProjectConstant.ESB_CONFIG_QUEUE_SERVICE_JBMQ); if(res == null){ - mrs.add(getModuleResourcesOutofESBContent(Path.EMPTY, project, ESBProjectConstant.ESB_CONFIG_QUEUE_SERVICE_JBMQ)); + tmpmf = getModuleResourcesOutofESBContent(Path.EMPTY, project, ESBProjectConstant.ESB_CONFIG_QUEUE_SERVICE_JBMQ); + if( tmpmf != null ){ + mrs.add(tmpmf); + } } - IModuleResource[] esbContent = getModuleResources(Path.EMPTY, configFolder); - IModuleResource[] classes = getModuleResources(Path.EMPTY, project.getWorkspace().getRoot().getFolder(output)); - IModuleResource[] allResource = new IModuleResource[esbContent.length + classes.length + mrs.size()]; - System.arraycopy(esbContent, 0, allResource, 0, esbContent.length); - System.arraycopy(classes, 0, allResource, esbContent.length, classes.length); - if(mrs.size() > 0){ - IModuleResource[] mr = mrs.toArray(new IModuleResource[]{}); - System.arraycopy(mr, 0, allResource, esbContent.length + classes.length, mr.length); - } - return allResource; + return mrs; } + @Override public IStatus validate() { return null; Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-10-15 09:04:53 UTC (rev 10847) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-10-15 10:25:57 UTC (rev 10848) @@ -31,5 +31,12 @@ name="JBoss ESB Runtimes"> </page> </extension> - + <extension + point="org.eclipse.wst.server.ui.serverImages"> + <image + icon="icons/wizards/esb.gif" + id="org.jboss.tools.esb.project.ui.image" + typeIds="jst.jboss.esb"> + </image> + </extension> </plugin> Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2008-10-15 09:04:53 UTC (rev 10847) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2008-10-15 10:25:57 UTC (rev 10848) @@ -35,7 +35,7 @@ ESBFacetInstallationPage_Button_Text_New=New ESBFacetInstallationPage_Default_SRC_Folder=src ESBFacetInstallationPage_Description=Configure project structure and classpath -ESBFacetInstallationPage_Error_Message_Have_Not_Set_Target_Runtime=Please specify Target Runtime at the first wizard page. +ESBFacetInstallationPage_Error_Message_Have_Not_Set_Target_Runtime=Please specify the project primary target runtime ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime=The specified target runtime does not contain a valid ESB runtime. ESBFacetInstallationPage_Error_Message_No_Target_Runtime=No target runtime was specified. ESBFacetInstallationPage_Error_Message_Specify_Content_Folder=Please specify a valid content folder. Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2008-10-15 09:04:53 UTC (rev 10847) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2008-10-15 10:25:57 UTC (rev 10848) @@ -66,6 +66,9 @@ private Button btnServerSupplied; private Button btnNew; + private IFacetedProjectListener fpListerner; + private IFacetedProjectWorkingCopy fpwc; + public ESBFacetInstallationPage() { super( "esb.facet.install.page"); //$NON-NLS-1$ setTitle(JBossESBUIMessages.ESBFacetInstallationPage_Title); @@ -94,33 +97,44 @@ Dialog.applyDialogFont(parent); // add listener to listen the changes on the project facet - final IFacetedProjectWorkingCopy fpwc = getFacetedProjectWorkingCopy(); - fpwc.addListener(new IFacetedProjectListener(){ + fpwc = getFacetedProjectWorkingCopy(); + if(fpListerner == null){ + fpListerner = new IFacetedProjectListener(){ - public void handleEvent(IFacetedProjectEvent event) { - IProjectFacet facet = ProjectFacetsManager.getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET); - final IProjectFacetVersion version = fpwc.getProjectFacetVersion(facet); - Display.getDefault().syncExec(new Runnable() { + public void handleEvent(IFacetedProjectEvent event) { + IProjectFacet facet = ProjectFacetsManager.getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET); + final IProjectFacetVersion version = fpwc.getProjectFacetVersion(facet); + Display.getDefault().asyncExec(new Runnable() { - public void run() { - if(version != null){ - initializeRuntimesCombo(cmbRuntimes, null, version.getVersionString()); - }else{ - initializeRuntimesCombo(cmbRuntimes, null); + public void run() { + if(version != null){ + initializeRuntimesCombo(cmbRuntimes, null, version.getVersionString()); + + }else{ + initializeRuntimesCombo(cmbRuntimes, null); + } + changePageStatus(); } - } + + }); - }); - - } - }, IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED); + } + }; + } + if(fpwc != null){ + fpwc.addListener(fpListerner, IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED, + IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED); + } + //set page status + changePageStatus(); + return composite; } private void createProjectGroup(Composite parent){ - Group prjGroup = new Group(parent, SWT.BORDER); + Group prjGroup = new Group(parent, SWT.NONE); prjGroup.setText(JBossESBUIMessages.ESBFacetInstallationPage_Group_Text_Folder); prjGroup.setLayout(new GridLayout(1, false)); prjGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); @@ -208,7 +222,7 @@ private void createRuntimeGroup(Composite parent){ - Group runtimeGroup = new Group(parent, SWT.BORDER); + Group runtimeGroup = new Group(parent, SWT.NONE); runtimeGroup.setText(JBossESBUIMessages.ESBFacetInstallationPage_Group_Runtime_Text); runtimeGroup.setLayout(new GridLayout(3, false)); runtimeGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); @@ -270,6 +284,9 @@ hasRuntime = false; } + //set default ESB runtime option + btnServerSupplied.setSelection(true); + enableUserSupplied(false); } @@ -314,31 +331,11 @@ } private void checkServerSuppliedESBRuntime() { - String prjname = model.getStringProperty(FACET_PROJECT_NAME); - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - prjname); try { - IFacetedProject fp = ProjectFacetsManager.create(project); - if (fp != null) { - IRuntime runtime = fp.getPrimaryRuntime(); - if (runtime == null) { - setErrorMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_No_Target_Runtime); - hasRuntime = false; - setPageComplete(isPageComplete()); - return; - } - org.eclipse.wst.server.core.IRuntime serverRuntime = ServerCore - .findRuntime(runtime.getProperty("id")); - if (!JBossRuntimeManager.isValidESBServer(serverRuntime - .getLocation().toOSString())) { - setErrorMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime); - hasRuntime = false; - setPageComplete(isPageComplete()); - return; - } - } else { - IFacetedProjectWorkingCopy ifpwc = getFacetedProjectWorkingCopy(); + IFacetedProjectWorkingCopy ifpwc = getFacetedProjectWorkingCopy(); + //when the UI is loaded from esb project creation wizard + if (ifpwc != null) { IRuntime runtime = ifpwc.getPrimaryRuntime(); if (runtime == null) { setErrorMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Have_Not_Set_Target_Runtime); @@ -356,8 +353,33 @@ setPageComplete(isPageComplete()); return; } + } + // when the UI loaded from project facet properties page + else { + String prjname = model.getStringProperty(FACET_PROJECT_NAME); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(prjname); + IFacetedProject fp = ProjectFacetsManager.create(project); + // if fp != null , the UI will be loaded for an exist project + if (fp != null) { + IRuntime runtime = fp.getPrimaryRuntime(); + if (runtime == null) { + setErrorMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_No_Target_Runtime); + hasRuntime = false; + setPageComplete(isPageComplete()); + return; + } + org.eclipse.wst.server.core.IRuntime serverRuntime = ServerCore + .findRuntime(runtime.getProperty("id")); + if (!JBossRuntimeManager.isValidESBServer(serverRuntime + .getLocation().toOSString())) { + setErrorMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime); + hasRuntime = false; + setPageComplete(isPageComplete()); + return; + } + } } - + } catch (CoreException e) { ESBProjectPlugin.getDefault().getLog().log(e.getStatus()); } @@ -419,7 +441,7 @@ selectedJbRuntime = jr; selectIndex = i; } - // get default jbossws runtime + // get default jbossws runtime from esb runtime preference if (jr.isDefault()) { defaultJbws = jr; defaultIndex = i; @@ -428,10 +450,14 @@ if(selectedJbRuntime != null){ cmRuntime.select(selectIndex); - saveJBossESBRuntimeToModel(selectedJbRuntime); + if(btnUserSupplied.getSelection()){ + saveJBossESBRuntimeToModel(selectedJbRuntime); + } }else if(defaultJbws != null){ cmRuntime.select(defaultIndex); - saveJBossESBRuntimeToModel(defaultJbws); + if(btnUserSupplied.getSelection()){ + saveJBossESBRuntimeToModel(defaultJbws); + } } } @@ -523,7 +549,7 @@ /* private void fillMessageGroup(Composite parent){ - Group messageGroup = new Group(parent, SWT.BORDER); + Group messageGroup = new Group(parent, SWT.); messageGroup.setText("Target Message Product"); messageGroup.setLayout(new GridLayout(1, false)); messageGroup.setLayoutData(new GridData(GridData.FILL_BOTH)); @@ -547,5 +573,15 @@ return null; } + @Override + public void dispose() { + if(fpwc != null){ + fpwc.removeListener(fpListerner); + } + super.dispose(); + } + + + } \ No newline at end of file

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10847 - in trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean: model and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-15 05:04:53 -0400 (Wed, 15 Oct 2008) New Revision: 10847 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java Log: JBIDE-2867 Deal with a problem that is the collection interface type property can't display/connect correctly Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-15 09:02:47 UTC (rev 10846) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-15 09:04:53 UTC (rev 10847) @@ -929,7 +929,7 @@ if (list == null) return null; if (parentModel.isList() || parentModel.isArray()) { - if (list.size() >= 1) { + if (list.size() >= 1 && parentModel.hasGenericType()) { JavaBeanModel m = (JavaBeanModel) list.get(0); return m; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-10-15 09:02:47 UTC (rev 10846) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-10-15 09:04:53 UTC (rev 10847) @@ -41,6 +41,8 @@ private boolean collection = false; private boolean isPrimitive = false; + + private boolean hasGenericType = false; private Class<? extends Object> beanClass = null; @@ -117,6 +119,7 @@ .getActualTypeArguments()[0]; Class beanType = (Class) gtype; componentClass = beanType; + setGenericType(true); } } } @@ -358,4 +361,12 @@ return buffer.toString(); } + public boolean hasGenericType() { + return hasGenericType; + } + + public void setGenericType(boolean hasGenericType) { + this.hasGenericType = hasGenericType; + } + }

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10846 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui: wizards and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-15 05:02:47 -0400 (Wed, 15 Oct 2008) New Revision: 10846 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java Log: JBIDE-2867 Deal with a problem that is the collection interface type property can't display/connect correctly Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-10-15 08:10:33 UTC (rev 10845) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-10-15 09:02:47 UTC (rev 10846) @@ -454,7 +454,9 @@ protected void initTargetTreeViewer() { if (this.targetTreeViewerInputModel != null) { - targetViewer.setInput(targetTreeViewerInputModel); + List arrayList = new ArrayList(); + arrayList.add(targetTreeViewerInputModel); + targetViewer.setInput(arrayList); } } @@ -474,7 +476,9 @@ protected void initSourceTreeViewer() { if (this.sourceTreeViewerInputModel != null) { - sourceViewer.setInput(sourceTreeViewerInputModel); + List arrayList = new ArrayList(); + arrayList.add(sourceTreeViewerInputModel); + sourceViewer.setInput(arrayList); } } @@ -601,6 +605,7 @@ protected void createTargetGraphModels() { Tree tree = targetViewer.getTree(); TreeItem[] items = tree.getItems(); + clearExsitingGraphModels(TargetModel.class); createGraphModels(items, TargetModel.class); } @@ -975,7 +980,9 @@ } /** - * + * It's a very important method <p> + * If call the method , there will open the data selection wizard to allow user select new data , <p> + * when user select the new data , the connections will be removed. * @param viewer */ protected void showCreationWizard(TreeViewer viewer) { @@ -991,19 +998,18 @@ this.getSmooksConfigurationFileGenerateContext().addProperties( cw.getProperties()); String typeID = cw.getInputDataTypeID(); + if (viewer.getInput() != null) { + if (!MessageDialog + .openQuestion( + getSite().getShell(), + "Changed Data ?", + "Do you want to change the data ? If you do so , all connections will be losted")) { + return; + } + } if (UIUtils.setTheProvidersForTreeViewer(viewer, typeID)) { - if (viewer.getInput() != null) { - if (!MessageDialog - .openQuestion( - getSite().getShell(), - "Changed Data?", - "Do you want to change the data?if you do this , all connections will be losted")) { - return; - } - } viewer.setInput(cw.getTreeViewerInputContents()); try { - // viewer.expandAll(); if (viewer == this.sourceViewer) { this.createSourceGraphModels(); sourceDataTypeID = typeID; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-15 08:10:33 UTC (rev 10845) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-15 09:02:47 UTC (rev 10846) @@ -106,53 +106,6 @@ this.showDataSelectPage = showDataSelectPage; } - // public boolean canFlipToNextPage() { - // if (!showDataSelectPage) { - // return isPageComplete() && getNextPage() != null; - // } - // return super.canFlipToNextPage(); - // } - - // /* - // * (non-Javadoc) - // * - // * @see org.eclipse.jface.wizard.WizardSelectionPage#getNextPage() - // */ - // public IWizardPage getNextPage() { - // if (!showDataSelectPage) { - // if (this.getWizard() != null) { - // return this.getWizard().getNextPage(this); - // } - // } - // if (this.getSelectedNode() == null) { - // return null; - // } - // - // boolean isCreated = getSelectedNode().isContentCreated(); - // - // IWizard wizard = getSelectedNode().getWizard(); - // - // if (wizard == null) { - // setSelectedNode(null); - // return null; - // } - // if (!isCreated) { - // if (wizard instanceof IStrucutredDataCreationWizard) { - // String targetID = getDataTypeID(target); - // if (targetID != null) { - // ((IStrucutredDataCreationWizard) wizard) - // .setNextDataCreationWizardNode(this - // .getSourceWizard(targetID)); - // } - // } - // if (wizard instanceof INewWizard) { - // ((INewWizard) wizard).init(null, selection); - // } - // wizard.addPages(); - // } - // return wizard.getStartingPage(); - // } - /* * (non-Javadoc) * @@ -350,34 +303,10 @@ if (viewer == source) { String sourceID = getDataTypeID(source); setSourceID(sourceID); - // TODO don't use that to display the source selection - // wizard page. - // IWizardNode wn = getSourceWizard(sourceID); - // setSelectedNode(wn); - // IWizard sw = wn.getWizard(); - // if (sw instanceof IStrucutredDataCreationWizard) { - // setSourceWizard((IStrucutredDataCreationWizard) sw); - // } } if (viewer == target) { - // IWizardNode node = getSelectedNode(); String targetID = getDataTypeID(target); - // TODO don't use that to display the target selection - // wizard page. - // IWizardNode targetNode = getSourceWizard(targetID); - // IWizard tnw = targetNode.getWizard(); - // if (tnw instanceof IStrucutredDataCreationWizard) { - // setTargetWizard((IStrucutredDataCreationWizard) tnw); - // } - // if (node != null) { - // IWizard wizard = node.getWizard(); - // if (wizard != null - // && wizard instanceof IStrucutredDataCreationWizard) { - // ((IStrucutredDataCreationWizard) wizard) - // .setNextDataCreationWizardNode(targetNode); - // } - // } setTargetID(targetID); } } @@ -386,9 +315,6 @@ TableColumn nameColumn = new TableColumn(viewer.getTable(), SWT.NONE); nameColumn.setWidth(100); nameColumn.setText("Name"); - // TableColumn idColumn = new TableColumn(viewer.getTable(), SWT.NONE); - // idColumn.setWidth(100); - // idColumn.setText("ID"); viewer.setContentProvider(new TypeIDContentProvider()); viewer.setLabelProvider(new TypeIDLabelProvider()); return viewer; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-10-15 08:10:33 UTC (rev 10845) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-10-15 09:02:47 UTC (rev 10846) @@ -4,6 +4,7 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; +import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; @@ -13,7 +14,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; @@ -22,7 +22,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; import org.jboss.tools.smooks.graphical.util.GraphicalInformationSaver; -import org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard; import org.jboss.tools.smooks.ui.editors.SmooksFileEditorInput; import org.jboss.tools.smooks.ui.editors.SmooksFormEditor; import org.jboss.tools.smooks.ui.editors.TypeIDSelectionWizardPage; @@ -132,8 +131,21 @@ try { SmooksFileEditorInput input = new SmooksFileEditorInput( file); - input.setSourceTreeViewerInputContents(typeIDPage.getSourceTreeViewerInputContents()); - input.setTargetTreeViewerInputContents(typeIDPage.getTargetTreeViewerInputContents()); + Object sourceObj = typeIDPage.getSourceTreeViewerInputContents(); + if(sourceObj instanceof List){ + if(!((List)sourceObj).isEmpty()){ + sourceObj = ((List)sourceObj).get(0); + } + } + input.setSourceTreeViewerInputContents(sourceObj); + + Object targetObj = typeIDPage.getSourceTreeViewerInputContents(); + if(targetObj instanceof List){ + if(!((List)targetObj).isEmpty()){ + targetObj = ((List)targetObj).get(0); + } + } + input.setTargetTreeViewerInputContents(targetObj); IDE.openEditor(page, input, SmooksFormEditor.EDITOR_ID, true);// openEditor(page, file, true);

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10845 - in trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert: bpmnto/wizard and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2008-10-15 04:10:33 -0400 (Wed, 15 Oct 2008) New Revision: 10845 Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java Log: JBIDE-2896:fix subprocess's name is null Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java 2008-10-15 07:09:35 UTC (rev 10844) +++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java 2008-10-15 08:10:33 UTC (rev 10845) @@ -283,8 +283,8 @@ } /* - * Translate a bpmn subprocess to a jpdl processstate and a new jpdl process - * difinition + * Translate a bpmn subprocess to a jpdl process-state and a new jpdl process + * definition */ private void translateSubprocess(Element subProcess, Element element) { Element processRoot = translateGraph(subProcess); Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java 2008-10-15 07:09:35 UTC (rev 10844) +++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java 2008-10-15 08:10:33 UTC (rev 10845) @@ -90,14 +90,31 @@ } else { String str = generateProcessName(graph.getParent()); if (str == null) { - return graph.attributeValue(B2JMessages.Dom_Element_Name); + return generateElementName(graph); } else { return str + B2JMessages.Folder_Name_Separator - + graph.attributeValue(B2JMessages.Dom_Element_Name); + + generateElementName(graph); } } } + + /* + * generate a element name + */ + public static String generateElementName(Element graph){ + String name = graph.attributeValue(B2JMessages.Dom_Element_Name); + if (name == null || "".equals(name)) { + name = "au_gen"; + } + Integer i = nameMap.get(name); + if (i == null) { + nameMap.put(name, new Integer("1")); + } else { + nameMap.put(name, ++i); + } + return name; + } /* * check the bpmn element name is null or "" or same to another element name @@ -109,7 +126,7 @@ String name = graph.attributeValue(B2JMessages.Dom_Element_Name); if (name == null || "".equals(name)) { - name = "jboss_autogen"; + name = "au_gen"; isOk = false; } Integer i = nameMap.get(name); Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java 2008-10-15 07:09:35 UTC (rev 10844) +++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java 2008-10-15 08:10:33 UTC (rev 10845) @@ -129,7 +129,7 @@ public IWizardPage getNextPage(IWizardPage page) { if (page.getName() - .equals(B2JMessages.Bpmn_Pool_Choose_WizardPage_Name)) { + .equals(B2JMessages.Bpmn_Translate_Message_WizardPage_Name)) { errorList = translateBpmnToStrings(); if (errorList.size() == 0) { return locationPage;

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10844 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-15 03:09:35 -0400 (Wed, 15 Oct 2008) New Revision: 10844 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java Log: JBIDE-2898 have fixed it. there were some problems with the getDataTypeID method Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-15 06:37:41 UTC (rev 10843) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-15 07:09:35 UTC (rev 10844) @@ -275,7 +275,7 @@ Object[] objs = viewer.getCheckedElements(); if (objs == null) return null; - if (objs.length > 1) + if (objs.length <= 0) return null; DataTypeID d = (DataTypeID) objs[0]; return d.getId();

16 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2008