Author: scabanovich Date: 2009-04-03 10:49:38 -0400 (Fri, 03 Apr 2009) New Revision: 14499 Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java Log: JBIDE-3847 Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2009-04-03 14:48:05 UTC (rev 14498) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2009-04-03 14:49:38 UTC (rev 14499) @@ -26,7 +26,7 @@ <xmlEditor class="org.jboss.tools.jst.web.ui.editors.WebCompoundEditor" contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" - entities="FileESB101" + entities="FileESB101,FileESB110" icon="images/xstudio/editors/esb.gif" name="ESB"> </xmlEditor> Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2009-04-03 14:48:05 UTC (rev 14498) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2009-04-03 14:49:38 UTC (rev 14499) @@ -54,8 +54,8 @@ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyListener") //$NON-NLS-1$ ); - static String[] getActionEntities() { - XModelEntity entity = XModelMetaDataImpl.getInstance().getEntity(ENT_ESB_ACTIONS); + static String[] getActionEntities(String actionsEntity) { + XModelEntity entity = XModelMetaDataImpl.getInstance().getEntity(actionsEntity); if(entity == null) { return new String[]{ENT_ESB_ACTION}; } @@ -66,14 +66,22 @@ } return list.toArray(new String[0]); } - static IFormData ESB_ACTION_LIST_DEFINITION = new FormData( + static IFormData ESB_ACTION_101_LIST_DEFINITION = new FormData( "Actions", //$NON-NLS-1$ ModelFormLayoutData.EMPTY_DESCRIPTION, new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)}, - getActionEntities(), + getActionEntities(ENT_ESB_ACTIONS_101), FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyAction") //$NON-NLS-1$ ); + static IFormData ESB_ACTION_110_LIST_DEFINITION = new FormData( + "Actions", //$NON-NLS-1$ + ModelFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)}, + getActionEntities(ENT_ESB_ACTIONS_110), + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyAction") //$NON-NLS-1$ + ); + static IFormData ESB_ACTION_SUB_LIST_DEFINITION = new FormData( "Actions", //$NON-NLS-1$ ModelFormLayoutData.EMPTY_DESCRIPTION, @@ -87,7 +95,7 @@ "Services", //$NON-NLS-1$ ModelFormLayoutData.EMPTY_DESCRIPTION, new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)}, - new String[]{ENT_ESB_SERVICE}, + new String[]{ENT_ESB_SERVICE_101, ENT_ESB_SERVICE_110}, FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddService") //$NON-NLS-1$ ); @@ -96,7 +104,7 @@ ModelFormLayoutData.EMPTY_DESCRIPTION, "Services", //$NON-NLS-1$ new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)}, - new String[]{ENT_ESB_SERVICE}, + new String[]{ENT_ESB_SERVICE_101, ENT_ESB_SERVICE_110}, FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddService") //$NON-NLS-1$ ); Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2009-04-03 14:48:05 UTC (rev 14498) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2009-04-03 14:49:38 UTC (rev 14499) @@ -75,18 +75,20 @@ //do nothing; when specific children exist use specific forms } else if(entity.getChild(ENT_ESB_PROPERTY) != null) { list.add(ESBListsFormLayoutData.ESB_PROPERTY_LIST_DEFINITION); - } else if(entityName.equals(ENT_ESB_LISTENERS)) { + } else if(entityName.startsWith(ENT_ESB_LISTENERS)) { list.add(ESBListsFormLayoutData.ESB_LISTENER_LIST_DEFINITION); - } else if(entityName.equals(ENT_ESB_ACTIONS)) { - list.add(ESBListsFormLayoutData.ESB_ACTION_LIST_DEFINITION); - } else if(entityName.equals(ENT_ESB_SERVICES)) { + } else if(entityName.equals(ENT_ESB_ACTIONS_101)) { + list.add(ESBListsFormLayoutData.ESB_ACTION_101_LIST_DEFINITION); + } else if(entityName.equals(ENT_ESB_ACTIONS_110)) { + list.add(ESBListsFormLayoutData.ESB_ACTION_110_LIST_DEFINITION); + } else if(entityName.startsWith(ENT_ESB_SERVICES)) { list.add(ESBListsFormLayoutData.ESB_SERVICE_LIST_DEFINITION); - } else if(entityName.equals(ENT_ESB_SERVICE)) { + } else if(entityName.startsWith(ENT_ESB_SERVICE)) { list.add(ESBListsFormLayoutData.ESB_LISTENER_SUB_LIST_DEFINITION); list.add(ESBListsFormLayoutData.ESB_ACTION_SUB_LIST_DEFINITION); - } else if(entityName.equals(ENT_ESB_PROVIDERS)) { + } else if(entityName.startsWith(ENT_ESB_PROVIDERS)) { list.add(ESBListsFormLayoutData.ESB_PROVIDER_LIST_DEFINITION); - } else if(entityName.equals(ENT_ESB_FILE_101)) { + } else if(entityName.startsWith(ENT_ESB_FILE)) { list.add(ESBListsFormLayoutData.ESB_PROVIDER_SUB_LIST_DEFINITION); list.add(ESBListsFormLayoutData.ESB_SERVICE_SUB_LIST_DEFINITION); } else if(entityName.equals(ENT_ESB_PROPERTY)) {