Author: scabanovich Date: 2010-09-15 11:28:30 -0400 (Wed, 15 Sep 2010) New Revision: 24942 Removed: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/WeldIncludeObjectImpl.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-weld.meta trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansLoaderUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java Log: JBIDE-6998 https://jira.jboss.org/browse/JBIDE-6998 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml 2010-09-15 15:27:26 UTC (rev 24941) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml 2010-09-15 15:28:30 UTC (rev 24942) @@ -20,8 +20,6 @@ class="org.jboss.tools.cdi.xml.beans.model.CDIBeansFileLoader"/> <xclass id="org.jboss.tools.cdi.xml.beans.model.CDIBeansEntityRecognizer" class="org.jboss.tools.cdi.xml.beans.model.CDIBeansEntityRecognizer"/> - <xclass id="org.jboss.tools.cdi.xml.beans.model.WeldIncludeObjectImpl" - class="org.jboss.tools.cdi.xml.beans.model.WeldIncludeObjectImpl"/> <xclass id="org.jboss.tools.cdi.xml.beans.model.handlers.AddIncludeSupport" class="org.jboss.tools.cdi.xml.beans.model.handlers.AddIncludeSupport"/> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-weld.meta =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-weld.meta 2010-09-15 15:27:26 UTC (rev 24941) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-weld.meta 2010-09-15 15:28:30 UTC (rev 24942) @@ -70,7 +70,7 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%" + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> @@ -88,8 +88,7 @@ </XActionItem> <XDependencies/> </XModelEntity> - <XModelEntity - ImplementingClass="org.jboss.tools.cdi.xml.beans.model.WeldIncludeObjectImpl" + <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="weld:exclude" name="CDIWeldExclude"> <XChildrenEntities> @@ -105,9 +104,14 @@ <XModelAttribute default="exclude" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="name/pattern" visibility="false"/> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> - <XModelAttribute PROPERTIES="id=true;category=general" name="pattern" xmlname="pattern"/> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name|pattern"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="is regular expression"> + <Constraint loader="List"> + <value name="false"/> + <value name="true"/> + </Constraint> + <Editor name="CheckBox"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -135,7 +139,7 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%" + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> @@ -153,8 +157,7 @@ </XActionItem> <XDependencies/> </XModelEntity> - <XModelEntity - ImplementingClass="org.jboss.tools.cdi.xml.beans.model.WeldIncludeObjectImpl" + <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="weld:include" name="CDIWeldInclude"> <XChildrenEntities> @@ -170,9 +173,14 @@ <XModelAttribute default="include" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="name/pattern" visibility="false"/> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> - <XModelAttribute PROPERTIES="id=true;category=general" name="pattern" xmlname="pattern"/> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name|pattern"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="is regular expression"> + <Constraint loader="List"> + <value name="false"/> + <value name="true"/> + </Constraint> + <Editor name="CheckBox"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -200,7 +208,7 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%" + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> @@ -234,58 +242,16 @@ </Constraint> <Editor name="RadioArray"/> </XModelAttribute> - <XModelAttribute name="name/pattern"/> - <XModelAttribute PROPERTIES="id=true;category=general" - default="false" name="is regular expression"> + <XModelAttribute name="name"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="is regular expression"> <Constraint loader="List"> <value name="false"/> <value name="true"/> </Constraint> <Editor name="CheckBox"/> </XModelAttribute> - <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Editor name="Note"/> - </XModelAttribute> </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Add Class Available" kind="action" name="AddClass"> - <EntityData EntityName="CDIWeldClass"> - <AttributeData AttributeName="name"/> - </EntityData> - </XActionItem> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Add System Property" kind="action" name="AddProperty"> - <EntityData EntityName="CDIWeldProperty"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="value" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%" - ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> - </XActionItem> + <XActionItem kind="list"/> <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" @@ -331,7 +297,7 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%" + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> @@ -380,7 +346,7 @@ displayName="Add Include/Exclude" kind="action" name="AddItem"> <EntityData EntityName="CDIWeldIncludeWizard"> <AttributeData AttributeName="kind" Mandatory="no"/> - <AttributeData AttributeName="name/pattern"/> + <AttributeData AttributeName="name"/> <AttributeData AttributeName="is regular expression" Mandatory="no"/> </EntityData> </XActionItem> @@ -393,6 +359,8 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansLoaderUtil.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansLoaderUtil.java 2010-09-15 15:27:26 UTC (rev 24941) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansLoaderUtil.java 2010-09-15 15:28:30 UTC (rev 24942) @@ -57,4 +57,40 @@ return false; } + public void loadAttributes(Element element, XModelObject o) { + super.loadAttributes(element, o); + String entity = o.getModelEntity().getName(); + if("CDIWeldInclude".equals(entity) || "CDIWeldExclude".equals(entity)) { + String namePattern = ""; + String name = element.getAttribute("name"); + if(name != null && name.length() > 0) { + namePattern = name; + o.setAttributeValue("is regular expression", "false"); + } + String pattern = element.getAttribute("pattern"); + if(pattern != null && pattern.length() > 0) { + namePattern = pattern; + o.setAttributeValue("is regular expression", "true"); + } + o.setAttributeValue("name", namePattern); + } + } + + public void saveAttribute(Element element, String xmlname, String value) { + int i = xmlname.indexOf('|'); + if(i >= 0) return; + super.saveAttribute(element, xmlname, value); + } + + public void saveAttributes(Element element, XModelObject o) { + super.saveAttributes(element, o); + String entity = o.getModelEntity().getName(); + if("CDIWeldInclude".equals(entity) || "CDIWeldExclude".equals(entity)) { + boolean isRegEx = "true".equals(o.getAttributeValue("is regular expression")); + String attr = isRegEx ? "pattern" : "name"; + String name = o.getAttributeValue("name"); + element.setAttribute(attr, name); + } + } + } Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/WeldIncludeObjectImpl.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/WeldIncludeObjectImpl.java 2010-09-15 15:27:26 UTC (rev 24941) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/WeldIncludeObjectImpl.java 2010-09-15 15:28:30 UTC (rev 24942) @@ -1,22 +0,0 @@ -package org.jboss.tools.cdi.xml.beans.model; - -import org.jboss.tools.common.model.impl.CustomizedObjectImpl; - -public class WeldIncludeObjectImpl extends CustomizedObjectImpl { - private static final long serialVersionUID = 1L; - - public String name() { - String name = getAttributeValue("name"); - if(name == null || name.length() == 0) { - name = getAttributeValue("pattern"); - } - return name; - } - - public String getAttributeValue(String name) { - if("name/pattern".equals(name)) { - return name(); - } - return super.getAttributeValue(name); - } -} Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java 2010-09-15 15:27:26 UTC (rev 24941) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java 2010-09-15 15:28:30 UTC (rev 24942) @@ -31,13 +31,8 @@ boolean include = "include".equals(p0.getProperty("kind")); String entity = getObjectEntity(include); - XModelObject object = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, null); + XModelObject object = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, p0); - boolean isRegEx = "true".equals(p0.getProperty("is regular expression")); - String nameValue = p0.getProperty("name/pattern"); - String nameAttr = isRegEx ? "pattern" : "name"; - object.setAttributeValue(nameAttr, nameValue); - DefaultCreateHandler.addCreatedObject(getTarget(), object, FindObjectHelper.EVERY_WHERE); } @@ -53,21 +48,21 @@ return null; } - protected DefaultWizardDataValidator validator = new Validator(); - - public WizardDataValidator getValidator(int step) { - validator.setSupport(this, step); - return validator; - } - - class Validator extends DefaultWizardDataValidator { - public void validate(Properties data) { - boolean isRegEx = "true".equals(data.getProperty("is regular expression")); - String nameValue = data.getProperty("name/pattern"); - String nameAttr = isRegEx ? "pattern" : "name"; - data.setProperty(nameAttr, nameValue); - super.validate(data); - } - - } +// protected DefaultWizardDataValidator validator = new Validator(); +// +// public WizardDataValidator getValidator(int step) { +// validator.setSupport(this, step); +// return validator; +// } +// +// class Validator extends DefaultWizardDataValidator { +// public void validate(Properties data) { +// boolean isRegEx = "true".equals(data.getProperty("is regular expression")); +// String nameValue = data.getProperty("name/pattern"); +// String nameAttr = isRegEx ? "pattern" : "name"; +// data.setProperty(nameAttr, nameValue); +// super.validate(data); +// } +// +// } }