Author: scabanovich Date: 2010-09-14 11:29:43 -0400 (Tue, 14 Sep 2010) New Revision: 24918 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java Log: https://jira.jboss.org/browse/JBIDE-6998 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java 2010-09-14 15:27:36 UTC (rev 24917) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java 2010-09-14 15:29:43 UTC (rev 24918) @@ -59,6 +59,21 @@ ), }; + static IFormData getIncludeExcludeDefinition(String title) { + return new FormData( + title, + CDIXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData("element type", 20, "Kind"), new FormAttributeData("name/pattern", 80)}, //$NON-NLS-1$ + new String[]{"CDIWeldInclude", "CDIWeldExclude"}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddItem") //$NON-NLS-1$ + ); + } + + private final static IFormData[] WELD_SCAN_DEFINITIONS = new IFormData[] { + getIncludeExcludeDefinition("Include/Exclude") //$NON-NLS-1$ + }; + + final static IFormData FILE_20_FORM_DEFINITION = new FormData( ENT_CDI_BEANS, new String[]{null}, FILE_10_DEFINITIONS); @@ -71,4 +86,7 @@ final static IFormData ALTERNATIVES_DEFINITION = new FormData( ENT_ALTERNATIVES, new String[]{null}, ALTERNATIVES_DEFINITIONS); + final static IFormData WELD_SCAN_DEFINITION = new FormData( + "CDIWeldScan", new String[]{null}, WELD_SCAN_DEFINITIONS); + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java 2010-09-14 15:27:36 UTC (rev 24917) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java 2010-09-14 15:29:43 UTC (rev 24918) @@ -25,7 +25,9 @@ CDIBeansFileFormLayoutData.FILE_20_FORM_DEFINITION, CDIBeansFileFormLayoutData.DECORATORS_DEFINITION, CDIBeansFileFormLayoutData.INTERCEPTORS_DEFINITION, - CDIBeansFileFormLayoutData.ALTERNATIVES_DEFINITION + CDIBeansFileFormLayoutData.ALTERNATIVES_DEFINITION, + + CDIBeansFileFormLayoutData.WELD_SCAN_DEFINITION }; private static Map<String,IFormData> FORM_LAYOUT_DEFINITION_MAP = Collections.synchronizedMap(new ArrayToMap(FORM_LAYOUT_DEFINITIONS));