Author: scabanovich Date: 2008-04-03 11:33:03 -0400 (Thu, 03 Apr 2008) New Revision: 7301 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/SeamComponentsFileFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java Log: JBIDE-1749 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-04-03 15:32:49 UTC (rev 7300) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentFormLayoutData.java 2008-04-03 15:33:03 UTC (rev 7301) @@ -41,6 +41,23 @@ ) }; + private final static IFormData[] SEAM_COMPONENT_20_DEFINITIONS = new IFormData[] { + new FormData( + SeamXMLUIMessages.getString("SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT"), //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENT_20) + ), + 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_20) + ) + }; + + final static IFormData SEAM_COMPONENT_20_FORM_DEFINITION = new FormData( + ENT_SEAM_COMPONENT_20, new String[]{null}, SEAM_COMPONENT_20_DEFINITIONS); + final static IFormData SEAM_COMPONENT_FORM_DEFINITION = new FormData( ENT_SEAM_COMPONENT, new String[]{null}, SEAM_COMPONENT_DEFINITIONS); @@ -62,13 +79,13 @@ new FormData( SeamXMLUIMessages.getString("SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_0_FILE"), //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, - FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENT_20) + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENT_FILE_20) ), 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_20) + FormLayoutDataUtil.createAdvancedFormAttributeData(ENT_SEAM_COMPONENT_FILE_20) ) }; @@ -76,5 +93,5 @@ 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_20, new String[]{null}, COMPONENT_FILE_20_DEFINITIONS); + ENT_SEAM_COMPONENT_FILE_20, new String[]{null}, COMPONENT_FILE_20_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-04-03 15:32:49 UTC (rev 7300) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java 2008-04-03 15:33:03 UTC (rev 7301) @@ -23,6 +23,14 @@ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddComponent") //$NON-NLS-1$ ); + static IFormData SEAM_COMPONENT_20_LIST_DEFINITION = new FormData( + "Components", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 40), new FormAttributeData("class", 60)}, //$NON-NLS-1$ + new String[]{ENT_SEAM_COMPONENT_20}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddComponent") //$NON-NLS-1$ + ); + static IFormData getFactoryList(String entity) { return new FormData( "Factories", //$NON-NLS-1$ @@ -79,7 +87,7 @@ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_20) ), - SEAM_COMPONENT_LIST_DEFINITION, + SEAM_COMPONENT_20_LIST_DEFINITION, getFactoryList(ENT_SEAM_FACTORY_20), getEventList(ENT_SEAM_EVENT_20), SEAM_IMPORT_LIST_DEFINITION 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-04-03 15:32:49 UTC (rev 7300) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2008-04-03 15:33:03 UTC (rev 7301) @@ -28,6 +28,7 @@ SeamComponentFormLayoutData.SEAM_COMPONENT_FILE_FORM_DEFINITION, SeamComponentFormLayoutData.SEAM_COMPONENT_FILE_20_FORM_DEFINITION, SeamComponentFormLayoutData.SEAM_COMPONENT_FORM_DEFINITION, + SeamComponentFormLayoutData.SEAM_COMPONENT_20_FORM_DEFINITION, SeamPropertyFormLayoutData.SEAM_PROPERTY_LIST_FORM_DEFINITION, SeamPropertyFormLayoutData.SEAM_PROPERTY_MAP_FORM_DEFINITION, SeamFactoryFormLayoutData.SEAM_FACTORY_FORM_DEFINITION,