Author: scabanovich Date: 2007-08-17 06:36:39 -0400 (Fri, 17 Aug 2007) New Revision: 3207 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 Log: JBIDE-789 Recognizing components.xml 2.0 restored, now xmodel handles only components-2.0.xsd and coew-2.0.xsd. Adding unknown elements makes tree tab non-editable and showing problem. Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml 2007-08-17 10:29:03 UTC (rev 3206) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml 2007-08-17 10:36:39 UTC (rev 3207) @@ -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,FileSeamComponent12" + entities="FileSeamComponents11,FileSeamComponents12,FileSeamComponents20,FileSeamComponent12,FileSeamComponent20" 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 2007-08-17 10:29:03 UTC (rev 3206) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentFormLayoutData.java 2007-08-17 10:36:39 UTC (rev 3207) @@ -45,7 +45,7 @@ private final static IFormData[] COMPONENT_FILE_12_DEFINITIONS = new IFormData[] { new FormData( - "Seam Component File", + "Seam Component 1.2 File", SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENT_12) ), @@ -57,6 +57,23 @@ ) }; + private final static IFormData[] COMPONENT_FILE_20_DEFINITIONS = new IFormData[] { + new FormData( + "Seam Component 2.0 File", + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENT_20) + ), + SEAM_PROPERTY_LIST_DEFINITION, + new FormData( + "Advanced", + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createAdvancedFormAttributeData(ENT_SEAM_COMPONENT_20) + ) + }; + 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_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 2007-08-17 10:29:03 UTC (rev 3206) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java 2007-08-17 10:36:39 UTC (rev 3207) @@ -52,7 +52,7 @@ private final static IFormData[] FILE_12_DEFINITIONS = new IFormData[] { new FormData( - "Seam Components File", + "Seam Components 1.2 File", SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_12) ), @@ -61,10 +61,24 @@ SEAM_EVENT_LIST_DEFINITION }; + private final static IFormData[] FILE_20_DEFINITIONS = new IFormData[] { + new FormData( + "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 + }; + final static IFormData FILE_12_FORM_DEFINITION = new FormData( ENT_SEAM_COMPONENTS_12, new String[]{null}, FILE_12_DEFINITIONS); final static IFormData FILE_11_FORM_DEFINITION = new FormData( ENT_SEAM_COMPONENTS_11, new String[]{null}, FILE_11_DEFINITIONS); + final static IFormData FILE_20_FORM_DEFINITION = new FormData( + ENT_SEAM_COMPONENTS_20, new String[]{null}, FILE_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-08-17 10:29:03 UTC (rev 3206) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2007-08-17 10:36:39 UTC (rev 3207) @@ -22,9 +22,11 @@ public static String EMPTY_DESCRIPTION = ""; private final static IFormData[] FORM_LAYOUT_DEFINITIONS = new IFormData[] { + SeamComponentsFileFormLayoutData.FILE_11_FORM_DEFINITION, SeamComponentsFileFormLayoutData.FILE_12_FORM_DEFINITION, - SeamComponentsFileFormLayoutData.FILE_11_FORM_DEFINITION, + SeamComponentsFileFormLayoutData.FILE_20_FORM_DEFINITION, SeamComponentFormLayoutData.SEAM_COMPONENT_FILE_FORM_DEFINITION, + SeamComponentFormLayoutData.SEAM_COMPONENT_FILE_20_FORM_DEFINITION, SeamComponentFormLayoutData.SEAM_COMPONENT_FORM_DEFINITION, SeamPropertyFormLayoutData.SEAM_PROPERTY_LIST_FORM_DEFINITION, SeamPropertyFormLayoutData.SEAM_PROPERTY_MAP_FORM_DEFINITION,