Author: scabanovich Date: 2009-08-28 09:03:28 -0400 (Fri, 28 Aug 2009) New Revision: 17348 Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentFormLayoutData.java branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-4829 merge from 3.1.0 Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml =================================================================== --- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml 2009-08-28 12:55:42 UTC (rev 17347) +++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml 2009-08-28 13:03:28 UTC (rev 17348) @@ -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,FileSeamComponents21,FileSeamComponent12,FileSeamComponent20,FileSeamComponent21" + entities="FileSeamComponents11,FileSeamComponents12,FileSeamComponents20,FileSeamComponents21,FileSeamComponents22,FileSeamComponent12,FileSeamComponent20,FileSeamComponent21,FileSeamComponent22" icon="images/xstudio/editors/seam-components.gif" name="%editors.spring-beans.name"> </xmlEditor> Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentFormLayoutData.java =================================================================== --- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentFormLayoutData.java 2009-08-28 12:55:42 UTC (rev 17347) +++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentFormLayoutData.java 2009-08-28 13:03:28 UTC (rev 17348) @@ -103,6 +103,20 @@ ) }; + private final static IFormData[] COMPONENT_FILE_22_DEFINITIONS = new IFormData[] { + new FormData( + SeamXMLUIMessages.getString("SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_2_FILE"), //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENT_FILE_22) + ), + 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_22) + ) + }; + final static IFormData SEAM_COMPONENT_FILE_FORM_DEFINITION = new FormData( ENT_SEAM_COMPONENT_12, new String[]{null}, COMPONENT_FILE_12_DEFINITIONS); @@ -112,4 +126,8 @@ final static IFormData SEAM_COMPONENT_FILE_21_FORM_DEFINITION = new FormData( ENT_SEAM_COMPONENT_FILE_21, new String[]{null}, COMPONENT_FILE_21_DEFINITIONS); + + final static IFormData SEAM_COMPONENT_FILE_22_FORM_DEFINITION = new FormData( + ENT_SEAM_COMPONENT_FILE_22, new String[]{null}, COMPONENT_FILE_22_DEFINITIONS); + } Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java =================================================================== --- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java 2009-08-28 12:55:42 UTC (rev 17347) +++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java 2009-08-28 13:03:28 UTC (rev 17348) @@ -72,7 +72,7 @@ private final static IFormData[] FILE_12_DEFINITIONS = new IFormData[] { new FormData( - "Seam Components 1.2 File", + "Seam Components 1.2 File", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_12) ), @@ -83,7 +83,7 @@ private final static IFormData[] FILE_20_DEFINITIONS = new IFormData[] { new FormData( - "Seam Components 2.0 File", + "Seam Components 2.0 File", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_20) ), @@ -95,7 +95,7 @@ private final static IFormData[] FILE_21_DEFINITIONS = new IFormData[] { new FormData( - "Seam Components 2.1 File", + "Seam Components 2.1 File", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_21) ), @@ -105,6 +105,18 @@ SEAM_IMPORT_LIST_DEFINITION }; + private final static IFormData[] FILE_22_DEFINITIONS = new IFormData[] { + new FormData( + "Seam Components 2.2 File", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_22) + ), + 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); @@ -117,4 +129,6 @@ final static IFormData FILE_21_FORM_DEFINITION = new FormData( ENT_SEAM_COMPONENTS_21, new String[]{null}, FILE_21_DEFINITIONS); + final static IFormData FILE_22_FORM_DEFINITION = new FormData( + ENT_SEAM_COMPONENTS_22, new String[]{null}, FILE_22_DEFINITIONS); } Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java =================================================================== --- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2009-08-28 12:55:42 UTC (rev 17347) +++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2009-08-28 13:03:28 UTC (rev 17348) @@ -26,9 +26,11 @@ SeamComponentsFileFormLayoutData.FILE_12_FORM_DEFINITION, SeamComponentsFileFormLayoutData.FILE_20_FORM_DEFINITION, SeamComponentsFileFormLayoutData.FILE_21_FORM_DEFINITION, + SeamComponentsFileFormLayoutData.FILE_22_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_FILE_22_FORM_DEFINITION, SeamComponentFormLayoutData.SEAM_COMPONENT_FORM_DEFINITION, SeamComponentFormLayoutData.SEAM_COMPONENT_20_FORM_DEFINITION, SeamPropertyFormLayoutData.SEAM_PROPERTY_LIST_FORM_DEFINITION, Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/messages.properties =================================================================== --- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/messages.properties 2009-08-28 12:55:42 UTC (rev 17347) +++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/messages.properties 2009-08-28 13:03:28 UTC (rev 17348) @@ -17,7 +17,9 @@ 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_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_2_FILE=Seam Component 2.2 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 +SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_22_FILE=Seam Components 2.2 File