JBoss Tools SVN: r18863 - 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: 2009-11-26 12:02:14 -0500 (Thu, 26 Nov 2009)
New Revision: 18863
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-5199
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-11-26 16:52:57 UTC (rev 18862)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2009-11-26 17:02:14 UTC (rev 18863)
@@ -22,6 +22,7 @@
import org.jboss.tools.common.model.ui.forms.IFormData;
import org.jboss.tools.common.model.ui.forms.ModelFormLayoutData;
import org.jboss.tools.esb.core.model.ESBConstants;
+import org.jboss.tools.esb.core.model.converters.ConverterConstants;
/**
* @author Viacheslav Kabanovich
@@ -165,4 +166,36 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddObjectPath") //$NON-NLS-1$
);
+ 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 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 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 BPM_VAR_LIST_DEFINITION = new FormData(
+ "BPM Var List", //$NON-NLS-1$
+ ModelFormLayoutData.EMPTY_DESCRIPTION,
+ new FormAttributeData[]{new FormAttributeData("esb", 50), new FormAttributeData("bpm", 50)},
+ new String[]{ConverterConstants.BPM_VAR_ENTITY},
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddBPMVar") //$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-11-26 16:52:57 UTC (rev 18862)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2009-11-26 17:02:14 UTC (rev 18863)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.common.model.ui.forms.*;
import org.jboss.tools.esb.core.model.ESBConstants;
+import org.jboss.tools.esb.core.model.converters.ConverterConstants;
/**
* @author Viacheslav Kabanovich
@@ -73,9 +74,22 @@
if(entityName.startsWith(PREACTION_PREFIX)) {
if(entity.getChild(ENT_ESB_ROUTE_TO) != null) {
list.add(ESBListsFormLayoutData.ESB_ROUTE_LIST_DEFINITION);
- } else if(entity.getChild(ENT_ESB_OBJECT_PATH) != null) {
+ }
+ 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);
+ }
//do nothing; when specific children exist use specific forms
} else if(entity.getChild(ENT_ESB_PROPERTY) != null) {
list.add(ESBListsFormLayoutData.ESB_PROPERTY_LIST_DEFINITION);
15 years, 1 month
JBoss Tools SVN: r18862 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/help and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-11-26 11:52:57 -0500 (Thu, 26 Nov 2009)
New Revision: 18862
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
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/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5199
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2009-11-26 16:42:46 UTC (rev 18861)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2009-11-26 16:52:57 UTC (rev 18862)
@@ -8,6 +8,7 @@
Bundle-Localization: plugin
Export-Package: org.jboss.tools.esb.core,
org.jboss.tools.esb.core.model,
+ org.jboss.tools.esb.core.model.converters,
org.jboss.tools.esb.core.model.handlers
Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport,
org.eclipse.ui
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2009-11-26 16:42:46 UTC (rev 18861)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2009-11-26 16:52:57 UTC (rev 18862)
@@ -130,3 +130,29 @@
ESB.esb=esb
ESB.stateful=Stateful
ESB.entry_point=Entry Point
+ESB.namespace_uri=Namespace URI
+ESB.local_part=Local Part
+ESB.field_name=Field Name
+ESB.field_type=Field Type
+ESB.item_type=Item Type
+ESB.defined_in=Defined in
+ESB.bpm=bpm
+ESB.default=Default
+ESB.template_file=Template File
+ESB.fail_on_warning=Fail on Warning
+ESB.uri_resolver=URI Resolver
+ESB.fail_on_exception=Fail on Exception
+ESB.suspend_transaction=Suspend Transaction
+ESB.service_invoker_timeout=Service Invoker Timeout
+ESB.support_message_based_scripting=Support Message Based Scripting
+ESB.cache_script=Cache Script
+ESB.endpoint_url=Endpoint URL
+ESB.response_type=Response Type
+ESB.method=Method
+ESB.router=Router
+ESB.send_to=Send to
+ESB.subject=Subject
+ESB.from=From
+ESB.unwrap=Unwrap
+ESB.auth=Auth
+ESB.message_attachment_name=Message Attachment Name
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2009-11-26 16:42:46 UTC (rev 18861)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2009-11-26 16:52:57 UTC (rev 18862)
@@ -49,3 +49,15 @@
ESB.AddSOAPClient.menu=SOAP Client...
ESB.AddSystemPrintln.menu=System Println...
ESB.CreateFileESBV.menu=JBoss ESB File...
+ESB.AddSOAPProxy.menu=SOAP Proxy
+ESB.AddSOAPWiseClient.menu=SOAP Wise Client
+ESB.AddScripting.menu=Scripting
+ESB.AddEJBProcessor.menu=EJB Processor
+ESB.AddBPMProcessor.menu=BPM Processor
+ESB.AddXSLTAction.menu=XSLT Action
+ESB.AddJMSRouter.menu=JMS Router
+ESB.AddEMailRouter.menu=EMail Router
+ESB.AddEMailWiretap.menu=EMail Wiretap
+ESB.AddHTTPRouter.menu=HTTP Router
+ESB.AddSyncServiceInvoker.menu=Sync Service Invoker
+ESB.AddBusinessRulesProcessor.menu=Business Rules Processor
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 2009-11-26 16:42:46 UTC (rev 18861)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2009-11-26 16:52:57 UTC (rev 18862)
@@ -15,6 +15,8 @@
FileESB110_Properties.Title=ESB File 1.1.0
FileESB120_Properties.Title=ESB File 1.2.0
+ESBGlobals120_Properties.Title=ESB Globals
+
#Providers List
ESBProviders101_AddBusProvider_0.WindowTitle=Add Channel Provider
@@ -412,10 +414,42 @@
ESBPreActionNotifier101_AddNotificationList.WindowTitle=Add Notification List
ESBPreActionNotifier101_AddNotificationList.Title=ESB Notification List
-ESBPreActionXStreamToObject101_AddAlias.WindowTitle=Add Alias
-ESBPreActionXStreamToObject101_AddAlias.Title=ESB Alias
+ESB.AddAlias.WindowTitle=Add Alias
+ESB.AddAlias.Title=ESB Alias
+ESB.AddNamespace.WindowTitle=Add Namespace
+ESB.AddNamespace.Title=ESB Namespace
+
+ESB.AddFieldAlias.WindowTitle=Add Field Alias
+ESB.AddFieldAlias.Title=ESB Field Alias
+
+ESB.AddAttributeAlias.WindowTitle=Add Attribute Alias
+ESB.AddAttributeAlias.Title=ESB Attribute Alias
+
+ESB.AddImplicitCollection.WindowTitle=Add Implicit Collection
+ESB.AddImplicitCollection.Title=ESB Implicit Collection
+
+ESB.AddConverter.WindowTitle=Add Converter
+ESB.AddConverter.Title=ESB Converter
+
+ESB.AddBPMVar.WindowTitle=Add BPM Var
+ESB.AddBPMVar.Title=ESB BPM Var
+
+ESB.AddHeader.WindowTitle=Add Header
+ESB.AddHeader.Title=ESB Header
+
+ESB.AddClientProp.WindowTitle=Add HTTP Client Property
+ESB.AddClientProp.Title=HTTP Client Property
+
ESBPreAlias_Properties.Title=ESB Alias
+ESBPreAttributeAlias_Properties.Title=ESB Attribute Alias
+ESBPreBPMVar_Properties.Title=ESB BPM Var
+ESBPreClientProp_Properties.Title=ESB HTTP Client Property
+ESBPreConverter_Properties.Title=ESB Converter
+ESBPreFieldAlias_Properties.Title=ESB Field Alias
+ESBPreHeader_Properties.Title=ESB Header
+ESBPreImplicitCollection_Properties.Title=ESB Implicit Collection
+ESBPreNamespace_Properties.Title=ESB Namespace
ESBPreNotificationList_CreateTarget.WindowTitle=Add Target
ESBPreNotificationList_CreateTarget.Title=ESB Target
@@ -472,15 +506,6 @@
ESB.AddNotifier.WindowTitle=Add Notifier
ESB.AddNotifier.Title=ESB Notifier
-ESB.SOAPProcessor.WindowTitle=Add SOAP Processor
-ESB.SOAPProcessor.Title=SOAP Processor
-
-ESB.SOAPClient.WindowTitle=Add SOAP Client
-ESB.SOAPClient.Title=SOAP Client
-
-ESB.SOAPProxy.WindowTitle=Add SOAP Proxy
-ESB.SOAPProxy.Title=SOAP Proxy
-
ESB.AddObjectInvoke.WindowTitle=Add Object Invoke
ESB.AddObjectInvoke.Title=ESB Object Invoke
@@ -499,13 +524,53 @@
ESB.AddSOAPClient.WindowTitle=Add SOAP Client
ESB.AddSOAPClient.Title=ESB SOAP Client
+ESB.AddSOAPProxy.WindowTitle=Add SOAP Proxy
+ESB.AddSOAPProxy.Title=ESB SOAP Proxy
+
+ESB.AddSOAPWiseClient.WindowTitle=Add SOAP Wise Client
+ESB.AddSOAPWiseClient.Title=ESB SOAP Wise Client
+
+ESB.AddScripting.WindowTitle=Add Scripting Action
+ESB.AddScripting.Title=ESB Scripting Action
+
+ESB.AddEJBProcessor.WindowTitle=Add EJB Processor
+ESB.AddEJBProcessor.Title=ESB EJB Processor
+
+ESB.AddBPMProcessor.WindowTitle=Add BPM Processor
+ESB.AddBPMProcessor.Title=ESB BPM Processor
+
+ESB.AddXSLTAction.WindowTitle=Add XSLT Action
+ESB.AddXSLTAction.Title=ESB XSLT Action
+
+ESB.AddJMSRouter.WindowTitle=Add JMS Router
+ESB.AddJMSRouter.Title=ESB JMS Router
+
+ESB.AddEMailRouter.WindowTitle=Add EMail Router
+ESB.AddEMailRouter.Title=ESB EMail Router
+
+ESB.AddEMailWiretap.WindowTitle=Add EMail Wiretap
+ESB.AddEMailWiretap.Title=ESB EMail Wiretap
+
+ESB.AddHTTPRouter.WindowTitle=Add HTTP Wiretap
+ESB.AddHTTPRouter.Title=ESB HTTP Wiretap
+
+ESB.AddSyncServiceInvoker.WindowTitle=Add Sync Service Invoker
+ESB.AddSyncServiceInvoker.Title=ESB Sync Service Invoker
+
ESBPreActionAggregator101_Properties.Title=Aggregator
+ESBPreActionBpmProcessor120_Properties.Title=BPM Processor
ESBPreActionByteArrayToString101_Properties.Title=Byte Array to String
ESBPreActionCommandInterpreter101_Properties.Title=Command Interpreter
ESBPreActionContentBasedRouter101_Properties.Title=Content Based Router
+ESBPreActionEJBProcessor120_Properties.Title=EJB Processor
+ESBPreActionEMailRouter120_Properties.Title=EMail Router
+ESBPreActionEMailWiretap120_Properties.Title=EMail Wiretap
ESBPreActionGroovyProcessor101_Properties.Title=Groovy Processor
+ESBPreActionHTTPRouter120_Properties.Title=HTTP Router
+ESBPreActionJMSRouter120_Properties.Title=JMS Router
ESBPreActionLongToDateConverter101_Properties.Title=Long to Date Converter
ESBPreActionMessagePersister101_Properties.Title=Message Persister
+ESBPreActionMessagePersister120_Properties.Title=Message Persister
ESBPreActionNotifier101_Properties.Title=Notifier
ESBPreActionObjectInvoke101_Properties.Title=Object Invoke
ESBPreActionObjectToCSVString101_Properties.Title=Object to CSV String
@@ -513,9 +578,14 @@
ESBPreActionSOAPClient101_Properties.Title=SOAP Client
ESBPreActionSOAPProcessor101_Properties.Title=SOAP Processor
ESBPreActionSOAPProxy120_Properties.Title=SOAP Proxy
+ESBPreActionSOAPWiseClient120_Properties.Title=SOAP Wise Client
+ESBPreActionSchemaValidator120_Properties.Title=Schema Validator
+ESBPreActionScripting120_Properties.Title=Scripting
ESBPreActionSmooksTransformer101_Properties.Title=Smooks Transformer
ESBPreActionStaticRouter101_Properties.Title=Static Router
ESBPreActionStaticWiretap101_Properties.Title=Static Wiretap
+ESBPreActionSyncServiceInvoker120_Properties.Title=Sync Service Invoker
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
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 2009-11-26 16:42:46 UTC (rev 18861)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-11-26 16:52:57 UTC (rev 18862)
@@ -1131,6 +1131,11 @@
XMLSUBPATH="action" name="ESBPreActionObjectToXStream101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
+ <XChildEntity name="ESBPreAlias"/>
+ <XChildEntity name="ESBPreNamespace"/>
+ <XChildEntity name="ESBPreFieldAlias"/>
+ <XChildEntity name="ESBPreImplicitCollection"/>
+ <XChildEntity name="ESBPreConverter"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -1160,6 +1165,16 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=advanced"
+ name="xstream mode" xmlname="xstream-mode">
+ <Constraint loader="ListString">
+ <value name="XPATH_RELATIVE_REFERENCS"/>
+ <value name="XPATH_ABSOLUTE_REFERENCS"/>
+ <value name="ID_REFERENCES"/>
+ <value name="NO_REFERENCES"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="process" xmlname="process">
<Editor name="Uneditable"/>
</XModelAttribute>
@@ -1168,7 +1183,52 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem kind="list" name="CreateActions"/>
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Alias..." kind="action" name="AddAlias">
+ <EntityData EntityName="ESBPreAlias">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="class" 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="ESBPreNamespace">
+ <AttributeData AttributeName="namespace uri"/>
+ <AttributeData AttributeName="local part" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Field Alias..." kind="action" name="AddFieldAlias">
+ <EntityData EntityName="ESBPreFieldAlias">
+ <AttributeData AttributeName="alias"/>
+ <AttributeData AttributeName="defined in"/>
+ <AttributeData AttributeName="field name"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Implicit Collection..." kind="action" name="AddImplicitCollection">
+ <EntityData EntityName="ESBPreImplicitCollection">
+ <AttributeData AttributeName="class"/>
+ <AttributeData AttributeName="field name"/>
+ <AttributeData AttributeName="field type" Mandatory="no"/>
+ <AttributeData AttributeName="item type" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Implicit Collection..." kind="action" name="AddConverter">
+ <EntityData EntityName="ESBPreConverter">
+ <AttributeData AttributeName="class"/>
+ <AttributeData AttributeName="field name"/>
+ <AttributeData AttributeName="field type" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
<XActionItemReference entity="ESBProperty" name="CopyActions"/>
<XActionItemReference entity="ESBProperty" name="DeleteActions"/>
<XActionItemReference entity="ESBProperty" name="Properties"/>
@@ -1351,7 +1411,24 @@
ICON="action.empty"
PROPERTIES="actionpath=Open;attribute=wsdl transform"
displayName="Open Transform" kind="action" name="OpenTransform"/>
- <XActionItem kind="list" name="CreateActions"/>
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add HTTP Client Property..." kind="action" name="AddClientProp">
+ <EntityData EntityName="ESBPreClientProp">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="value" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Header..." kind="action" name="AddHeader">
+ <EntityData EntityName="ESBPreHeader">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="value" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
<XActionItemReference entity="ESBProperty" name="CopyActions"/>
<XActionItemReference entity="ESBProperty" name="DeleteActions"/>
<XActionItemReference entity="ESBProperty" name="Properties"/>
@@ -2019,6 +2096,10 @@
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
<XChildEntity name="ESBPreAlias"/>
+ <XChildEntity name="ESBPreAttributeAlias"/>
+ <XChildEntity name="ESBPreFieldAlias"/>
+ <XChildEntity name="ESBPreImplicitCollection"/>
+ <XChildEntity name="ESBPreConverter"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -2067,9 +2148,45 @@
displayName="Add Alias..." kind="action" name="AddAlias">
<EntityData EntityName="ESBPreAlias">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="value" Mandatory="no"/>
+ <AttributeData AttributeName="class" Mandatory="no"/>
</EntityData>
</XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Attribute Alias..." kind="action" name="AddAttributeAlias">
+ <EntityData EntityName="ESBPreAttributeAlias">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="class" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Field Alias..." kind="action" name="AddFieldAlias">
+ <EntityData EntityName="ESBPreFieldAlias">
+ <AttributeData AttributeName="alias"/>
+ <AttributeData AttributeName="defined in"/>
+ <AttributeData AttributeName="field name"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Implicit Collection..." kind="action" name="AddImplicitCollection">
+ <EntityData EntityName="ESBPreImplicitCollection">
+ <AttributeData AttributeName="class"/>
+ <AttributeData AttributeName="field name"/>
+ <AttributeData AttributeName="field type" Mandatory="no"/>
+ <AttributeData AttributeName="item type" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Converter..." kind="action" name="AddConverter">
+ <EntityData EntityName="ESBPreConverter">
+ <AttributeData AttributeName="class"/>
+ <AttributeData AttributeName="field name"/>
+ <AttributeData AttributeName="field type" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
<XActionItemReference entity="ESBProperty" name="CopyActions"/>
<XActionItemReference entity="ESBProperty" name="DeleteActions"/>
@@ -2093,13 +2210,16 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="name" xmlname="name"/>
- <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/>
+ <XModelAttribute PROPERTIES="category=general" name="class" xmlname="class">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="value"
+ visibility="false" xmlname="value"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem kind="list" name="CreateActions"/>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
@@ -2122,6 +2242,37 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=attributealias"
+ XMLSUBPATH="attribute-alias" name="ESBPreAttributeAlias">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="attribute-alias" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general" name="class" xmlname="class">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
<XModelEntity
ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=bpmVar"
@@ -2145,6 +2296,100 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=httpclient"
+ XMLSUBPATH="http-client-property" name="ESBPreClientProp">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="http client property" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=converter"
+ XMLSUBPATH="converter" name="ESBPreConverter">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="converter" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="class" xmlname="class">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="field name" xmlname="fieldName"/>
+ <XModelAttribute PROPERTIES="category=general" name="field type" xmlname="fieldType"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=fieldalias"
+ XMLSUBPATH="field-alias" name="ESBPreFieldAlias">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="field-alias" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="alias" xmlname="alias"/>
+ <XModelAttribute PROPERTIES="category=general" name="defined in" xmlname="definedIn">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="field name" xmlname="fieldName"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
@@ -2170,8 +2415,8 @@
</XModelEntity>
<XModelEntity
ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=httpclient"
- XMLSUBPATH="http-client-property" name="ESBPreClientProp">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=header"
+ XMLSUBPATH="header" name="ESBPreHeader">
<XChildrenEntities/>
<XEntityRenderer>
<ICONS>
@@ -2179,7 +2424,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="http client property" loader="ElementType" name="element type">
+ <XModelAttribute default="header" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -2213,10 +2458,9 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
- <XModelEntity
- ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=header"
- XMLSUBPATH="header" name="ESBPreHeader">
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=implicitcollection"
+ XMLSUBPATH="implicit-collection" name="ESBPreImplicitCollection">
<XChildrenEntities/>
<XEntityRenderer>
<ICONS>
@@ -2224,12 +2468,16 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="header" loader="ElementType" name="element type">
+ <XModelAttribute default="implicit collection" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
- name="name" xmlname="name"/>
- <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/>
+ name="class" xmlname="class">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="field name" xmlname="fieldName"/>
+ <XModelAttribute PROPERTIES="category=general" name="field type" xmlname="fieldType"/>
+ <XModelAttribute PROPERTIES="category=general" name="item type" xmlname="itemType"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -2259,6 +2507,51 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=namespace"
+ XMLSUBPATH="namespace" name="ESBPreNamespace">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="namespace" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="namespace uri" xmlname="namespace-uri"/>
+ <XModelAttribute PROPERTIES="category=general" name="local part"
+ visibility="false" xmlname="local-part"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <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>
+ <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>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=notification"
XMLSUBPATH="NotificationList" name="ESBPreNotificationList">
<XChildrenEntities>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2009-11-26 16:42:46 UTC (rev 18861)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2009-11-26 16:52:57 UTC (rev 18862)
@@ -37,6 +37,8 @@
public static final SpecificActionLoader instance = new SpecificActionLoader();
+ Map<String, IPropertyConverter> propertyConverters = new HashMap<String, IPropertyConverter>();
+
SpecificActionLoader() {
if(classToEntity.isEmpty()) {
XMapping m = PreferenceModelUtilities.getPreferenceModel().getMetaData().getMapping("ESBSpecificActions");
@@ -48,6 +50,18 @@
}
}
}
+ propertyConverters.put("alias", ConverterConstants.ALIAS_CONVERTER);
+ propertyConverters.put("route", ConverterConstants.ROUTE_CONVERTER);
+ propertyConverters.put("path", ConverterConstants.OBJECT_PATHS_CONVERTER);
+ propertyConverters.put("notification", ConverterConstants.NOTIFICATION_CONVERTER);
+ propertyConverters.put("bpmVar", ConverterConstants.BPM_VAR_CONVERTER);
+ propertyConverters.put("httpclient", ConverterConstants.ENDPOINT_CONVERTER);
+ propertyConverters.put("header", ConverterConstants.HEADER_CONVERTER);
+ propertyConverters.put("namespace", ConverterConstants.NAMESPACES_CONVERTER);
+ propertyConverters.put("fieldalias", ConverterConstants.FIELD_ALIAS_CONVERTER);
+ propertyConverters.put("implicitcollection", ConverterConstants.IMPLICIT_COLLECTION_CONVERTER);
+ propertyConverters.put("attributealias", ConverterConstants.ATTRIBUTE_ALIAS_CONVERTER);
+ propertyConverters.put("converter", ConverterConstants.CONVERTER_CONVERTER);
}
public boolean isPreActionEntity(XModelObject object) {
@@ -200,14 +214,6 @@
IPropertyConverter getPropertyConverter(XModelEntity childEntity) {
String converter = childEntity.getProperty("converter");
- if("alias".equals(converter)) return ConverterConstants.ALIAS_CONVERTER;
- if("route".equals(converter)) return ConverterConstants.ROUTE_CONVERTER;
- if("path".equals(converter)) return ConverterConstants.OBJECT_PATHS_CONVERTER;
- if("notification".equals(converter)) return ConverterConstants.NOTIFICATION_CONVERTER;
- if("bpmVar".equals(converter)) return ConverterConstants.BPM_VAR_CONVERTER;
- if("httpclient".equals(converter)) return ConverterConstants.ENDPOINT_CONVERTER;
- if("header".equals(converter)) return ConverterConstants.HEADER_CONVERTER;
-
- return null;
+ return (converter == null) ? null : propertyConverters.get(converter);
}
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2009-11-26 16:42:46 UTC (rev 18861)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2009-11-26 16:52:57 UTC (rev 18862)
@@ -41,4 +41,24 @@
String HEADERS = "headers";
IPropertyConverter HEADER_CONVERTER = new BasicListConverter(HEADERS, HEADER_ENTITY);
+ String NAMESPACE_ENTITY = "ESBPreNamespace";
+ String NAMESPACES = "namespaces";
+ IPropertyConverter NAMESPACES_CONVERTER = new BasicListConverter(NAMESPACES, NAMESPACE_ENTITY);
+
+ String FIELD_ALIAS_ENTITY = "ESBPreFieldAlias";
+ String FIELD_ALIASES = "fieldAliases";
+ IPropertyConverter FIELD_ALIAS_CONVERTER = new BasicListConverter(FIELD_ALIASES, FIELD_ALIAS_ENTITY);
+
+ String IMPLICIT_COLLECTION_ENTITY = "ESBPreImplicitCollection";
+ String IMPLICIT_COLLECTIONS = "implicit-collections";
+ IPropertyConverter IMPLICIT_COLLECTION_CONVERTER = new BasicListConverter(IMPLICIT_COLLECTIONS, IMPLICIT_COLLECTION_ENTITY);
+
+ String CONVERTER_ENTITY = "ESBPreConverter";
+ String CONVERTERS = "converters";
+ IPropertyConverter CONVERTER_CONVERTER = new BasicListConverter(CONVERTERS, CONVERTER_ENTITY);
+
+ String ATTRIBUTE_ALIAS_ENTITY = "ESBPreAttributeAlias";
+ String ATTRIBUTE_ALIASES = "attribute-aliases";
+ IPropertyConverter ATTRIBUTE_ALIAS_CONVERTER = new BasicListConverter(ATTRIBUTE_ALIASES, ATTRIBUTE_ALIAS_ENTITY);
+
}
15 years, 1 month
JBoss Tools SVN: r18861 - trunk/common/plugins/org.jboss.tools.common.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-11-26 11:42:46 -0500 (Thu, 26 Nov 2009)
New Revision: 18861
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
Log:
more tweaks for new common.ui plugin
Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2009-11-26 16:40:54 UTC (rev 18860)
+++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2009-11-26 16:42:46 UTC (rev 18861)
@@ -10,4 +10,6 @@
Export-Package: org.jboss.tools.common.ui.widget.editor,
org.jboss.tools.common.ui.widget.field
Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: .
15 years, 1 month
JBoss Tools SVN: r18860 - in trunk/common: releng/maps and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-11-26 11:40:54 -0500 (Thu, 26 Nov 2009)
New Revision: 18860
Modified:
trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml
trunk/common/releng/maps/project.map
Log:
more tweaks for new common.ui plugin
Modified: trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml 2009-11-26 16:17:21 UTC (rev 18859)
+++ trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml 2009-11-26 16:40:54 UTC (rev 18860)
@@ -35,6 +35,12 @@
version="0.0.0"/>
<plugin
+ id="org.jboss.tools.common.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
id="org.jboss.tools.common.model.ui"
download-size="0"
install-size="0"
Modified: trunk/common/releng/maps/project.map
===================================================================
--- trunk/common/releng/maps/project.map 2009-11-26 16:17:21 UTC (rev 18859)
+++ trunk/common/releng/maps/project.map 2009-11-26 16:40:54 UTC (rev 18860)
@@ -10,6 +10,7 @@
feature@org.jboss.tools.common.verification.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/features/org.jboss.tools.common.verification.feature
plugin@org.jboss.tools.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/plugins/org.jboss.tools.common
+plugin@org.jboss.tools.common.ui=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/plugins/org.jboss.tools.common.ui
plugin@org.jboss.tools.common.el.core=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/plugins/org.jboss.tools.common.el.core
plugin@org.jboss.tools.common.el.ui=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/plugins/org.jboss.tools.common.el.ui
plugin@org.jboss.tools.common.gef=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/plugins/org.jboss.tools.common.gef
15 years, 1 month
JBoss Tools SVN: r18859 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-11-26 11:17:21 -0500 (Thu, 26 Nov 2009)
New Revision: 18859
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4943
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2009-11-26 15:28:37 UTC (rev 18858)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2009-11-26 16:17:21 UTC (rev 18859)
@@ -48,9 +48,17 @@
* the required bean type
* @param qualifiers
* the required qualifiers
+ * @param attemptToResolveAmbiguousDependency
+ * if there are a few beans with the given type and qualifiers
+ * and attemptToResolveAmbiguousDependency==true the manager
+ * should try to resolve the ambiguity. If any of the beans are
+ * alternatives, the manager will eliminate all beans that are
+ * not alternatives, expect for producer methods and fields of
+ * beans that are alternatives.
+ *
* @return the resulting set of beans
*/
- Set<IBean> getBeans(IType beanType, IAnnotationDeclaration... qualifiers);
+ Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency, IType beanType, IAnnotationDeclaration... qualifiers);
/**
* Returns the set of beans which are eligible for the given injection
@@ -102,6 +110,62 @@
Set<IObserverMethod> resolveObserverMethods(IInjectionPoint injectionPoint);
/**
+ * Applies the ambiguous dependency resolution rules to a set of beans.
+ *
+ * @param beans
+ * a set of beans
+ * @return resolved beans
+ */
+ Set<IBean> resolve(Set<IBean> beans);
+
+ /**
+ * Tests the given annotation type to determine if it is a scope type.
+ *
+ * @param annotationType
+ * the annotation type
+ * @return true if the annotation type is a scope type
+ */
+ boolean isScope(IType annotationType);
+
+ /**
+ * Tests the given annotation type to determine if it is a normal scope
+ * type.
+ *
+ * @param annotationType
+ * the annotation type
+ * @return <tt>true</tt> if the annotation type is a normal scope type
+ */
+ boolean isNormalScope(IType annotationType);
+
+ /**
+ * Tests the given annotation type to determine if it is a passivating scope
+ * type.
+ *
+ * @param annotationType
+ * the annotation type
+ * @return <tt>true</tt> if the annotation type is a passivating scope type
+ */
+ boolean isPassivatingScope(IType annotationType);
+
+ /**
+ * Tests the given annotation type to determine if it is a qualifier type.
+ *
+ * @param annotationType
+ * the annotation type
+ * @return <tt>true</tt> if the annotation type is a qualifier type
+ */
+ boolean isQualifier(IType annotationType);
+
+ /**
+ * Tests the given annotation type to determine if it is a stereotype.
+ *
+ * @param annotationType
+ * the annotation type
+ * @return <tt>true</tt> if the annotation type is a stereotype
+ */
+ boolean isStereotype(IType annotationType);
+
+ /**
* Returns the source reference to <class>...</class> element of
* <alternatives> of beans.xml. For example:
* <alternatives>
15 years, 1 month
JBoss Tools SVN: r18858 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-11-26 10:28:37 -0500 (Thu, 26 Nov 2009)
New Revision: 18858
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IObserverMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducerMethod.java
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducetMethod.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4943
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2009-11-26 14:52:28 UTC (rev 18857)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2009-11-26 15:28:37 UTC (rev 18858)
@@ -137,4 +137,13 @@
* @return "true" if this bean has @Depended scope.
*/
boolean isDependent();
+
+ /**
+ * Returns "true" if the bean is enabled. Note that implementations of some
+ * sub-interfaces of IBean like IDecorator and IInterceptor use their own
+ * mechanisms of enablement.
+ *
+ * @return "true" if the bean is enabled
+ */
+ boolean isEnabled();
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2009-11-26 14:52:28 UTC (rev 18857)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2009-11-26 15:28:37 UTC (rev 18858)
@@ -92,6 +92,16 @@
Set<IType> getStereotypes();
/**
+ * Returns the set of observers for an event which is injected by given
+ * injection point.
+ *
+ * @param injectionPoint
+ * @return the set of observers for an event which is injected by given
+ * injection point
+ */
+ Set<IObserverMethod> resolveObserverMethods(IInjectionPoint injectionPoint);
+
+ /**
* Returns the source reference to <class>...</class> element of
* <alternatives> of beans.xml. For example:
* <alternatives>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2009-11-26 14:52:28 UTC (rev 18857)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2009-11-26 15:28:37 UTC (rev 18858)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.core;
-import java.util.List;
import java.util.Set;
/**
@@ -21,25 +20,25 @@
public interface IClassBean extends IBean {
/**
- * Returns a list of producers that are declared in this bean class.
+ * Returns a set of producers that are declared in this bean class.
*
- * @return a list of producers that are declared in this bean class.
+ * @return a set of producers that are declared in this bean class.
*/
- List<IProducer> getProducers();
+ Set<IProducer> getProducers();
/**
- * Returns a list of disposer methods that are declared in this bean class.
+ * Returns a set of disposer methods that are declared in this bean class.
*
- * @return a list of disposer methods that are declared in this bean class.
+ * @return a set of disposer methods that are declared in this bean class.
*/
- List<IBeanMethod> getDisposers();
+ Set<IBeanMethod> getDisposers();
/**
- * Returns a list of bean constructor of the bean.
+ * Returns a set of bean constructor of the bean.
*
- * @return a list of bean constructor of the bean.
+ * @return a set of bean constructor of the bean.
*/
- List<IBeanMethod> getBeanConstructor();
+ Set<IBeanMethod> getBeanConstructor();
/**
* Obtains the interceptor bindings of the bean.
@@ -47,4 +46,11 @@
* @return the set of interceptor bindings
*/
Set<IInterceptorBindingDeclaration> getInterceptorBindings();
+
+ /**
+ * Returns a set of observer methods of the bean.
+ *
+ * @return a set of observer methods of the bean
+ */
+ Set<IObserverMethod> getObserverMethods();
}
\ No newline at end of file
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IObserverMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IObserverMethod.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IObserverMethod.java 2009-11-26 15:28:37 UTC (rev 18858)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+import java.util.Set;
+
+/**
+ * Represents an observer method of a bean.
+ *
+ * @author Alexey Kazakov
+ */
+public interface IObserverMethod extends IBeanMethod {
+
+ /**
+ * Returns the set of @Observes annotations of parameters of this method.
+ *
+ * @return the set of @Observes annotations of parameters of this method
+ */
+ Set<IAnnotationDeclaration> getObservesAnnotationDeclarations();
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IObserverMethod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducerMethod.java (from rev 18762, trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducetMethod.java)
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducerMethod.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducerMethod.java 2009-11-26 15:28:37 UTC (rev 18858)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+/**
+ * Represents a producer method.
+ *
+ * @author Alexey Kazakov
+ */
+public interface IProducerMethod extends IBeanMethod, IProducer {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducerMethod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducetMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducetMethod.java 2009-11-26 14:52:28 UTC (rev 18857)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducetMethod.java 2009-11-26 15:28:37 UTC (rev 18858)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.core;
-
-/**
- * Represents a producer method.
- *
- * @author Alexey Kazakov
- */
-public interface IProducetMethod extends IBeanMethod, IProducer {
-
-}
\ No newline at end of file
15 years, 1 month
JBoss Tools SVN: r18857 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-11-26 09:52:28 -0500 (Thu, 26 Nov 2009)
New Revision: 18857
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
JBIDE-5119: Refactor PageContextFactory to improve perfomance of context creation
cleanUp() methods are made due to allow the KbBuilder to clean up the cached contexts
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-11-26 14:45:04 UTC (rev 18856)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-11-26 14:52:28 UTC (rev 18857)
@@ -208,6 +208,18 @@
}
}
}
+
+ /**
+ * Cleans up the contexts for the resource change delta
+ *
+ * @param file
+ */
+ public void cleanUp(IResourceDelta delta) {
+ if(cache == null || cache.size() == 0) return;
+ if(!checkDelta(delta)) return;
+ processDelta(delta);
+ }
+
// long ctm = 0;
// String getContextType1(IFile file) {
@@ -897,10 +909,13 @@
}
}
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
+ */
public void resourceChanged(IResourceChangeEvent event) {
- if(cache == null || cache.size() == 0 || event == null || event.getDelta() == null) return;
- if(!checkDelta(event.getDelta())) return;
- processDelta(event.getDelta());
+ if(event == null || event.getDelta() == null) return;
+ cleanUp(event.getDelta());
}
private boolean checkDelta(IResourceDelta delta) {
@@ -918,13 +933,15 @@
int kind = delta.getKind();
IResource resource = delta.getResource();
- if( resource instanceof IProject && (
-// kind == IResourceDelta.CHANGED ||
-// kind == IResourceDelta.ADDED ||
- kind == IResourceDelta.REMOVED // ||
-// kind == IResourceDelta.CONTENT)
- )) {
+ if(resource instanceof IProject &&
+ kind == IResourceDelta.REMOVED) {
cleanUp((IProject)resource);
+ } else if (resource instanceof IFile && (
+ kind == IResourceDelta.CHANGED ||
+ kind == IResourceDelta.ADDED ||
+ kind == IResourceDelta.REMOVED ||
+ kind == IResourceDelta.CONTENT)) {
+ cleanUp((IFile)resource);
}
IResourceDelta[] cs = delta.getAffectedChildren();
15 years, 1 month
JBoss Tools SVN: r18856 - in trunk/smooks/docs/reference/en/images: quick_start and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: msorokin
Date: 2009-11-26 09:45:04 -0500 (Thu, 26 Nov 2009)
New Revision: 18856
Modified:
trunk/smooks/docs/reference/en/images/introduction/introduction2.png
trunk/smooks/docs/reference/en/images/quick_start/quick_start1.png
trunk/smooks/docs/reference/en/images/quick_start/quick_start2.png
trunk/smooks/docs/reference/en/images/quick_start/quick_start6.png
Log:
Modified: trunk/smooks/docs/reference/en/images/introduction/introduction2.png
===================================================================
(Binary files differ)
Modified: trunk/smooks/docs/reference/en/images/quick_start/quick_start1.png
===================================================================
(Binary files differ)
Modified: trunk/smooks/docs/reference/en/images/quick_start/quick_start2.png
===================================================================
(Binary files differ)
Modified: trunk/smooks/docs/reference/en/images/quick_start/quick_start6.png
===================================================================
(Binary files differ)
15 years, 1 month
JBoss Tools SVN: r18855 - trunk/smooks/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: msorokin
Date: 2009-11-26 09:44:01 -0500 (Thu, 26 Nov 2009)
New Revision: 18855
Modified:
trunk/smooks/docs/reference/en/modules/quick_start.xml
Log:
Modified: trunk/smooks/docs/reference/en/modules/quick_start.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/quick_start.xml 2009-11-26 14:42:02 UTC (rev 18854)
+++ trunk/smooks/docs/reference/en/modules/quick_start.xml 2009-11-26 14:44:01 UTC (rev 18855)
@@ -106,7 +106,10 @@
</imageobject>
</mediaobject>
</figure>
- <para>The second wizard page is a Smooks configuration file version choose page.Select appropriate one and click <emphasis><property>Finish</property></emphasis>.</para>
+ <para>The second wizard page is allows you to select Smooks configuration file version. Select the appropriate one and click <emphasis><property>Finish</property></emphasis> to complete the wizard.</para>
+
+
+
<!--<para> As the quick start introduces how to create/edit the Java-to-Java Smooks
configuration file, let's select the<emphasis>
<property>Java-to-Java</property>
15 years, 1 month
JBoss Tools SVN: r18854 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-11-26 09:42:02 -0500 (Thu, 26 Nov 2009)
New Revision: 18854
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
JBIDE-5119: Refactor PageContextFactory to improve perfomance of context creation
cleanUp() methods are made due to allow the KbBuilder to clean up the cached contexts
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-11-26 14:40:18 UTC (rev 18853)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-11-26 14:42:02 UTC (rev 18854)
@@ -163,6 +163,11 @@
return getInstance().createPageContext(file, null);
}
+ /**
+ * Cleans up the context for the file specified
+ *
+ * @param file
+ */
public void cleanUp(IFile file) {
if (file == null)
return;
@@ -183,6 +188,11 @@
}
}
+ /**
+ * Cleans up the contexts for the project specified
+ *
+ * @param file
+ */
public void cleanUp(IProject project) {
if (project == null)
return;
15 years, 1 month