Author: scabanovich
Date: 2010-01-19 08:18:25 -0500 (Tue, 19 Jan 2010)
New Revision: 19805
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/ESBXMLFormLayoutData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5554
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 2010-01-19
13:17:54 UTC (rev 19804)
+++
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2010-01-19
13:18:25 UTC (rev 19805)
@@ -11,7 +11,9 @@
package org.jboss.tools.esb.ui.editor.form;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.jboss.tools.common.meta.XChild;
import org.jboss.tools.common.meta.XModelEntity;
@@ -29,6 +31,20 @@
*/
public class ESBListsFormLayoutData implements ESBConstants {
+ static Map<String, IFormData> singleChildLists = new HashMap<String,
IFormData>();
+
+ static IFormData createOneAttributeSingleChildList(String header, String attrName,
String childEntity, String actionPath) {
+ IFormData result = new FormData(
+ header,
+ ModelFormLayoutData.EMPTY_DESCRIPTION,
+ new FormAttributeData[]{new FormAttributeData(attrName, 100)},
+ new String[]{childEntity},
+ FormLayoutDataUtil.createDefaultFormActionData(actionPath)
+ );
+ singleChildLists.put(childEntity, result);
+ return result;
+ }
+
static IFormData ESB_PROPERTY_LIST_DEFINITION = new FormData(
"Properties", //$NON-NLS-1$
ModelFormLayoutData.EMPTY_DESCRIPTION,
@@ -158,36 +174,20 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddRouteTo")
//$NON-NLS-1$
);
- static IFormData ESB_OBJECT_PATH_LIST_DEFINITION = new FormData(
- "Object Paths List", //$NON-NLS-1$
- ModelFormLayoutData.EMPTY_DESCRIPTION,
- new FormAttributeData[]{new FormAttributeData("esb", 100)},
- new String[]{ENT_ESB_OBJECT_PATH},
- FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddObjectPath")
//$NON-NLS-1$
+ static IFormData ESB_OBJECT_PATH_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "Object Paths List", "esb", ENT_ESB_OBJECT_PATH,
"CreateActions.AddObjectPath"
);
- static IFormData ALIAS_LIST_DEFINITION = new FormData(
- "Alias List", //$NON-NLS-1$
- ModelFormLayoutData.EMPTY_DESCRIPTION,
- new FormAttributeData[]{new FormAttributeData("name", 100)},
- new String[]{ConverterConstants.ALIAS_ENTITY},
- FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAlias")
//$NON-NLS-1$
+ static IFormData ALIAS_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "Alias List", "name", ConverterConstants.ALIAS_ENTITY,
"CreateActions.AddAlias"
);
- static IFormData ATTRIBUTE_ALIAS_LIST_DEFINITION = new FormData(
- "Attribute Alias List", //$NON-NLS-1$
- ModelFormLayoutData.EMPTY_DESCRIPTION,
- new FormAttributeData[]{new FormAttributeData("name", 100)},
- new String[]{ConverterConstants.ATTRIBUTE_ALIAS_ENTITY},
- FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAttributeAlias")
//$NON-NLS-1$
+ static IFormData ATTRIBUTE_ALIAS_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "Attribute Alias List", "name",
ConverterConstants.ATTRIBUTE_ALIAS_ENTITY, "CreateActions.AddAttributeAlias"
);
- static IFormData FIELD_ALIAS_LIST_DEFINITION = new FormData(
- "Field Alias List", //$NON-NLS-1$
- ModelFormLayoutData.EMPTY_DESCRIPTION,
- new FormAttributeData[]{new FormAttributeData("alias", 100)},
- new String[]{ConverterConstants.FIELD_ALIAS_ENTITY},
- FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFieldAlias")
//$NON-NLS-1$
+ static IFormData FIELD_ALIAS_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "Field Alias List", "alias", ConverterConstants.FIELD_ALIAS_ENTITY,
"CreateActions.AddFieldAlias"
);
static IFormData BPM_VAR_LIST_DEFINITION = new FormData(
@@ -198,12 +198,8 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddBPMVar")
//$NON-NLS-1$
);
- static IFormData NAMESPACE_LIST_DEFINITION = new FormData(
- "Namespace List", //$NON-NLS-1$
- ModelFormLayoutData.EMPTY_DESCRIPTION,
- new FormAttributeData[]{new FormAttributeData("namespace uri", 100)},
- new String[]{ConverterConstants.NAMESPACE_ENTITY},
- FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddNamespace")
//$NON-NLS-1$
+ static IFormData NAMESPACE_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "Namespace List", "namespace uri",
ConverterConstants.NAMESPACE_ENTITY, "CreateActions.AddNamespace"
);
static IFormData ROUTER_NAMESPACE_LIST_DEFINITION = new FormData(
@@ -250,4 +246,40 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyTarget")
//$NON-NLS-1$
);
+ static IFormData ESB_NOTIFY_ATTACHMENT_LIST_DEFINITION =
createOneAttributeSingleChildList(
+ "Attachments", "file", "ESBPreNotifyAttachment",
"CreateActions.CreateAttachment"
+ );
+
+ static IFormData ESB_NOTIFY_COLUMN_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "Columns", "name", "ESBPreNotifyColumn",
"CreateActions.CreateColumn"
+ );
+
+ static IFormData ESB_NOTIFY_FTP_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "FTP", "url", "ESBPreNotifyFTP",
"CreateActions.CreateFTP"
+ );
+
+ static IFormData ESB_NOTIFY_FTP_L_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "FTP", "url", "ESBPreNotifyFTPList",
"CreateActions.CreateFTPList"
+ );
+
+ static IFormData ESB_NOTIFY_FILE_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "Files", "uri", "ESBPreNotifyFile",
"CreateActions.CreateFile"
+ );
+
+ static IFormData ESB_NOTIFY_PROP_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "Message Properties", "name", "ESBPreNotifyProp",
"CreateActions.CreateProp"
+ );
+
+ static IFormData ESB_NOTIFY_QUEUE_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "Queues", "jndi name", "ESBPreNotifyQueue",
"CreateActions.CreateQueue"
+ );
+
+ static IFormData ESB_NOTIFY_TOPIC_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "Topics", "jndi name", "ESBPreNotifyTopic",
"CreateActions.CreateTopic"
+ );
+
+ static IFormData ESB_NOTIFY_TCP_LIST_DEFINITION = createOneAttributeSingleChildList(
+ "TCP", "uri", "ESBPreNotifyTCP",
"CreateActions.CreateTCP"
+ );
+
}
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 2010-01-19
13:17:54 UTC (rev 19804)
+++
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2010-01-19
13:18:25 UTC (rev 19805)
@@ -67,7 +67,7 @@
String entityName = entity.getName();
List<IFormData> list = new ArrayList<IFormData>();
IFormData g = ModelFormLayoutData.createGeneralFormData(entity);
- if(entityName.equals(ENT_ESB_ACTION)) {
+ if(entityName.equals(ENT_ESB_ACTION) || entityName.equals(ENT_ESB_ACTION_120)) {
g = new FormData("org.jboss.tools.esb.ui.editor.form.ESBActionForm");
}
if(g != null) list.add(g);
@@ -75,24 +75,9 @@
if(entity.getChild(ENT_ESB_ROUTE_TO) != null) {
list.add(ESBListsFormLayoutData.ESB_ROUTE_LIST_DEFINITION);
}
- if(entity.getChild(ENT_ESB_OBJECT_PATH) != null) {
- list.add(ESBListsFormLayoutData.ESB_OBJECT_PATH_LIST_DEFINITION);
- }
- if(entity.getChild(ConverterConstants.ALIAS_ENTITY) != null) {
- list.add(ESBListsFormLayoutData.ALIAS_LIST_DEFINITION);
- }
- if(entity.getChild(ConverterConstants.ATTRIBUTE_ALIAS_ENTITY) != null) {
- list.add(ESBListsFormLayoutData.ATTRIBUTE_ALIAS_LIST_DEFINITION);
- }
- if(entity.getChild(ConverterConstants.FIELD_ALIAS_ENTITY) != null) {
- list.add(ESBListsFormLayoutData.FIELD_ALIAS_LIST_DEFINITION);
- }
if(entity.getChild(ConverterConstants.BPM_VAR_ENTITY) != null) {
list.add(ESBListsFormLayoutData.BPM_VAR_LIST_DEFINITION);
}
- if(entity.getChild(ConverterConstants.NAMESPACE_ENTITY) != null) {
- list.add(ESBListsFormLayoutData.NAMESPACE_LIST_DEFINITION);
- }
if(entity.getChild(ConverterConstants.ROUTER_NAMESPACE_ENTITY) != null) {
list.add(ESBListsFormLayoutData.ROUTER_NAMESPACE_LIST_DEFINITION);
}
@@ -134,6 +119,12 @@
if(entity.getChild(ENT_ESB_BUS) != null) {
list.add(ESBListsFormLayoutData.ESB_BUS_LIST_DEFINITION);
}
+ for (int i = 0; i < entity.getChildren().length; i++) {
+ String ce = entity.getChildren()[i].getName();
+ if(ESBListsFormLayoutData.singleChildLists.containsKey(ce)) {
+ list.add(ESBListsFormLayoutData.singleChildLists.get(ce));
+ }
+ }
IFormData a = ModelFormLayoutData.createAdvancedFormData(entityName);
if(a != null) list.add(a);
IFormData[] ds = list.toArray(new IFormData[0]);