Author: scabanovich Date: 2007-10-05 11:15:29 -0400 (Fri, 05 Oct 2007) New Revision: 4034 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/SeamEventFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java Log: JBIDE-1029 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 2007-10-05 15:04:11 UTC (rev 4033) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java 2007-10-05 15:15:29 UTC (rev 4034) @@ -12,65 +12,77 @@ import org.jboss.tools.common.model.ui.forms.*; import org.jboss.tools.seam.xml.components.model.SeamComponentConstants; -import org.jboss.tools.seam.xml.ui.SeamXMLUIMessages; public class SeamComponentsFileFormLayoutData implements SeamComponentConstants { static IFormData SEAM_COMPONENT_LIST_DEFINITION = new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_COMPONENTS"), //$NON-NLS-1$ + "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}, FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddComponent") //$NON-NLS-1$ ); - static IFormData SEAM_FACTORY_LIST_DEFINITION = new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_FACTORIES"), //$NON-NLS-1$ + static IFormData getFactoryList(String entity) { + return new FormData( + "Factories", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)}, + new String[]{entity}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFactory") //$NON-NLS-1$ + ); + } + + static IFormData getEventList(String entity) { + return new FormData( + "Events", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_TYPE, 100)}, + new String[]{entity}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddEvent") //$NON-NLS-1$ + ); + } + + static IFormData SEAM_IMPORT_LIST_DEFINITION = new FormData( + "Imports", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, - new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)}, - new String[]{ENT_SEAM_FACTORY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFactory") //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("import", 100)}, //$NON-NLS-1$ + new String[]{ENT_SEAM_IMPORT}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddImport") //$NON-NLS-1$ ); - static IFormData SEAM_EVENT_LIST_DEFINITION = new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_EVENTS"), //$NON-NLS-1$ - SeamXMLFormLayoutData.EMPTY_DESCRIPTION, - new FormAttributeData[]{new FormAttributeData(ATTR_TYPE, 100)}, - new String[]{ENT_SEAM_EVENT}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddEvent") //$NON-NLS-1$ - ); - private final static IFormData[] FILE_11_DEFINITIONS = new IFormData[] { new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_11_FILE"), //$NON-NLS-1$ + "Seam Components 1.1 File", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_11) ), SEAM_COMPONENT_LIST_DEFINITION, - SEAM_FACTORY_LIST_DEFINITION, - SEAM_EVENT_LIST_DEFINITION + getFactoryList(ENT_SEAM_FACTORY), + getEventList(ENT_SEAM_EVENT) }; private final static IFormData[] FILE_12_DEFINITIONS = new IFormData[] { new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_12_FILE"), //$NON-NLS-1$ + "Seam Components 1.2 File", SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_12) ), SEAM_COMPONENT_LIST_DEFINITION, - SEAM_FACTORY_LIST_DEFINITION, - SEAM_EVENT_LIST_DEFINITION + getFactoryList(ENT_SEAM_FACTORY), + getEventList(ENT_SEAM_EVENT) }; private final static IFormData[] FILE_20_DEFINITIONS = new IFormData[] { new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_20_FILE"), //$NON-NLS-1$ + "Seam Components 2.0 File", SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_20) ), SEAM_COMPONENT_LIST_DEFINITION, - SEAM_FACTORY_LIST_DEFINITION, - SEAM_EVENT_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( Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamEventFormLayoutData.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamEventFormLayoutData.java 2007-10-05 15:04:11 UTC (rev 4033) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamEventFormLayoutData.java 2007-10-05 15:15:29 UTC (rev 4034) @@ -15,39 +15,69 @@ import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil; import org.jboss.tools.common.model.ui.forms.IFormData; import org.jboss.tools.seam.xml.components.model.SeamComponentConstants; -import org.jboss.tools.seam.xml.ui.SeamXMLUIMessages; public class SeamEventFormLayoutData implements SeamComponentConstants { static IFormData SEAM_ACTION_LIST_DEFINITION = new FormData( - SeamXMLUIMessages.getString("SEAM_EVENT_FORM_LAYOUT_DATA_ACTIONS"), //$NON-NLS-1$ - SeamXMLFormLayoutData.EMPTY_DESCRIPTION, - new FormAttributeData[]{new FormAttributeData(ATTR_EXPR, 100)}, - new String[]{ENT_SEAM_ACTION}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAction") //$NON-NLS-1$ - ); + "Actions", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_EXPR, 100)}, + new String[]{ENT_SEAM_ACTION}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAction") //$NON-NLS-1$ + ); + static IFormData SEAM_ACTION_20_LIST_DEFINITION = new FormData( + "Actions", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_EXEC, 100)}, + new String[]{ENT_SEAM_ACTION_20}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAction") //$NON-NLS-1$ + ); + private final static IFormData[] SEAM_EVENT_DEFINITIONS = new IFormData[] { new FormData( - SeamXMLUIMessages.getString("SEAM_EVENT_FORM_LAYOUT_DATA_SEAM_EVENT"), //$NON-NLS-1$ + "Seam Event", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_EVENT) ), SEAM_ACTION_LIST_DEFINITION }; + private final static IFormData[] SEAM_EVENT_20_DEFINITIONS = new IFormData[] { + new FormData( + "Seam Event", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_EVENT_20) + ), + SEAM_ACTION_20_LIST_DEFINITION + }; + private final static IFormData[] SEAM_ACTION_DEFINITIONS = new IFormData[] { new FormData( - SeamXMLUIMessages.getString("SEAM_EVENT_FORM_LAYOUT_DATA_SEAM_ACTION"), //$NON-NLS-1$ + "Seam Action", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_ACTION) ) }; + private final static IFormData[] SEAM_ACTION_20_DEFINITIONS = new IFormData[] { + new FormData( + "Seam Action", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_ACTION_20) + ) + }; + final static IFormData SEAM_EVENT_FORM_DEFINITION = new FormData( ENT_SEAM_EVENT, new String[]{null}, SEAM_EVENT_DEFINITIONS); final static IFormData SEAM_ACTION_FORM_DEFINITION = new FormData( ENT_SEAM_ACTION, new String[]{null}, SEAM_ACTION_DEFINITIONS); + final static IFormData SEAM_EVENT_20_FORM_DEFINITION = new FormData( + ENT_SEAM_EVENT_20, new String[]{null}, SEAM_EVENT_20_DEFINITIONS); + + final static IFormData SEAM_ACTION_20_FORM_DEFINITION = new FormData( + ENT_SEAM_ACTION_20, new String[]{null}, SEAM_ACTION_20_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 2007-10-05 15:04:11 UTC (rev 4033) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2007-10-05 15:15:29 UTC (rev 4034) @@ -32,7 +32,9 @@ SeamPropertyFormLayoutData.SEAM_PROPERTY_MAP_FORM_DEFINITION, SeamFactoryFormLayoutData.SEAM_FACTORY_FORM_DEFINITION, SeamEventFormLayoutData.SEAM_EVENT_FORM_DEFINITION, - SeamEventFormLayoutData.SEAM_ACTION_FORM_DEFINITION, + SeamEventFormLayoutData.SEAM_ACTION_FORM_DEFINITION, + SeamEventFormLayoutData.SEAM_EVENT_20_FORM_DEFINITION, + SeamEventFormLayoutData.SEAM_ACTION_20_FORM_DEFINITION, };