Author: scabanovich Date: 2008-10-07 09:47:36 -0400 (Tue, 07 Oct 2008) New Revision: 10711 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/messages.properties Log: JBIDE-2855 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml 2008-10-07 13:47:16 UTC (rev 10710) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml 2008-10-07 13:47:36 UTC (rev 10711) @@ -22,7 +22,7 @@ <xmlEditor class="org.jboss.tools.jst.web.ui.editors.WebCompoundEditor" contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" - entities="FileSeamComponents11,FileSeamComponents12,FileSeamComponents20,FileSeamComponent12,FileSeamComponent20" + entities="FileSeamComponents11,FileSeamComponents12,FileSeamComponents20,FileSeamComponents21,FileSeamComponent12,FileSeamComponent20,FileSeamComponent21" icon="images/xstudio/editors/seam-components.gif" name="%editors.spring-beans.name"> </xmlEditor> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentFormLayoutData.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentFormLayoutData.java 2008-10-07 13:47:16 UTC (rev 10710) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentFormLayoutData.java 2008-10-07 13:47:36 UTC (rev 10711) @@ -89,9 +89,27 @@ ) }; + private final static IFormData[] COMPONENT_FILE_21_DEFINITIONS = new IFormData[] { + new FormData( + SeamXMLUIMessages.getString("SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_1_FILE"), //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENT_FILE_21) + ), + SEAM_PROPERTY_LIST_DEFINITION, + new FormData( + SeamXMLUIMessages.getString("SEAM_COMPONENT_FORM_LAYOUT_DATA_ADVANCED"), //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createAdvancedFormAttributeData(ENT_SEAM_COMPONENT_FILE_21) + ) + }; + final static IFormData SEAM_COMPONENT_FILE_FORM_DEFINITION = new FormData( ENT_SEAM_COMPONENT_12, new String[]{null}, COMPONENT_FILE_12_DEFINITIONS); final static IFormData SEAM_COMPONENT_FILE_20_FORM_DEFINITION = new FormData( ENT_SEAM_COMPONENT_FILE_20, new String[]{null}, COMPONENT_FILE_20_DEFINITIONS); + + final static IFormData SEAM_COMPONENT_FILE_21_FORM_DEFINITION = new FormData( + ENT_SEAM_COMPONENT_FILE_21, new String[]{null}, COMPONENT_FILE_21_DEFINITIONS); + } Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java 2008-10-07 13:47:16 UTC (rev 10710) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java 2008-10-07 13:47:36 UTC (rev 10711) @@ -93,6 +93,18 @@ SEAM_IMPORT_LIST_DEFINITION }; + private final static IFormData[] FILE_21_DEFINITIONS = new IFormData[] { + new FormData( + "Seam Components 2.1 File", + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_21) + ), + SEAM_COMPONENT_20_LIST_DEFINITION, + getFactoryList(ENT_SEAM_FACTORY_20), + getEventList(ENT_SEAM_EVENT_20), + SEAM_IMPORT_LIST_DEFINITION + }; + final static IFormData FILE_12_FORM_DEFINITION = new FormData( ENT_SEAM_COMPONENTS_12, new String[]{null}, FILE_12_DEFINITIONS); @@ -102,4 +114,7 @@ final static IFormData FILE_20_FORM_DEFINITION = new FormData( ENT_SEAM_COMPONENTS_20, new String[]{null}, FILE_20_DEFINITIONS); + final static IFormData FILE_21_FORM_DEFINITION = new FormData( + ENT_SEAM_COMPONENTS_21, new String[]{null}, FILE_21_DEFINITIONS); + } Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2008-10-07 13:47:16 UTC (rev 10710) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2008-10-07 13:47:36 UTC (rev 10711) @@ -25,8 +25,10 @@ SeamComponentsFileFormLayoutData.FILE_11_FORM_DEFINITION, SeamComponentsFileFormLayoutData.FILE_12_FORM_DEFINITION, SeamComponentsFileFormLayoutData.FILE_20_FORM_DEFINITION, + SeamComponentsFileFormLayoutData.FILE_21_FORM_DEFINITION, SeamComponentFormLayoutData.SEAM_COMPONENT_FILE_FORM_DEFINITION, SeamComponentFormLayoutData.SEAM_COMPONENT_FILE_20_FORM_DEFINITION, + SeamComponentFormLayoutData.SEAM_COMPONENT_FILE_21_FORM_DEFINITION, SeamComponentFormLayoutData.SEAM_COMPONENT_FORM_DEFINITION, SeamComponentFormLayoutData.SEAM_COMPONENT_20_FORM_DEFINITION, SeamPropertyFormLayoutData.SEAM_PROPERTY_LIST_FORM_DEFINITION, Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/messages.properties 2008-10-07 13:47:16 UTC (rev 10710) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/messages.properties 2008-10-07 13:47:36 UTC (rev 10711) @@ -16,6 +16,8 @@ SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_EVENTS=Events SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_1_2_FILE=Seam Component 1.2 File SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_0_FILE=Seam Component 2.0 File +SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_1_FILE=Seam Component 2.1 File SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_11_FILE=Seam Components 1.1 File SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_12_FILE=Seam Components 1.2 File SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_20_FILE=Seam Components 2.0 File +SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_21_FILE=Seam Components 2.1 File