Author: scabanovich Date: 2008-02-08 09:27:32 -0500 (Fri, 08 Feb 2008) New Revision: 6210 Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/resources/meta/meta.meta trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaFormLayoutData.java Log: JBIDE-1670 Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/resources/meta/meta.meta =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/resources/meta/meta.meta 2008-02-08 14:26:35 UTC (rev 6209) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/resources/meta/meta.meta 2008-02-08 14:27:32 UTC (rev 6210) @@ -278,6 +278,51 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Meta%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.common.meta.ui.form.MetaFormLayoutData" + XMLSUBPATH="XActionItemReference" name="MetaActionItemReference"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.meta.action.list" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="action item reference" loader="ElementType" name="element type"> + <Constraint loader="List"> + <value name="attribute"/> + </Constraint> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general" name="entity" xmlname="entity"> + <Constraint loader="ListString"/> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="path" xmlname="path"/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy attribute" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut attribute" kind="action" name="Cut"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.empty" displayName="Move" kind="action" name="Move"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete action item" 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> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.common.meta.ui.editor.MetaElementOrderedImpl" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.common.meta.ui.form.MetaFormLayoutData" @@ -285,6 +330,7 @@ <XChildrenEntities> <XChildEntity name="MetaActionList"/> <XChildEntity name="MetaAction"/> + <XChildEntity name="MetaActionItemReference"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -337,6 +383,15 @@ <AttributeData AttributeName="name"/> </EntityData> </XActionItem> + <XActionItem HandlerClassName="%Create%" + ICON="action.new.meta.action" WizardClassName="%Default%" + displayName="Create an item reference..." kind="action" name="CreateMetaActionItemRef"> + <EntityData EntityName="MetaActionItemReference"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="entity"/> + <AttributeData AttributeName="path"/> + </EntityData> + </XActionItem> </XActionItem> <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaFormLayoutData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaFormLayoutData.java 2008-02-08 14:26:35 UTC (rev 6209) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaFormLayoutData.java 2008-02-08 14:27:32 UTC (rev 6210) @@ -52,7 +52,11 @@ public MetaFormLayoutData() {} public IFormData getFormData(String entityName) { - return (IFormData)FORM_LAYOUT_DEFINITION_MAP.get(entityName); + IFormData data = (IFormData)FORM_LAYOUT_DEFINITION_MAP.get(entityName); + if(data == null) { + data = ModelFormLayoutData.getInstance().getFormData(entityName); + } + return data; } }