JBoss Tools SVN: r19808 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/help and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-19 09:38:13 -0500 (Tue, 19 Jan 2010)
New Revision: 19808
Added:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddRouteToForCBRHandler.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5653
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-01-19 14:16:00 UTC (rev 19807)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-01-19 14:38:13 UTC (rev 19808)
@@ -51,6 +51,8 @@
class="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddJBRListerer12Handler"
class="org.jboss.tools.esb.core.model.handlers.AddJBRListerer12Handler"/>
+ <xclass id="org.jboss.tools.esb.core.model.handlers.AddRouteToForCBRHandler"
+ class="org.jboss.tools.esb.core.model.handlers.AddRouteToForCBRHandler"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.ESBDefaultVersionResolver"
class="org.jboss.tools.esb.core.model.handlers.ESBDefaultVersionResolver"/>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-01-19 14:16:00 UTC (rev 19807)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-01-19 14:38:13 UTC (rev 19808)
@@ -404,8 +404,14 @@
ESBActivationConfig101_Properties.Title=ESB Activation Config
ESB.AddRouteTo.WindowTitle=Add Route To
-ESB.AddRouteTo..Title=ESB Route To
+ESB.AddRouteTo.Title=ESB Route To
+ESB.AddRouteToWithoutRuleSet.WindowTitle=Add Route To
+ESB.AddRouteToWithoutRuleSet.Title=ESB Route To
+
+ESB.AddRouteToWithRuleSet.WindowTitle=Add Route To
+ESB.AddRouteToWithRuleSet.Title=ESB Route To
+
# Actions extension
ESBPreActionBusinessRulesProcessor101_AddObjectPath.WindowTitle=Add Object Path
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-19 14:16:00 UTC (rev 19807)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-19 14:38:13 UTC (rev 19808)
@@ -569,23 +569,37 @@
PROPERTIES="actionpath=Open;attribute=rule language"
displayName="Open Rule Language" kind="action" name="OpenRuleLanguage"/>
<XActionItem kind="list" name="CreateActions">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.AddRouteToForCBRHandler"
+ ICON="action.empty" displayName="Add Route To..." kind="action" name="AddRouteTo"/>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Add Route To..." kind="action" name="AddRouteTo">
- <EntityData EntityName="ESBPreRouteTo">
- <AttributeData AttributeName="destination name"/>
- <AttributeData AttributeName="service category"/>
- <AttributeData AttributeName="service name" Mandatory="no"/>
- </EntityData>
- </XActionItem>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Add Namespace..." kind="action" name="AddNamespace">
<EntityData EntityName="ESBPreRouterNamespace">
<AttributeData AttributeName="prefix"/>
<AttributeData AttributeName="uri"/>
</EntityData>
</XActionItem>
+ <XActionItem HIDE="always" HandlerClassName="%Create%"
+ ICON="action.empty" PROPERTIES="validator.add=true"
+ WizardClassName="%Default%" displayName="Add Route To..."
+ kind="action" name="AddRouteToWithRuleSet">
+ <EntityData EntityName="ESBPreRouteTo">
+ <AttributeData AttributeName="destination name" Mandatory="no"/>
+ <AttributeData AttributeName="service category"/>
+ <AttributeData AttributeName="service name"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HIDE="always" HandlerClassName="%Create%"
+ ICON="action.empty" PROPERTIES="validator.add=true"
+ WizardClassName="%Default%" displayName="Add Route To..."
+ kind="action" name="AddRouteToWithoutRuleSet">
+ <EntityData EntityName="ESBPreRouteTo">
+ <AttributeData AttributeName="service category"/>
+ <AttributeData AttributeName="service name"/>
+ <AttributeData AttributeName="expression" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
<XActionItemReference entity="ESBProperty" name="CopyActions"/>
<XActionItemReference entity="ESBProperty" name="DeleteActions"/>
Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddRouteToForCBRHandler.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddRouteToForCBRHandler.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddRouteToForCBRHandler.java 2010-01-19 14:38:13 UTC (rev 19808)
@@ -0,0 +1,31 @@
+package org.jboss.tools.esb.core.model.handlers;
+
+import java.util.Properties;
+
+import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.meta.action.impl.AbstractHandler;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.esb.core.model.impl.ContentBasedRouter;
+
+public class AddRouteToForCBRHandler extends AbstractHandler {
+
+ public AddRouteToForCBRHandler() {}
+
+ @Override
+ public boolean isEnabled(XModelObject object) {
+ return object != null && object.isObjectEditable();
+ }
+
+ @Override
+ public void executeHandler(XModelObject object, Properties p)
+ throws XModelException {
+ String s = object.getAttributeValue(ContentBasedRouter.ATTR_RULE_SET);
+ if(s != null && s.trim().length() > 0) {
+ XActionInvoker.invoke("CreateActions.AddRouteToWithRuleSet", object, p);
+ } else {
+ XActionInvoker.invoke("CreateActions.AddRouteToWithoutRuleSet", object, p);
+ }
+ }
+
+}
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddRouteToForCBRHandler.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 5 months
JBoss Tools SVN: r19807 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor: form and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-19 09:16:00 -0500 (Tue, 19 Jan 2010)
New Revision: 19807
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5684
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java 2010-01-19 13:18:54 UTC (rev 19806)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java 2010-01-19 14:16:00 UTC (rev 19807)
@@ -488,6 +488,9 @@
}
public void doGlobalAction(String action) {
+ if(errorForm != null && errorForm.isVisible() && errorForm.doGlobalAction(action)) {
+ return;
+ }
if(treeForm.doGlobalAction(action)) {
return;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java 2010-01-19 13:18:54 UTC (rev 19806)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java 2010-01-19 14:16:00 UTC (rev 19807)
@@ -30,6 +30,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Layout;
+import org.eclipse.ui.actions.ActionFactory;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.forms.ExpandableForm;
import org.jboss.tools.common.model.ui.widgets.IWidgetSettings;
@@ -376,4 +377,16 @@
contentComposite.layout();
}
}
+
+ public boolean doGlobalAction(String actionId) {
+ if(styledText == null || styledText.isDisposed() || !styledText.isFocusControl()) {
+ return false;
+ }
+ if(styledText != null && !styledText.isDisposed()) {
+ if (ActionFactory.COPY.getId().equals(actionId)) {
+ styledText.copy();
+ }
+ }
+ return true;
+ }
}
14 years, 5 months
JBoss Tools SVN: r19806 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-19 08:18:54 -0500 (Tue, 19 Jan 2010)
New Revision: 19806
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5554
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-19 13:18:25 UTC (rev 19805)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-19 13:18:54 UTC (rev 19806)
@@ -1447,7 +1447,7 @@
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Add Implicit Collection..." kind="action" name="AddConverter">
+ displayName="Add Converter..." kind="action" name="AddConverter">
<EntityData EntityName="ESBPreConverter">
<AttributeData AttributeName="class"/>
<AttributeData AttributeName="field name"/>
14 years, 5 months
JBoss Tools SVN: r19805 - trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form.
by jbosstools-commits＠lists.jboss.org
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]);
14 years, 5 months
JBoss Tools SVN: r19804 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-19 08:17:54 -0500 (Tue, 19 Jan 2010)
New Revision: 19804
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5554
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2010-01-19 12:31:57 UTC (rev 19803)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2010-01-19 13:17:54 UTC (rev 19804)
@@ -24,6 +24,8 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.jboss.tools.common.editor.form.RightFormContainer;
+import org.jboss.tools.common.meta.XModelEntity;
+import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.ui.ModelUIMessages;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
@@ -200,6 +202,11 @@
this.tableAdapter.setShownEntities(entities/*new String[]{entities[0]}*/);
this.tableAdapter.getActionMapping().clear();
+ XModelEntity childEntity = null;
+ if(entities != null) for (int i = 0; i < entities.length && childEntity == null; i++) {
+ childEntity = xmo.getModel().getMetaData().getEntity(entities[i]);
+ }
+
for(int i=0; i<actions.length; i++) {
this.tableAdapter.getActionMapping().put(actions[i].getActionLabel(), actions[i].getActionPath());
}
@@ -209,7 +216,11 @@
int[] widths = new int[attributes.length];
for(int i=0; i<attributes.length; i++) {
shownProperties[i] = attributes[i].getName();
- columnLabels[i] = attributes[i].getDisplayName();
+ String label = null;
+ if(childEntity != null && childEntity.getAttribute(attributes[i].getName()) != null) {
+ label = WizardKeys.getAttributeDisplayName(childEntity.getAttribute(attributes[i].getName()), true);
+ }
+ columnLabels[i] = label != null ? label : attributes[i].getDisplayName();
widths[i] = attributes[i].getWidth();
}
14 years, 5 months
JBoss Tools SVN: r19803 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-01-19 07:31:57 -0500 (Tue, 19 Jan 2010)
New Revision: 19803
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5401
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2010-01-19 11:55:19 UTC (rev 19802)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2010-01-19 12:31:57 UTC (rev 19803)
@@ -377,10 +377,16 @@
findDeclarations(component);
+ if(status.hasFatalError())
+ return;
+
pm.worked(1);
findAnnotations();
+ if(status.hasFatalError())
+ return;
+
pm.worked(1);
getSearcher().findELReferences();
@@ -397,6 +403,9 @@
findOutDataModelFactory();
+ if(status.hasFatalError())
+ return;
+
pm.worked(1);
getSearcher().findELReferences();
14 years, 5 months
JBoss Tools SVN: r19802 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-01-19 06:55:19 -0500 (Tue, 19 Jan 2010)
New Revision: 19802
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5641
Validate project-relative path for hibernate.cfg.xml
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2010-01-19 11:41:03 UTC (rev 19801)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2010-01-19 11:55:19 UTC (rev 19802)
@@ -13,16 +13,21 @@
import java.io.File;
import java.util.List;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.core.context.persistence.Persistence;
import org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceUnit;
import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
import org.eclipse.wst.validation.internal.core.Message;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
@@ -33,7 +38,7 @@
public class HibernatePersistenceUnit extends GenericPersistenceUnit
implements Messages, Hibernate {
- private HibernateProperties hibernateProperties;
+ private HibernateJpaProperties hibernateProperties;
/**
* @param parent
@@ -63,6 +68,19 @@
IPath path = new Path(configFile);
if (new File(path.toOSString()).exists()) return;
+
+ try {
+ IJavaProject jp = getJpaProject().getJavaProject();
+ IPackageFragmentRoot[] pfrs = jp.getPackageFragmentRoots();
+ for (int i = 0; i < pfrs.length; i++) {
+ if (pfrs[i].isArchive()) continue;
+ if (((IContainer)pfrs[i].getResource()).findMember(path) != null){
+ return;
+ }
+ }
+ } catch (JavaModelException e) {
+ HibernateJptPlugin.logException(e);
+ }
IResource res= ResourcesPlugin.getWorkspace().getRoot().findMember(path);
if (res != null) {
14 years, 5 months
JBoss Tools SVN: r19801 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-01-19 06:41:03 -0500 (Tue, 19 Jan 2010)
New Revision: 19801
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java
Log:
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java 2010-01-19 11:34:13 UTC (rev 19800)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java 2010-01-19 11:41:03 UTC (rev 19801)
@@ -11,10 +11,8 @@
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
@@ -24,11 +22,9 @@
import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IStorageEditorInput;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.editors.text.EditorsUI;
-import org.jboss.tools.common.model.ui.editor.ModelObjectStorageEditorInput;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
import org.jboss.tools.vpe.ui.test.OpenOnUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
14 years, 5 months
JBoss Tools SVN: r19800 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-01-19 06:34:13 -0500 (Tue, 19 Jan 2010)
New Revision: 19800
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5693 fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2010-01-19 11:18:37 UTC (rev 19799)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2010-01-19 11:34:13 UTC (rev 19800)
@@ -17,6 +17,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IStorage;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -152,21 +153,20 @@
if (editorInput instanceof JarEntryEditorInput) {
JarEntryEditorInput jarEntryEditorInput = (JarEntryEditorInput) editorInput;
JarEntryResource jarEntryFile = (JarEntryResource) jarEntryEditorInput.getStorage();
- Object parent = jarEntryFile.getParent();
- while( parent instanceof JarEntryResource) {
- parent = ((JarEntryResource)parent).getParent();
+ IJavaProject parentProject = getProjectForJarResource(jarEntryFile);
+ if (parentProject != null) {
+ return searchForClass(parentProject, className);
}
- while (parent instanceof PackageFragment) {
- parent = ((PackageFragment)parent).getParent();
- }
- if( (parent instanceof JarPackageFragmentRoot) &&
- (((JarPackageFragmentRoot)parent).getParent() instanceof IJavaProject)) {
- return searchForClass(((IJavaProject) ((JarPackageFragmentRoot)parent).getParent()), className);
- }
-
} else if (editorInput instanceof IStorageEditorInput) {
IStorageEditorInput moeInput = (IStorageEditorInput)editorInput;
- IPath p = moeInput.getStorage().getFullPath();
+ IStorage storage = moeInput.getStorage();
+ if (storage instanceof JarEntryFile) {
+ IJavaProject parentProject = getProjectForJarResource((JarEntryFile)storage);
+ if (parentProject != null) {
+ return searchForClass(parentProject, className);
+ }
+ }
+ IPath p = storage.getFullPath();
String s0 = p.segment(0);
project = ResourcesPlugin.getWorkspace().getRoot().getProject(s0);
}
@@ -187,6 +187,21 @@
}
}
+ private IJavaProject getProjectForJarResource(JarEntryResource jarResource){
+ Object parent = jarResource.getParent();
+ while( parent instanceof JarEntryResource) {
+ parent = ((JarEntryResource)parent).getParent();
+ }
+ while (parent instanceof PackageFragment) {
+ parent = ((PackageFragment)parent).getParent();
+ }
+ if( (parent instanceof JarPackageFragmentRoot) &&
+ (((JarPackageFragmentRoot)parent).getParent() instanceof IJavaProject)) {
+ return (IJavaProject)((JarPackageFragmentRoot)parent).getParent();
+ }
+ return null;
+ }
+
IRegion fLastRegion = null;
/*
* (non-Javadoc)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-01-19 11:18:37 UTC (rev 19799)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-01-19 11:34:13 UTC (rev 19800)
@@ -70,6 +70,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.MessageResolutionInPreviewTabTest;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInJarPackageFragment_JBIDE5682;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
@@ -192,6 +193,7 @@
suite.addTestSuite(TaglibXMLUnformatedDTD_JBIDE5642.class);
suite.addTestSuite(OpenOnInJarPackageFragment_JBIDE5682.class);
suite.addTestSuite(MessageResolutionInPreviewTabTest.class);
+ suite.addTestSuite(OpenOnTLDPackedInJar_JBIDE5693.class);
// $JUnit-END$
// added by Max Areshkau
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java 2010-01-19 11:34:13 UTC (rev 19800)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.internal.core.JarEntryDirectory;
+import org.eclipse.jdt.internal.core.JarEntryFile;
+import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
+import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput;
+import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.jboss.tools.common.model.ui.editor.ModelObjectStorageEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.vpe.ui.test.OpenOnUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ *
+ * @author yzhishko
+ *
+ */
+
+@SuppressWarnings("restriction")
+public class OpenOnTLDPackedInJar_JBIDE5693 extends VpeTest {
+
+ private static final String JAR_LIB_PATH = "WebContent/WEB-INF/lib/jsf-impl-2.0.1-SNAPSHOT.jar"; //$NON-NLS-1$
+ private static final String TEST_FILE = "jsf_core.tld"; //$NON-NLS-1$
+ private static final String DIR = "META-INF"; //$NON-NLS-1$
+
+ public OpenOnTLDPackedInJar_JBIDE5693(String name) {
+ super(name);
+ }
+
+ public void testOpenOnTLDPackedInJar() throws Throwable{
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
+ JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
+ IJavaProject javaProject = JavaCore.create(project);
+ IPackageFragmentRoot fragmentRoot = javaProject
+ .getPackageFragmentRoot(""+project.getLocation() + "/" //$NON-NLS-1$ //$NON-NLS-2$
+ + JAR_LIB_PATH);
+ JarPackageFragmentRoot jarPackageFragmentRoot = (JarPackageFragmentRoot) fragmentRoot;
+ JarEntryDirectory entryDirectory = new JarEntryDirectory(DIR);
+ entryDirectory.setParent(jarPackageFragmentRoot);
+ JarEntryFile fileInJar = new JarEntryFile(TEST_FILE);
+ fileInJar.setParent(entryDirectory);
+ JarEntryEditorInput editorInput = new JarEntryEditorInput(fileInJar);
+ OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(fileInJar
+ .getName()), 71, 15, "CoreValidator.class"); //$NON-NLS-1$
+
+ }
+
+ private final String getEditorId(String filename) {
+ IWorkbench workbench = PlatformUI.getWorkbench();
+ IEditorRegistry editorRegistry = workbench.getEditorRegistry();
+ IEditorDescriptor descriptor = editorRegistry
+ .getDefaultEditor(filename);
+ if (descriptor != null)
+ return descriptor.getId();
+ return EditorsUI.DEFAULT_TEXT_EDITOR_ID;
+ }
+
+}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java 2010-01-19 11:18:37 UTC (rev 19799)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java 2010-01-19 11:34:13 UTC (rev 19800)
@@ -84,15 +84,15 @@
.openEditor(editorInput, editorId);
StructuredTextEditor textEditor = null;
if(editorPart instanceof MultiPageEditorPart){
- IEditorPart[] editorParts = ((MultiPageEditorPart)editorPart).findEditors(editorInput);
- ((MultiPageEditorPart)editorPart).setActiveEditor(editorParts[0]);
- textEditor = (StructuredTextEditor) editorParts[0];
+ StructuredTextEditor structuredTextEditor = findStructEditor((MultiPageEditorPart)editorPart, editorInput);
+ ((MultiPageEditorPart)editorPart).setActiveEditor(structuredTextEditor);
+ textEditor = structuredTextEditor;
} else if(editorPart instanceof JSPMultiPageEditor) {
textEditor = ((JSPMultiPageEditor)editorPart).getSourceEditor();
} else if(editorPart instanceof EditorPartWrapper) {
- IEditorPart[] editorParts = ((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor()).findEditors(editorInput);
- ((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor()).setActiveEditor(editorParts[1]);
- textEditor = (StructuredTextEditor) editorParts[1];
+ StructuredTextEditor structuredTextEditor = findStructEditor((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor(), editorInput);
+ ((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor()).setActiveEditor(structuredTextEditor);
+ textEditor = structuredTextEditor;
}
int openOnPosition = TestUtil.getLinePositionOffcet(textEditor
.getTextViewer(),lineNumber, lineOffset);
@@ -122,4 +122,14 @@
}
+ private static StructuredTextEditor findStructEditor (MultiPageEditorPart part, IEditorInput input){
+ IEditorPart[] editorParts = part.findEditors(input);
+ for (int i = 0; i < editorParts.length; i++) {
+ if (editorParts[i] instanceof StructuredTextEditor) {
+ return (StructuredTextEditor) editorParts[i];
+ }
+ }
+ return null;
+ }
+
}
14 years, 5 months
JBoss Tools SVN: r19799 - in trunk/esb/plugins/org.jboss.tools.esb.core/resources: meta and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-19 06:18:37 -0500 (Tue, 19 Jan 2010)
New Revision: 19799
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5554
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-01-19 10:14:41 UTC (rev 19798)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-01-19 11:18:37 UTC (rev 19799)
@@ -457,6 +457,11 @@
ESBPreNotificationList_Properties.Title=ESB Notification List
+ESBPreNotificationList120_CreateTarget.WindowTitle=Add Target
+ESBPreNotificationList120_CreateTarget.Title=ESB Target
+
+ESBPreNotificationList120_Properties.Title=ESB Notification List
+
ESBPreRouteTo_Properties.Title=ESB Route To
ESBPreObjectPath_Properties.Title=ESB Object Path
@@ -568,6 +573,33 @@
ESB.AddSyncServiceInvoker.WindowTitle=Add Sync Service Invoker
ESB.AddSyncServiceInvoker.Title=ESB Sync Service Invoker
+ESB.CreateAttachment.WindowTitle=Add Attachment
+ESB.CreateAttachment.Title=Attachment
+
+ESB.CreateFTP.WindowTitle=Add FTP
+ESB.CreateFTP.Title=FTP
+
+ESB.CreateFTPList.WindowTitle=Add FTP List
+ESB.CreateFTPList.Title=FTP List
+
+ESBPreTargetNotifyFiles_CreateFile.WindowTitle=Add File
+ESBPreTargetNotifyFiles_CreateFile.Title=File
+
+ESB.CreateProp.WindowTitle=Add Message Property
+ESB.CreateProp.Title=Message Property
+
+ESB.CreateQueue.WindowTitle=Add Queue
+ESB.CreateQueue.Title=Queue
+
+ESB.CreateColumn.WindowTitle=Add Column
+ESB.CreateColumn.Title=Column
+
+ESB.CreateTCP.WindowTitle=Add TCP
+ESB.CreateTCP.Title=TCP
+
+ESB.CreateTopic.WindowTitle=Add Topic
+ESB.CreateTopic.Title=Topic
+
ESBPreActionAggregator101_Properties.Title=Aggregator
ESBPreActionBpmProcessor120_Properties.Title=BPM Processor
ESBPreActionByteArrayToString101_Properties.Title=Byte Array to String
@@ -600,4 +632,28 @@
ESBPreActionSystemPrintln101_Properties.Title=System Println
ESBPreActionXSLTAction120_Properties.Title=XSLT Action
ESBPreActionXStreamToObject101_Properties.Title=XStream to Object
-ESBPreActionBusinessRulesProcessor101_Properties.Title=Business Rules Processor
\ No newline at end of file
+ESBPreActionBusinessRulesProcessor101_Properties.Title=Business Rules Processor
+
+
+ESBPreNotifyAttachment_Properties.Title=Attachment
+ESBPreNotifyColumn_Properties.Title=Column
+ESBPreNotifyFTP_Properties.Title=FTP
+ESBPreNotifyFTPList_Properties.Title=FTP List
+ESBPreNotifyFile_Properties.Title=File
+ESBPreNotifyProp_Properties.Title=Message Property
+ESBPreNotifyQueue_Properties.Title=Queue
+ESBPreNotifyTCP_Properties.Title=TCP
+ESBPreNotifyTopic_Properties.Title=Topic
+ESBPreTargetNotifyConsole_Properties.Title=Notify Console Target
+ESBPreTargetNotifyEmail_Properties.Title=Notify Email Target
+ESBPreTargetNotifyFTP_Properties.Title=Notify FTP Target
+ESBPreTargetNotifyFTPList_Properties.Title=Notify FTP List Target
+ESBPreTargetNotifyFiles_Properties.Title=Notify Files Target
+ESBPreTargetNotifyQueues_Properties.Title=Notify Queues Target
+ESBPreTargetNotifySQLTable_Properties.Title=Notify SQL Table Target
+ESBPreTargetNotifyTCP_Properties.Title=Notify TCP Target
+ESBPreTargetNotifyTopics_Properties.Title=Notify Topics Target
+
+
+
+
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-19 10:14:41 UTC (rev 19798)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-19 11:18:37 UTC (rev 19799)
@@ -2464,6 +2464,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/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta 2010-01-19 10:14:41 UTC (rev 19798)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta 2010-01-19 11:18:37 UTC (rev 19799)
@@ -376,7 +376,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="target" name="ESBPreTargetNotifyEmail">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyAttachment"/>
@@ -416,7 +416,7 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="CopyActions"/>
<XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
<XActionItemReference entity="ESBPreAlias" name="Properties"/>
<XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
@@ -424,7 +424,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="target" name="ESBPreTargetNotifyFTP">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyFTP"/>
@@ -457,7 +457,7 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="CopyActions"/>
<XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
<XActionItemReference entity="ESBPreAlias" name="Properties"/>
<XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
@@ -465,7 +465,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="target" name="ESBPreTargetNotifyFTPList">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyFTPList"/>
@@ -502,7 +502,7 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="CopyActions"/>
<XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
<XActionItemReference entity="ESBPreAlias" name="Properties"/>
<XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
@@ -510,7 +510,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="target" name="ESBPreTargetNotifyFiles">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyFile"/>
@@ -543,7 +543,7 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="CopyActions"/>
<XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
<XActionItemReference entity="ESBPreAlias" name="Properties"/>
<XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
@@ -551,7 +551,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="target" name="ESBPreTargetNotifyQueues">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyProp"/>
@@ -594,7 +594,7 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="CopyActions"/>
<XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
<XActionItemReference entity="ESBPreAlias" name="Properties"/>
<XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
@@ -602,7 +602,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="target" name="ESBPreTargetNotifySQLTable">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyColumn"/>
@@ -645,7 +645,7 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="CopyActions"/>
<XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
<XActionItemReference entity="ESBPreAlias" name="Properties"/>
<XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
@@ -653,7 +653,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="target" name="ESBPreTargetNotifyTCP">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyTCP"/>
@@ -685,7 +685,7 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="CopyActions"/>
<XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
<XActionItemReference entity="ESBPreAlias" name="Properties"/>
<XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
@@ -693,7 +693,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="target" name="ESBPreTargetNotifyTopics">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyProp"/>
@@ -736,7 +736,7 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="CopyActions"/>
<XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
<XActionItemReference entity="ESBPreAlias" name="Properties"/>
<XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
14 years, 5 months