JBoss Tools SVN: r18718 - trunk/hibernatetools/docs/reference/en/images/plugins.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-11-17 11:59:56 -0500 (Tue, 17 Nov 2009)
New Revision: 18718
Added:
trunk/hibernatetools/docs/reference/en/images/plugins/exportAsImage.png
trunk/hibernatetools/docs/reference/en/images/plugins/openMappingFile_but.png
trunk/hibernatetools/docs/reference/en/images/plugins/openSourceFile_but.png
Log:
https://jira.jboss.org/jira/browse/JBDS-921 - adding new images while updating the 'Mapping Diagram' section;
Added: trunk/hibernatetools/docs/reference/en/images/plugins/exportAsImage.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/exportAsImage.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/openMappingFile_but.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/openMappingFile_but.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/openSourceFile_but.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/openSourceFile_but.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18717 - trunk/hibernatetools/docs/reference/en/images/plugins.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-11-17 11:59:08 -0500 (Tue, 17 Nov 2009)
New Revision: 18717
Removed:
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_c.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_d.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_e.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_f.png
Log:
https://jira.jboss.org/jira/browse/JBDS-921 - deleted as unused;
Deleted: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_c.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_d.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_e.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_f.png
===================================================================
(Binary files differ)
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18716 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-11-17 11:53:02 -0500 (Tue, 17 Nov 2009)
New Revision: 18716
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5199
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-17 16:48:54 UTC (rev 18715)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2009-11-17 16:53:02 UTC (rev 18716)
@@ -1,5 +1,6 @@
FileESB101.editorTitle=JBoss ESB Editor
FileESB110.editorTitle=JBoss ESB Editor
+FileESB120.editorTitle=JBoss ESB 1.2 Editor
#ESB File
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18715 - in trunk/esb/plugins/org.jboss.tools.esb.core: src/org/jboss/tools/esb/core/model and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-11-17 11:48:54 -0500 (Tue, 17 Nov 2009)
New Revision: 18715
Modified:
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/ESBLoaderUtil.java
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/ListConverter.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5199
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-17 15:51:19 UTC (rev 18714)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-11-17 16:48:54 UTC (rev 18715)
@@ -711,6 +711,60 @@
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionSOAPProxy120">
+ <XChildrenEntities>
+ <XChildEntity name="ESBProperty"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.action" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="SOAP proxy action" 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;save=always"
+ default="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy"
+ name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;pre=true;save=always"
+ name="wsdl" xmlname="wsdl"/>
+ <XModelAttribute PROPERTIES="category=general;pre=true"
+ name="endpoint url" xmlname="endpointUrl"/>
+ <XModelAttribute PROPERTIES="category=general;pre=true" name="file" xmlname="file">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="extensions=properties"/>
+ <value name="linkAction=OpenConfig"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+ ICON="action.empty" PROPERTIES="actionpath=Open;attribute=file"
+ displayName="Open File" kind="action" name="OpenConfig"/>
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItemReference entity="ESBProperty" name="CopyActions"/>
+ <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
XMLSUBPATH="action" name="ESBPreActionSmooksAction101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
@@ -1575,6 +1629,7 @@
<XChildEntity name="ESBPreActionStaticWiretap101"/>
<XChildEntity name="ESBPreActionSOAPProcessor101"/>
<XChildEntity name="ESBPreActionSOAPClient101"/>
+ <XChildEntity name="ESBPreActionSOAPProxy120"/>
<XChildEntity name="ESBPreActionSystemPrintln101"/>
<XChildEntity name="ESBPreActionNotifier101"/>
<XChildEntity name="ESBPreActionBusinessRulesProcessor101"/>
@@ -1588,7 +1643,35 @@
<XActionItemReference entity="ESBActions101" name="AddCommandInterpreter"/>
<XActionItemReference entity="ESBActions101" name="AddGroovyProcessor"/>
<XActionItemReference entity="ESBActions101" name="Routers"/>
- <XActionItemReference entity="ESBActions101" name="SOAP"/>
+ <XActionItem displayName="SOAP" kind="list" name="SOAP">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="SOAP Processor..." kind="action" name="AddSOAPProcessor">
+ <EntityData EntityName="ESBPreActionSOAPProcessor101">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="jbossws endpoint"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="SOAP Client..." kind="action" name="AddSOAPClient">
+ <EntityData EntityName="ESBPreActionSOAPClient101">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="wsdl"/>
+ <AttributeData AttributeName="operation"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="SOAP Proxy..." kind="action" name="AddSOAPProxy">
+ <EntityData EntityName="ESBPreActionSOAPProxy120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="wsdl"/>
+ <AttributeData AttributeName="endpoint url" Mandatory="no"/>
+ <AttributeData AttributeName="file" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
<XActionItemReference entity="ESBActions101" name="AddSystemPrintln"/>
<XActionItemReference entity="ESBActions101" name="AddBusinessRulesProcessor"/>
</XActionItem>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2009-11-17 15:51:19 UTC (rev 18714)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2009-11-17 16:48:54 UTC (rev 18715)
@@ -124,20 +124,22 @@
protected Set<String> getAllowedChildren(XModelEntity entity) {
Set<String> children = super.getAllowedChildren(entity);
-
+ if(entity.getName().equals(ESBConstants.ENT_ESB_HTTP_BUS_120)) {
+ children.add(ESBConstants.XML_ATTR_PROTECTED_METHODS);
+ }
return children;
}
public boolean saveChildren(Element element, XModelObject o) {
boolean b = super.saveChildren(element, o);
- if(o.getModelEntity().getName().equals("ESBHTTPBus120")) {
+ if(o.getModelEntity().getName().equals(ESBConstants.ENT_ESB_HTTP_BUS_120)) {
checkHTTPBusDTD(element);
}
return b;
}
private void checkHTTPBusDTD(Element element) {
- Element pm = XMLUtilities.getUniqueChild(element, "protected-methods");
+ Element pm = XMLUtilities.getUniqueChild(element, ESBConstants.XML_ATTR_PROTECTED_METHODS);
if(pm == null) return;
NodeList list = element.getChildNodes();
Element reference = null;
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-17 15:51:19 UTC (rev 18714)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2009-11-17 16:48:54 UTC (rev 18715)
@@ -78,6 +78,8 @@
//message, printfull, outputstream
{"org.jboss.soa.esb.actions.BusinessRulesProcessor", "ESBPreActionBusinessRulesProcessor"},
//ruleSet, ruleLanguage, ruleReload, object-paths!
+ {"org.jboss.soa.esb.actions.soap.proxy.SOAPProxy", "ESBPreActionSOAPProxy"},
+ //wsdl, file, endpointUrl
};
public static final SpecificActionLoader instance = new SpecificActionLoader();
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2009-11-17 15:51:19 UTC (rev 18714)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2009-11-17 16:48:54 UTC (rev 18715)
@@ -58,7 +58,7 @@
basicAction.addChild(p);
}
- protected XModelObject fromAnyElement(XModelObject any, String toEntity) {
+ public static XModelObject fromAnyElement(XModelObject any, String toEntity) {
String tag = any.getAttributeValue("tag");
Map<String, String> attr = toMap(((AnyElementObjectImpl)any).getAttributes());
@@ -101,7 +101,7 @@
return a;
}
- protected XModelObject toAnyElement(XModelObject specific, int index) {
+ public static XModelObject toAnyElement(XModelObject specific, int index) {
XModelObject t = specific.getModel().createModelObject("AnyElement", null);
t.setAttributeValue("tag", specific.getModelEntity().getXMLSubPath());
StringBuffer sb = new StringBuffer();
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18714 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-11-17 10:51:19 -0500 (Tue, 17 Nov 2009)
New Revision: 18714
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5183/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5183/a.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5183/opened.html
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5183
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html 2009-11-17 15:25:00 UTC (rev 18713)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html 2009-11-17 15:51:19 UTC (rev 18714)
@@ -9,5 +9,6 @@
<a href="jsf2test/pages/components/body2.xhtml">h:body (2st)</a><br>
<a href="jsf2test/pages/components/outputScript.xhtml">h:outputScript</a><br>
<a href="jsf2test/pages/components/outputStylesheet.xhtml">h:outputStylesheet</a><br>
+ <a href="jsf2test/pages/JBIDE/5135/jbide5135.xhtml">Resource Test Page</a><br>
</body>
</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5183/a.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5183/a.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5183/a.html 2009-11-17 15:51:19 UTC (rev 18714)
@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+<head></head>
+<body>
+<a href="opened.html"><span>Click to open page</span></a>
+</body>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5183/opened.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5183/opened.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5183/opened.html 2009-11-17 15:51:19 UTC (rev 18714)
@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+<head></head>
+<body>
+<h1>Test Page</h1>
+</body>
+</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2009-11-17 15:25:00 UTC (rev 18713)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2009-11-17 15:51:19 UTC (rev 18714)
@@ -244,4 +244,22 @@
assertEquals("jsp-include.jsp file should be opened","jsp-include.jsp", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
}
+ /**
+ * Test open on for <a href="pageName" >Link Text</>
+ * https://jira.jboss.org/jira/browse/JBIDE-5183
+ * @throws CoreException
+ *
+ * @author mareshkau
+ */
+
+ public void testOpenOnForHREF() throws CoreException {
+ VpeController vpeController = openInVpe(JsfAllTests.IMPORT_PROJECT_NAME, "JBIDE/5183/a.html"); //$NON-NLS-1$
+ int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 5, 41);
+ Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
+ nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
+ vpeController.getSourceBuilder().openOn(domNode);
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("File should be opened","opened.html", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2009-11-17 15:25:00 UTC (rev 18713)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2009-11-17 15:51:19 UTC (rev 18714)
@@ -7,7 +7,7 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.vpe.editor;
import java.util.HashSet;
@@ -41,6 +41,7 @@
import org.jboss.tools.vpe.editor.selection.VpeSelectionHelper;
import org.jboss.tools.vpe.editor.template.VpeTemplate;
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
+import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.NodesManagingUtil;
import org.jboss.tools.vpe.editor.util.TextUtil;
import org.mozilla.interfaces.nsIDOMElement;
@@ -58,14 +59,16 @@
IDOMModel model;
private Document sourceDocument;
private VpePageContext pageContext;
- private StructuredTextEditor sourceEditor;
-
- public VpeSourceDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter, VpeTemplateManager templateManager, StructuredTextEditor sourceEditor, VpePageContext pageContext) {
+ private StructuredTextEditor sourceEditor;
+
+ public VpeSourceDomBuilder(VpeDomMapping domMapping,
+ INodeAdapter sorceAdapter, VpeTemplateManager templateManager,
+ StructuredTextEditor sourceEditor, VpePageContext pageContext) {
super(domMapping, sorceAdapter);
this.sourceEditor = sourceEditor;
structuredTextViewer = sourceEditor.getTextViewer();
selectionManager = sourceEditor.getSelectionProvider();
- model = (IDOMModel)sourceEditor.getModel();
+ model = (IDOMModel) sourceEditor.getModel();
if (model != null) {
sourceDocument = model.getDocument();
}
@@ -76,7 +79,9 @@
nsIDOMNode visualContainer = visualNode.getParentNode();
Node sourceContainer = domMapping.getSourceNode(visualContainer);
- if (sourceContainer != null && (sourceContainer.getNodeType() == Node.ELEMENT_NODE || sourceContainer.getNodeType() == Node.DOCUMENT_NODE)) {
+ if (sourceContainer != null
+ && (sourceContainer.getNodeType() == Node.ELEMENT_NODE || sourceContainer
+ .getNodeType() == Node.DOCUMENT_NODE)) {
nsIDOMNode visualNextNode = visualNode.getNextSibling();
Node sourceNextNode = domMapping.getSourceNode(visualNextNode);
addNode(visualNode, sourceNextNode, sourceContainer);
@@ -91,7 +96,8 @@
sourceContainer.removeChild(sourceNode);
getSourceNodes().remove(sourceNode);
if (sourceNode instanceof INodeNotifier) {
- ((INodeNotifier) sourceNode).removeAdapter(getSorceAdapter());
+ ((INodeNotifier) sourceNode)
+ .removeAdapter(getSorceAdapter());
}
domMapping.remove(sourceNode);
}
@@ -104,136 +110,154 @@
}
}
}
-
+
public void setText(nsIDOMNode visualText) {
Node sourceText = domMapping.getSourceNode(visualText);
if (sourceText != null) {
- sourceText.setNodeValue(TextUtil.sourceText(visualText.getNodeValue()));
+ sourceText.setNodeValue(TextUtil.sourceText(visualText
+ .getNodeValue()));
} else {
nsIDOMNode visualParent = visualText.getParentNode();
if (visualParent != null) {
Node sourceParent = domMapping.getNearSourceNode(visualText);
if (sourceParent != null) {
if (sourceParent.getNodeType() == Node.ELEMENT_NODE) {
- VpeElementMapping elementMapping = (VpeElementMapping)domMapping.getNodeMapping(sourceParent);
+ VpeElementMapping elementMapping = (VpeElementMapping) domMapping
+ .getNodeMapping(sourceParent);
if (elementMapping != null) {
VpeTemplate template = elementMapping.getTemplate();
- template.setSourceAttributeValue(pageContext, (Element)sourceParent, elementMapping.getData());
+ template.setSourceAttributeValue(pageContext,
+ (Element) sourceParent, elementMapping
+ .getData());
}
} else if (sourceParent.getNodeType() == Node.COMMENT_NODE) {
setComment(sourceParent, visualParent);
-// VpeElementMapping elementMapping = (VpeElementMapping)domMapping.getNodeMapping(sourceParent);
-// if (elementMapping != null) {
-// VpeTemplate template = elementMapping.getTemplate();
-// template.setSourceCommentValue(pageContext, (Comment)sourceParent, elementMapping.getData());
-// }
+ // VpeElementMapping elementMapping =
+ // (VpeElementMapping)domMapping.getNodeMapping(sourceParent);
+ // if (elementMapping != null) {
+ // VpeTemplate template = elementMapping.getTemplate();
+ // template.setSourceCommentValue(pageContext,
+ // (Comment)sourceParent, elementMapping.getData());
+ // }
}
}
}
}
}
-
+
public void setSelectedRange(Node sourceNode, int start, int length) {
-//glory
+ // glory
structuredTextViewer.setSelectedRange(start, length);
structuredTextViewer.revealRange(start, length);
-// ISelection selection = new StructuredSelection(sourceNode);
-// SelectionChangedEvent event = new SelectionChangedEvent(outline, selection);
-// selectionManager.selectionChanged(event);
-// selectionManager.setSelection(new TextSelection(start, length));
+ // ISelection selection = new StructuredSelection(sourceNode);
+ // SelectionChangedEvent event = new SelectionChangedEvent(outline,
+ // selection);
+ // selectionManager.selectionChanged(event);
+ // selectionManager.setSelection(new TextSelection(start, length));
}
-
+
public void setSelectChanged(Node sourceNode) {
-// structuredTextViewer.setSelectedRange(start, length);
-// structuredTextViewer.revealRange(start, length);
-
-//glory
-// ISelection selection = new StructuredSelection(sourceNode);
-// SelectionChangedEvent event = new SelectionChangedEvent(outline, selection);
-// selectionManager.selectionChanged(event);
- if(sourceNode instanceof IDOMNode) {
- IDOMNode n = (IDOMNode)sourceNode;
+ // structuredTextViewer.setSelectedRange(start, length);
+ // structuredTextViewer.revealRange(start, length);
+
+ // glory
+ // ISelection selection = new StructuredSelection(sourceNode);
+ // SelectionChangedEvent event = new SelectionChangedEvent(outline,
+ // selection);
+ // selectionManager.selectionChanged(event);
+ if (sourceNode instanceof IDOMNode) {
+ IDOMNode n = (IDOMNode) sourceNode;
int start = n.getStartOffset();
int length = n.getLength();
selectionManager.setSelection(new TextSelection(start, length));
}
}
-
+
void setSelectionAtDocumentEnd() {
- if (sourceDocument == null) return;
- int offset = ((IndexedRegion)sourceDocument).getEndOffset();
+ if (sourceDocument == null)
+ return;
+ int offset = ((IndexedRegion) sourceDocument).getEndOffset();
structuredTextViewer.setSelectedRange(offset, 0);
structuredTextViewer.revealRange(offset, 0);
}
-
+
public void setSelection(Node sourceNode, int offset, int length) {
setSelection(sourceNode, offset, length, false);
}
-
+
void setSelection(Node sourceNode, int offset, int length, boolean innerFlag) {
if (sourceNode != null) {
- int start = ((IndexedRegion)sourceNode).getStartOffset() + offset;
+ int start = ((IndexedRegion) sourceNode).getStartOffset() + offset;
if (innerFlag && offset == 0 && sourceNode instanceof ElementImpl) {
- ElementImpl element = (ElementImpl)sourceNode;
- if (element.isContainer()) {
- start = element.getStartEndOffset();
- length = 0;
- }
+ ElementImpl element = (ElementImpl) sourceNode;
+ if (element.isContainer()) {
+ start = element.getStartEndOffset();
+ length = 0;
+ }
} else if (sourceNode.getNodeType() == Node.COMMENT_NODE) {
start += 4;
}
-//glory
-// ISelection selection = new StructuredSelection(sourceNode);
-// SelectionChangedEvent event = new SelectionChangedEvent(outline, selection);
-// selectionManager.selectionChanged(event);
+ // glory
+ // ISelection selection = new StructuredSelection(sourceNode);
+ // SelectionChangedEvent event = new SelectionChangedEvent(outline,
+ // selection);
+ // selectionManager.selectionChanged(event);
structuredTextViewer.setSelectedRange(start, length);
structuredTextViewer.revealRange(start, length);
-// selectionManager.setSelection(new TextSelection(start, length));
+ // selectionManager.setSelection(new TextSelection(start, length));
}
}
-
+
Node getSelectedNode() {
- List nodes = VpeSelectionHelper.getTextWidgetSelectedNodes(model, selectionManager);
- //selectionManager.getSelectedNodes();
+ List nodes = VpeSelectionHelper.getTextWidgetSelectedNodes(model,
+ selectionManager);
+ // selectionManager.getSelectedNodes();
if (nodes != null && nodes.size() > 0) {
- return (Node)nodes.get(0);
+ return (Node) nodes.get(0);
} else {
return null;
}
}
-
+
int getCaretPosition() {
-// return selectionManager.getCaretPosition();
- ITextViewer v = (sourceEditor == null) ? null : sourceEditor.getTextViewer();
- StyledText t = (v == null) ? null : v.getTextWidget();
+ // return selectionManager.getCaretPosition();
+ ITextViewer v = (sourceEditor == null) ? null : sourceEditor
+ .getTextViewer();
+ StyledText t = (v == null) ? null : v.getTextWidget();
return (t == null) ? 0 : t.getCaretOffset();
}
-
- private void addNode(nsIDOMNode visualNewNode, Node sourceNextNode, Node sourceContainer) {
+
+ private void addNode(nsIDOMNode visualNewNode, Node sourceNextNode,
+ Node sourceContainer) {
Node sourceNewNode = createNode(visualNewNode);
if (sourceNewNode != null) {
if (sourceNextNode == null) {
sourceContainer.appendChild(sourceNewNode);
} else {
- sourceContainer.insertBefore(sourceNewNode, sourceNextNode);
+ sourceContainer.insertBefore(sourceNewNode, sourceNextNode);
}
}
}
-
+
private Node createNode(nsIDOMNode visualNewNode) {
if (sourceDocument != null) {
switch (visualNewNode.getNodeType()) {
case Node.ELEMENT_NODE:
- Element sourceNewElement = sourceDocument.createElement(visualNewNode.getNodeName());
+ Element sourceNewElement = sourceDocument
+ .createElement(visualNewNode.getNodeName());
Set ifDependencySet = new HashSet();
- //VpeVisualDomBuilder visualBuildet =
- pageContext.getVisualBuilder();
- VpeTemplate template = getTemplateManager().getTemplate(pageContext, sourceNewElement, ifDependencySet);
- registerNodes(new VpeElementMapping(sourceNewElement, (nsIDOMElement)visualNewNode, null, template, ifDependencySet, null));
+ // VpeVisualDomBuilder visualBuildet =
+ pageContext.getVisualBuilder();
+ VpeTemplate template = getTemplateManager().getTemplate(
+ pageContext, sourceNewElement, ifDependencySet);
+ registerNodes(new VpeElementMapping(sourceNewElement,
+ (nsIDOMElement) visualNewNode, null, template,
+ ifDependencySet, null));
addChildren(visualNewNode, sourceNewElement);
return sourceNewElement;
case Node.TEXT_NODE:
- Node sourceTextNode = sourceDocument.createTextNode(visualNewNode.getNodeValue());
+ Node sourceTextNode = sourceDocument
+ .createTextNode(visualNewNode.getNodeValue());
registerNodes(new VpeNodeMapping(sourceTextNode, visualNewNode));
return sourceTextNode;
}
@@ -250,43 +274,70 @@
addNode(visualNode, null, sourceContainer);
}
}
-
+
/**
*
- *This method calls when openOn event occures in
- *visual part of VPE
+ *This method calls when openOn event occures in visual part of VPE
*
- * @param visualNode - node on which event has occured
+ * @param visualNode
+ * - node on which event has occured
*
* @author mareshkau
*/
-
+
public void openOn(nsIDOMNode visualNode) {
-
- VpeNodeMapping nodeMapping = NodesManagingUtil.getNodeMapping(
+ if (!openOnOnVisualNode(visualNode)) {
+ // fir for JBIDE-5183, openon for href.
+ // added by mareshkau, here we search for <a> and try to open on on
+ // href attribute
+ nsIDOMNode node = visualNode.getParentNode();
+ while (node != null) {
+ if (HTML.TAG_A.equalsIgnoreCase(node.getNodeName())) {
+ openOnOnVisualNode(node);
+ break;
+ }
+ node = node.getParentNode();
+ }
+ }
+ }
+
+ /**
+ * method which makes openon for visual node
+ * @param visualNode
+ * @return true if openOn was successfull
+ * false otherwise
+ */
+ private boolean openOnOnVisualNode(nsIDOMNode visualNode) {
+ VpeNodeMapping nodeMapping = NodesManagingUtil.getNodeMapping(
this.domMapping, visualNode);
- if (nodeMapping != null
- && nodeMapping instanceof VpeElementMapping) {
+ if (nodeMapping != null && nodeMapping instanceof VpeElementMapping) {
- VpeElementMapping elementMapping = (VpeElementMapping) nodeMapping;
- VpeTemplate template = elementMapping.getTemplate();
- IRegion regionForOpenOn = template.getSourceRegionForOpenOn(this.pageContext, elementMapping.getSourceNode(), visualNode);
- IHyperlinkDetector [] hyperlinkDetectors = ((JSPTextEditor)this.sourceEditor).getHyperlinkDetectors();
- IHyperlink [] hyperLinks = null;
+ VpeElementMapping elementMapping = (VpeElementMapping) nodeMapping;
+ VpeTemplate template = elementMapping.getTemplate();
+ IRegion regionForOpenOn = template.getSourceRegionForOpenOn(
+ this.pageContext, elementMapping.getSourceNode(),
+ visualNode);
+ IHyperlinkDetector[] hyperlinkDetectors = ((JSPTextEditor) this.sourceEditor)
+ .getHyperlinkDetectors();
+ IHyperlink[] hyperLinks = null;
for (IHyperlinkDetector iHyperlinkDetector : hyperlinkDetectors) {
- hyperLinks = iHyperlinkDetector.detectHyperlinks(this.sourceEditor.getTextViewer(), regionForOpenOn, true);
- if(hyperLinks!=null && hyperLinks.length>0 && hyperLinks[0] instanceof AbstractHyperlink) {
+ hyperLinks = iHyperlinkDetector.detectHyperlinks(
+ this.sourceEditor.getTextViewer(), regionForOpenOn,
+ true);
+ if (hyperLinks != null && hyperLinks.length > 0
+ && hyperLinks[0] instanceof AbstractHyperlink) {
AbstractHyperlink abstractHyperlink = (AbstractHyperlink) hyperLinks[0];
abstractHyperlink.open();
- return;
+ return true;
}
}
- }
+ }
+ return false;
}
-
-
+
boolean isEmptyDocument() {
- if (sourceDocument == null) return true;
+ if (sourceDocument == null)
+ return true;
boolean empty = false;
NodeList sourceNodes = sourceDocument.getChildNodes();
int len = sourceNodes.getLength();
@@ -294,37 +345,38 @@
empty = true;
} else if (len == 1) {
Node sourceNode = sourceNodes.item(0);
- if (sourceNode.getNodeType() == Node.TEXT_NODE && sourceNode.getNodeValue().trim().length() == 0) {
+ if (sourceNode.getNodeType() == Node.TEXT_NODE
+ && sourceNode.getNodeValue().trim().length() == 0) {
empty = true;
}
}
return empty;
}
-
+
int getPosition(Node sourceNode, int offset, boolean innerFlag) {
int start = 0;
if (sourceNode != null) {
- start = ((IndexedRegion)sourceNode).getStartOffset() + offset;
+ start = ((IndexedRegion) sourceNode).getStartOffset() + offset;
if (innerFlag && offset == 0 && sourceNode instanceof ElementImpl) {
- ElementImpl element = (ElementImpl)sourceNode;
- if (element.isContainer()) {
- start = element.getStartEndOffset();
- }
+ ElementImpl element = (ElementImpl) sourceNode;
+ if (element.isContainer()) {
+ start = element.getStartEndOffset();
+ }
}
}
return start;
}
-
+
void setAttributeSelection(nsIDOMNode visualText, int offset, int length) {
nsIDOMNode visualParent = visualText.getParentNode();
if (visualParent != null) {
Node sourceParent = domMapping.getNearSourceNode(visualText);
if (sourceParent != null) {
if (sourceParent.getNodeType() == Node.ELEMENT_NODE) {
-
+
VpeElementMapping elementMapping = (VpeElementMapping) domMapping
.getNodeMapping(sourceParent);
-
+
if (elementMapping != null) {
VpeTemplate template = elementMapping.getTemplate();
@@ -334,28 +386,32 @@
elementMapping.getData());
}
} else if (sourceParent.getNodeType() == Node.COMMENT_NODE) {
-// VpeVisualElementInfo info = domMapping.getVisualElementInfo(sourceParent);
-// if (info != null) {
-// info.setSourceCommentValue(pageContext, (Comment)sourceParent);
-// }
- //Added by Max Areshkau in scope of bug JBIDE-1209
- } else {
+ // VpeVisualElementInfo info =
+ // domMapping.getVisualElementInfo(sourceParent);
+ // if (info != null) {
+ // info.setSourceCommentValue(pageContext,
+ // (Comment)sourceParent);
+ // }
+ // Added by Max Areshkau in scope of bug JBIDE-1209
+ } else {
String text = sourceParent.getNodeValue();
- int start= TextUtil.sourcePosition(text, visualText.getNodeValue(), offset);
- int end =TextUtil.sourcePosition(text, visualText.getNodeValue(), offset+length);
- offset=start;
- length=end-start;
+ int start = TextUtil.sourcePosition(text, visualText
+ .getNodeValue(), offset);
+ int end = TextUtil.sourcePosition(text, visualText
+ .getNodeValue(), offset + length);
+ offset = start;
+ length = end - start;
setSelection(sourceParent, offset, length);
}
}
}
}
-
-// boolean
-
+
+ // boolean
+
public void setAttributeSelection(Attr sourceAttr, int offset, int length) {
- IDOMAttr xmlAttr = (IDOMAttr)sourceAttr;
+ IDOMAttr xmlAttr = (IDOMAttr) sourceAttr;
int start = xmlAttr.getValueRegionStartOffset() + offset;
String value = xmlAttr.getValueRegionText();
if (value.startsWith("\"") || value.startsWith("\'")) { //$NON-NLS-1$ //$NON-NLS-2$
@@ -368,24 +424,26 @@
if (start + length > end) {
length = end - start;
}
-
-//glory
-// ISelection selection = new StructuredSelection(sourceAttr);
-// SelectionChangedEvent event = new SelectionChangedEvent(outline, selection);
-// selectionManager.selectionChanged(event);
+
+ // glory
+ // ISelection selection = new StructuredSelection(sourceAttr);
+ // SelectionChangedEvent event = new SelectionChangedEvent(outline,
+ // selection);
+ // selectionManager.selectionChanged(event);
structuredTextViewer.setSelectedRange(start, length);
structuredTextViewer.revealRange(start, length);
-
-// selectionManager.setSelection(new TextSelection(start, length));
+
+ // selectionManager.setSelection(new TextSelection(start, length));
}
-
+
Point getOutputAttributesPositions(Element sourceElement) {
- VpeElementMapping elementMapping = (VpeElementMapping)domMapping.getNodeMapping(sourceElement);
+ VpeElementMapping elementMapping = (VpeElementMapping) domMapping
+ .getNodeMapping(sourceElement);
if (elementMapping != null) {
VpeTemplate template = elementMapping.getTemplate();
if (template.isOutputAttributes()) {
- int start = ((IndexedRegion)sourceElement).getStartOffset();
- int end = ((IndexedRegion)sourceElement).getEndOffset();
+ int start = ((IndexedRegion) sourceElement).getStartOffset();
+ int end = ((IndexedRegion) sourceElement).getEndOffset();
return new Point(start, end);
}
}
@@ -395,13 +453,13 @@
public Point getSelectionRange() {
return sourceEditor.getTextViewer().getSelectedRange();
}
-
+
public void setComment(Node sourceComment, nsIDOMNode visualElement) {
nsIDOMNodeList visualNodes = visualElement.getChildNodes();
long len = visualNodes.getLength();
-
+
if (len > 0) {
- nsIDOMNode visualText = visualNodes.item(0);
+ nsIDOMNode visualText = visualNodes.item(0);
sourceComment.setNodeValue(visualText.getNodeValue());
}
}
@@ -409,7 +467,7 @@
public StructuredTextViewer getStructuredTextViewer() {
return structuredTextViewer;
}
-
+
public Document getSourceDocument() {
return sourceDocument;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2009-11-17 15:25:00 UTC (rev 18713)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2009-11-17 15:51:19 UTC (rev 18714)
@@ -559,8 +559,9 @@
file = ((Element)sourceNode).getAttributeNode("file"); //$NON-NLS-1$
} else if ("jsp:include".equals(sourceNode.getNodeName())) { //$NON-NLS-1$
file = ((Element)sourceNode).getAttributeNode("page"); //$NON-NLS-1$
+ } else if(HTML.TAG_A.equalsIgnoreCase(sourceNode.getNodeName())) {
+ file = ((Element)sourceNode).getAttributeNode(HTML.ATTR_HREF);
}
-
if(file!=null) {
return new Region(NodesManagingUtil.getStartOffsetNode(file),0);
}
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18713 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-11-17 10:25:00 -0500 (Tue, 17 Nov 2009)
New Revision: 18713
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5199
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java 2009-11-17 14:42:02 UTC (rev 18712)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java 2009-11-17 15:25:00 UTC (rev 18713)
@@ -15,6 +15,7 @@
import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.meta.action.*;
import org.jboss.tools.common.meta.impl.*;
+import org.jboss.tools.common.model.XModelObjectConstants;
public class XActionListImpl extends XActionItemImpl implements XActionList {
private XActionItem[] items;
@@ -109,15 +110,18 @@
} else if(XMODEL_ACTION_ITEM_REF.equals(tag)) {
String entityName = ei.getAttribute(XMetaDataConstants.ENTITY);
String attrName = ei.getAttribute(NAME);
+ String defaultPath = (getPath() == null) ? attrName : getPath() + XModelObjectConstants.SEPARATOR + attrName;
String path = ei.hasAttribute("path") //$NON-NLS-1$
? ei.getAttribute("path") //$NON-NLS-1$
- : attrName;
+ : defaultPath;
XModelEntity entity = getMetaModel().getEntity(entityName);
if(entity != null) {
XActionItem item = ((XActionListImpl)entity.getActionList()).findItem(path);
if(item != null) {
list.add(item.copy(Acceptor.DEFAULT));
+ } else {
+// System.out.println("Cannot find path " + path);
}
}
}
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18712 - 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-17 09:42:02 -0500 (Tue, 17 Nov 2009)
New Revision: 18712
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-17 14:41:29 UTC (rev 18711)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2009-11-17 14:42:02 UTC (rev 18712)
@@ -82,12 +82,20 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyAction") //$NON-NLS-1$
);
+ static IFormData ESB_ACTION_120_LIST_DEFINITION = new FormData(
+ "Actions", //$NON-NLS-1$
+ ModelFormLayoutData.EMPTY_DESCRIPTION,
+ new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)},
+ getActionEntities(ENT_ESB_ACTIONS_120),
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyAction") //$NON-NLS-1$
+ );
+
static IFormData ESB_ACTION_SUB_LIST_DEFINITION = new FormData(
"Actions", //$NON-NLS-1$
ModelFormLayoutData.EMPTY_DESCRIPTION,
"Actions", //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)},
- new String[]{ENT_ESB_ACTION},
+ new String[]{ENT_ESB_ACTION,ENT_ESB_ACTION_120},
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAction") //$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-17 14:41:29 UTC (rev 18711)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2009-11-17 14:42:02 UTC (rev 18712)
@@ -85,6 +85,8 @@
list.add(ESBListsFormLayoutData.ESB_ACTION_101_LIST_DEFINITION);
} else if(entityName.equals(ENT_ESB_ACTIONS_110)) {
list.add(ESBListsFormLayoutData.ESB_ACTION_110_LIST_DEFINITION);
+ } else if(entityName.equals(ENT_ESB_ACTIONS_120)) {
+ list.add(ESBListsFormLayoutData.ESB_ACTION_120_LIST_DEFINITION);
} else if(entityName.startsWith(ENT_ESB_SERVICES)) {
list.add(ESBListsFormLayoutData.ESB_SERVICE_LIST_DEFINITION);
} else if(entityName.startsWith(ENT_ESB_SERVICE)) {
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18711 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/meta and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-11-17 09:41:29 -0500 (Tue, 17 Nov 2009)
New Revision: 18711
Added:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenESBResourceHandler.java
Removed:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenSmooksConfigHandler.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5199
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2009-11-16 22:50:05 UTC (rev 18710)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2009-11-17 14:41:29 UTC (rev 18711)
@@ -35,8 +35,8 @@
class="org.jboss.tools.esb.core.model.handlers.AddProviderSupport"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport"
class="org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport"/>
- <xclass id="org.jboss.tools.esb.core.model.handlers.OpenSmooksConfigHandler"
- class="org.jboss.tools.esb.core.model.handlers.OpenSmooksConfigHandler"/>
+ <xclass id="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+ class="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"/>
</extension>
@@ -55,6 +55,9 @@
name="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..."
uri="platform:/plugin/org.jboss.tools.esb.core/schemas/jbossesb-1.1.0.xsd"/>
+ <uri
+ name="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..."
+ uri="platform:/plugin/org.jboss.tools.esb.core/schemas/jbossesb-1.2.0.xsd"/>
</catalogContribution>
</extension>
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-16 22:50:05 UTC (rev 18710)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-11-17 14:41:29 UTC (rev 18711)
@@ -778,8 +778,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem
- HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenSmooksConfigHandler"
- ICON="action.empty" PROPERTIES="actionpath=Open"
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+ ICON="action.empty"
+ PROPERTIES="actionpath=Open;attribute=smooks config"
displayName="Open Config" kind="action" name="OpenConfig"/>
<XActionItem kind="list" name="CreateActions"/>
<XActionItemReference entity="ESBProperty" name="CopyActions"/>
@@ -1555,4 +1556,43 @@
</XActionItem>
</XActionItem>
</XEntityExtension>
+ <XEntityExtension name="ESBActions120">
+ <XChildrenEntities>
+ <XChildEntity name="ESBPreActionByteArrayToString101"/>
+ <XChildEntity name="ESBPreActionLongToDateConverter101"/>
+ <XChildEntity name="ESBPreActionObjectInvoke101"/>
+ <XChildEntity name="ESBPreActionObjectToCSVString101"/>
+ <XChildEntity name="ESBPreActionObjectToXStream101"/>
+ <XChildEntity name="ESBPreActionSmooksAction101"/>
+ <XChildEntity name="ESBPreActionSmooksTransformer101"/>
+ <XChildEntity name="ESBPreActionMessagePersister101"/>
+ <XChildEntity name="ESBPreActionXStreamToObject101"/>
+ <XChildEntity name="ESBPreActionCommandInterpreter101"/>
+ <XChildEntity name="ESBPreActionGroovyProcessor101"/>
+ <XChildEntity name="ESBPreActionAggregator101"/>
+ <XChildEntity name="ESBPreActionContentBasedRouter101"/>
+ <XChildEntity name="ESBPreActionStaticRouter101"/>
+ <XChildEntity name="ESBPreActionStaticWiretap101"/>
+ <XChildEntity name="ESBPreActionSOAPProcessor101"/>
+ <XChildEntity name="ESBPreActionSOAPClient101"/>
+ <XChildEntity name="ESBPreActionSystemPrintln101"/>
+ <XChildEntity name="ESBPreActionNotifier101"/>
+ <XChildEntity name="ESBPreActionBusinessRulesProcessor101"/>
+ </XChildrenEntities>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem displayName="Add Pre-Packed Action" kind="list" name="PrePackedAction">
+ <XActionItemReference entity="ESBActions101" name="AddObjectInvoke"/>
+ <XActionItemReference entity="ESBActions101" name="Converters"/>
+ <XActionItemReference entity="ESBActions101" name="AddCommandInterpreter"/>
+ <XActionItemReference entity="ESBActions101" name="AddGroovyProcessor"/>
+ <XActionItemReference entity="ESBActions101" name="Routers"/>
+ <XActionItemReference entity="ESBActions101" name="SOAP"/>
+ <XActionItemReference entity="ESBActions101" name="AddSystemPrintln"/>
+ <XActionItemReference entity="ESBActions101" name="AddBusinessRulesProcessor"/>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XEntityExtension>
</XModelEntityGroup>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta 2009-11-16 22:50:05 UTC (rev 18710)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta 2009-11-17 14:41:29 UTC (rev 18711)
@@ -126,6 +126,166 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="role" name="ESBAllowedRole120">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.action" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="role" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="name" xmlname="name"/>
+ <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"/>
+ <XActionItemReference entity="ESBProperty" name="CopyActions"/>
+ <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;saveDefault=false"
+ XMLSUBPATH="allowed-roles" name="ESBAllowedRoles120">
+ <XChildrenEntities>
+ <XChildEntity name="ESBAllowedRole120"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.providers" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="allowed roles" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true"
+ default="Allowed Roles" name="name" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem displayName="New" group="1" kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Role..." kind="action" name="AddRole">
+ <EntityData EntityName="ESBAllowedRole120">
+ <AttributeData AttributeName="name"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItemReference entity="ESBProviders101" name="DeleteActions" path="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;saveDefault=false"
+ XMLSUBPATH="asyncResponse" name="ESBAsyncResponse120">
+ <XChildrenEntities>
+ <XChildEntity name="ESBPayload120"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.providers" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="async response" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true"
+ default="Async Response" name="name" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="status code" xmlname="statusCode"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem displayName="New" group="1" kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Payload..." kind="action" name="AddPayload">
+ <EntityData EntityName="ESBPayload120">
+ <AttributeData AttributeName="classpath resource"/>
+ <AttributeData AttributeName="content type"/>
+ <AttributeData AttributeName="character encoding" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItemReference entity="ESBProviders101" name="DeleteActions" path="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;saveDefault=false"
+ XMLSUBPATH="exception" name="ESBException120">
+ <XChildrenEntities>
+ <XChildEntity name="ESBMapping120"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.providers" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="exception" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true"
+ default="Exception" name="name" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="mappings file" xmlname="mappingsFile">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="extensions=properties"/>
+ <value name="linkAction=OpenMapping"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+ ICON="action.empty"
+ PROPERTIES="actionpath=Open;attribute=mappings file"
+ displayName="Open Mapping File" kind="action" name="OpenMapping"/>
+ <XActionItem displayName="New" group="1" kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Mapping..." kind="action" name="AddMapping">
+ <EntityData EntityName="ESBMapping120">
+ <AttributeData AttributeName="class"/>
+ <AttributeData AttributeName="status"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItemReference entity="ESBProviders101" name="DeleteActions" path="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;saveDefault=false"
XMLSUBPATH="globals" name="ESBGlobals120">
@@ -160,6 +320,7 @@
XMLSUBPATH="http-bus" name="ESBHTTPBus120">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
+ <XChildEntity maxCount="1" name="ESBAllowedRoles120" required="yes"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -172,8 +333,27 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="id" xmlname="busid"/>
- <XModelAttribute PROPERTIES="category=general;save=always"
- name="context" xmlname="context"/>
+ <XModelAttribute PROPERTIES="category=general;separator=comma"
+ name="protected methods" xmlname="protected-methods">
+ <Constraint loader="ListString">
+ <value name="GET"/>
+ <value name="POST"/>
+ <value name="PUT"/>
+ <value name="DELETE"/>
+ <value name="HEAD"/>
+ </Constraint>
+ <Editor name="ListAdd"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general"
+ name="transport guarantee" xmlname="transportGuarantee">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="NONE"/>
+ <value name="INTEGRAL"/>
+ <value name="CONFIDENTIAL"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -195,6 +375,8 @@
XMLSUBPATH="http-gateway" name="ESBHTTPGateway120">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
+ <XChildEntity maxCount="1" name="ESBException120" required="yes"/>
+ <XChildEntity maxCount="1" name="ESBAsyncResponse120" required="yes"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -202,12 +384,20 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="http listener" loader="ElementType" name="element type">
+ <XModelAttribute default="http gateway" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttributeReference
- attributes="name,channel id ref,max threads,is gateway"
+ <XModelAttributeReference attributes="name,channel id ref"
entity="ESBListener101" name="listener"/>
+ <XModelAttribute PROPERTIES="category=general" name="url pattern" xmlname="urlPattern"/>
+ <XModelAttribute PROPERTIES="category=general" name="payload as" xmlname="payloadAs">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="STRING"/>
+ <value name="BYTES"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -230,7 +420,8 @@
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
<XChildEntity name="ESBBus"/>
- <XChildEntity name="ESBHTTPBus110"/>
+ <XChildEntity name="ESBHTTPBus120"/>
+ <XChildEntity maxCount="1" name="ESBException120" required="yes"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -243,12 +434,6 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="name" xmlname="name"/>
- <XModelAttribute PROPERTIES="category=general;save=always"
- name="host" xmlname="host"/>
- <XModelAttribute PROPERTIES="category=general;save=always"
- name="port" xmlname="port">
- <Constraint loader="%IntEL%"/>
- </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -260,7 +445,7 @@
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="HTTP Bus..." kind="action" name="AddBus">
- <EntityData EntityName="ESBHTTPBus110">
+ <EntityData EntityName="ESBHTTPBus120">
<AttributeData AttributeName="id"/>
</EntityData>
</XActionItem>
@@ -397,40 +582,54 @@
<XActionItem kind="list">
<XActionItem ICON="action.empty" displayName="New" group="1"
kind="list" name="CreateActions">
- <XActionItemReference entity="ESBListeners101" name="AddListener" path="CreateActions/AddListener"/>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Listener..." kind="action" name="AddListener">
+ <EntityData EntityName="ESBListener120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="channel id ref" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
<XActionItemReference entity="ESBListeners101"
name="AddScheduledListener" path="CreateActions/AddScheduledListener"/>
- <XActionItemReference entity="ESBListeners101" name="AddJCAGateway" path="CreateActions/AddJCAGateway"/>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="JCA Gateway..." kind="action" name="AddJCAGateway">
+ <EntityData EntityName="ESBJCAGateway120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="adapter"/>
+ <AttributeData AttributeName="endpoint class"/>
+ </EntityData>
+ </XActionItem>
<XActionItemReference entity="ESBListeners101" name="AddJMSListener" path="CreateActions/AddJMSListener"/>
<XActionItemReference entity="ESBListeners101" name="AddFSListener" path="CreateActions/AddFSListener"/>
<XActionItemReference entity="ESBListeners101" name="AddFTPListener" path="CreateActions/AddFTPListener"/>
- <XActionItemReference entity="ESBListeners101" name="AddSQLListener" path="CreateActions/AddSQLListener"/>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="SQL Listener..." kind="action" name="AddSQLListener">
+ <EntityData EntityName="ESBSQLListener120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="channel id ref" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
<XActionItemReference entity="ESBListeners101"
name="AddHibernateListener" path="CreateActions/AddHibernateListener"/>
<XActionItemReference entity="ESBListeners101" name="AddJBRListener" path="CreateActions/AddJBRListener"/>
<XActionItemReference entity="ESBListeners101"
name="AddGroovyListener" path="CreateActions/AddGroovyListener"/>
- <XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler"
- PROPERTIES="actionList=CreateActions" displayName="Listener..."
- kind="action" name="AddAnyListener"/>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="HTTP Listener..." kind="action" name="AddHTTPListener">
+ displayName="HTTP Gateway..." kind="action" name="AddHTTPGateway">
<EntityData EntityName="ESBHTTPGateway120">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="channel id ref" Mandatory="no"/>
</EntityData>
</XActionItem>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="UDP Listener..." kind="action" name="AddUDPListener">
- <EntityData EntityName="ESBUDPListener110">
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="host"/>
- <AttributeData AttributeName="port"/>
- </EntityData>
- </XActionItem>
+ <XActionItemReference entity="ESBListeners110" name="AddUDPListener" path="CreateActions/AddUDPListener"/>
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler"
+ PROPERTIES="actionList=CreateActions" displayName="Listener..."
+ kind="action" name="AddAnyListener"/>
</XActionItem>
<XActionItemReference entity="ESBListeners101" name="CopyActions"/>
<XActionItemReference entity="ESBListeners101" name="DeleteActions"/>
@@ -438,6 +637,72 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="mapping" name="ESBMapping120">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.action" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="role" 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;save=always"
+ name="status" xmlname="status"/>
+ <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="ESBProperty" name="CopyActions"/>
+ <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="payload" name="ESBPayload120">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.action" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="role" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="classpath resource" xmlname="classpathResource">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;save=always"
+ name="content type" xmlname="contentType"/>
+ <XModelAttribute PROPERTIES="category=general"
+ name="character encoding" xmlname="characterEncoding"/>
+ <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="ESBProperty" name="CopyActions"/>
+ <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;saveDefault=false;children=%Ordered%"
XMLSUBPATH="providers" name="ESBProviders120">
@@ -451,7 +716,7 @@
<XChildEntity name="ESBFTPProvider101"/>
<XChildEntity name="ESBSQLProvider101"/>
<XChildEntity name="ESBHibernateProvider101"/>
- <XChildEntity name="ESBHTTPProvider110"/>
+ <XChildEntity name="ESBHTTPProvider120"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -485,12 +750,10 @@
<XActionItemReference entity="ESBProviders101"
name="AddHibernateProvider" path="CreateActions/AddHibernateProvider"/>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBHTTPBus110"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBHTTPBus120"
displayName="HTTP Provider..." kind="action" name="AddHTTPProvider">
- <EntityData EntityName="ESBHTTPProvider110">
+ <EntityData EntityName="ESBHTTPProvider120">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="host"/>
- <AttributeData AttributeName="port"/>
</EntityData>
<EntityData EntityName="ESBBusCreator">
<AttributeData AttributeName="id"/>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2009-11-16 22:50:05 UTC (rev 18710)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2009-11-17 14:41:29 UTC (rev 18711)
@@ -48,6 +48,7 @@
public String ENT_ESB_SQL_PROVIDER = "ESBSQLProvider101"; //$NON-NLS-1$
public String ENT_ESB_HIBERNATE_PROVIDER = "ESBHibernateProvider101"; //$NON-NLS-1$
public String ENT_ESB_HTTP_PROVIDER = "ESBHTTPProvider110"; //$NON-NLS-1$
+ public String ENT_ESB_HTTP_PROVIDER_120 = "ESBHTTPProvider120"; //$NON-NLS-1$
static String PREACTION_PREFIX = "ESBPreAction"; //$NON-NLS-1$
@@ -62,6 +63,7 @@
ENT_ESB_SQL_PROVIDER,
ENT_ESB_HIBERNATE_PROVIDER,
ENT_ESB_HTTP_PROVIDER,
+ ENT_ESB_HTTP_PROVIDER_120,
};
@@ -73,6 +75,7 @@
public String ENT_ESB_HIBERNATE_BUS = "ESBHibernateBus101"; //$NON-NLS-1$
public String ENT_ESB_SQL_BUS = "ESBSQLBus101"; //$NON-NLS-1$
public String ENT_ESB_HTTP_BUS = "ESBHTTPBus110"; //$NON-NLS-1$
+ public String ENT_ESB_HTTP_BUS_120 = "ESBHTTPBus120"; //$NON-NLS-1$
public String[] BUSES_101 = {
ENT_ESB_BUS,
@@ -83,6 +86,7 @@
ENT_ESB_HIBERNATE_BUS,
ENT_ESB_SQL_BUS,
ENT_ESB_HTTP_BUS,
+ ENT_ESB_HTTP_BUS_120,
};
//prefix
@@ -128,6 +132,7 @@
public String ENT_ESB_ACTIONS = "ESBActions"; //$NON-NLS-1$
public String ENT_ESB_ACTIONS_101 = ENT_ESB_ACTIONS + SUFF_101;
public String ENT_ESB_ACTIONS_110 = ENT_ESB_ACTIONS + SUFF_110;
+ public String ENT_ESB_ACTIONS_120 = ENT_ESB_ACTIONS + SUFF_120;
public String ENT_ESB_ACTION = "ESBAction101"; //$NON-NLS-1$
public String ENT_ESB_ACTION_120 = "ESBAction120"; //$NON-NLS-1$
@@ -143,4 +148,5 @@
public String ATTR_BUS_ID = "id"; //$NON-NLS-1$
public String ATTR_BUS_ID_REF = "channel id ref"; //$NON-NLS-1$
+ public String XML_ATTR_PROTECTED_METHODS = "protected-methods"; //$NON-NLS-1$
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2009-11-16 22:50:05 UTC (rev 18710)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2009-11-17 14:41:29 UTC (rev 18711)
@@ -10,11 +10,17 @@
******************************************************************************/
package org.jboss.tools.esb.core.model;
+import java.util.Set;
+import java.util.StringTokenizer;
+
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.common.xml.XMLUtilities;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* @author Viacheslav Kabanovich
@@ -86,4 +92,73 @@
return false;
}
+ public void saveAttribute(Element element, String xmlname, String value) {
+ if(ESBConstants.XML_ATTR_PROTECTED_METHODS.equals(xmlname)) {
+ StringTokenizer st = new StringTokenizer(value, ",");
+ Element c = XMLUtilities.createElement(element, xmlname);
+ while(st.hasMoreTokens()) {
+ String t = st.nextToken();
+ Element m = XMLUtilities.createElement(c, "method");
+ m.setAttribute("name", t);
+ }
+ } else {
+ super.saveAttribute(element, xmlname, value);
+ }
+ }
+
+ public String getAttribute(Element element, String xmlname, XAttribute attr) {
+ if(ESBConstants.XML_ATTR_PROTECTED_METHODS.equals(xmlname)) {
+ Element c = XMLUtilities.getUniqueChild(element, xmlname);
+ if(c == null) return "";
+ Element[] ms = XMLUtilities.getChildren(c, "method");
+ StringBuffer sb = new StringBuffer();
+ for (Element m: ms) {
+ if(sb.length() > 0) sb.append(',');
+ sb.append("" + m.getAttribute("name"));
+ }
+ return sb.toString();
+ } else {
+ return super.getAttribute(element, xmlname, attr);
+ }
+ }
+
+ protected Set<String> getAllowedChildren(XModelEntity entity) {
+ Set<String> children = super.getAllowedChildren(entity);
+
+ return children;
+ }
+
+ public boolean saveChildren(Element element, XModelObject o) {
+ boolean b = super.saveChildren(element, o);
+ if(o.getModelEntity().getName().equals("ESBHTTPBus120")) {
+ checkHTTPBusDTD(element);
+ }
+ return b;
+ }
+
+ private void checkHTTPBusDTD(Element element) {
+ Element pm = XMLUtilities.getUniqueChild(element, "protected-methods");
+ if(pm == null) return;
+ NodeList list = element.getChildNodes();
+ Element reference = null;
+ boolean hasProperties = false;
+ for (int i = 0; i < list.getLength(); i++) {
+ Node n = list.item(i);
+ if(n instanceof Element) {
+ Element e = (Element)n;
+ if("property".equals(e.getNodeName())) {
+ hasProperties = true;
+ reference = null;
+ } else if(hasProperties) {
+ reference = e;
+ hasProperties = false;
+ }
+ }
+ }
+ if(reference != null) {
+ element.insertBefore(pm, reference);
+ } else if(hasProperties) {
+ element.appendChild(pm);
+ }
+ }
}
Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenESBResourceHandler.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenESBResourceHandler.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenESBResourceHandler.java 2009-11-17 14:41:29 UTC (rev 18711)
@@ -0,0 +1,20 @@
+package org.jboss.tools.esb.core.model.handlers;
+
+import org.jboss.tools.common.meta.action.impl.handlers.DefaultRedirectHandler;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+
+public class OpenESBResourceHandler extends DefaultRedirectHandler {
+
+ protected XModelObject getTrueSource(XModelObject source) {
+ String attr = action.getProperty("attribute");
+ String path = source.getAttributeValue(attr);
+ if(path == null || path.length() == 0) return null;
+ XModelObject o = source.getModel().getByPath(path);
+ if(o != null) return o;
+ XModelObject r = FileSystemsHelper.getWebRoot(source.getModel());
+ if(r == null) return null;
+ return r.getChildByPath(path);
+ }
+
+}
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenESBResourceHandler.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenSmooksConfigHandler.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenSmooksConfigHandler.java 2009-11-16 22:50:05 UTC (rev 18710)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenSmooksConfigHandler.java 2009-11-17 14:41:29 UTC (rev 18711)
@@ -1,20 +0,0 @@
-package org.jboss.tools.esb.core.model.handlers;
-
-import org.jboss.tools.common.meta.action.impl.handlers.DefaultRedirectHandler;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
-
-public class OpenSmooksConfigHandler extends DefaultRedirectHandler {
- static String ATTR_SMOOKS_CONFIG = "smooks config";
-
- protected XModelObject getTrueSource(XModelObject source) {
- String path = source.getAttributeValue(ATTR_SMOOKS_CONFIG);
- if(path == null || path.length() == 0) return null;
- XModelObject o = source.getModel().getByPath(path);
- if(o != null) return o;
- XModelObject r = FileSystemsHelper.getWebRoot(source.getModel());
- if(r == null) return null;
- return r.getChildByPath(path);
- }
-
-}
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18710 - 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-16 17:50:05 -0500 (Mon, 16 Nov 2009)
New Revision: 18710
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBinding.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBindingDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScoped.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotypeDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/INamed.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProduces.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.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/IInjectionPoint.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4943
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -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 org.eclipse.jdt.core.IAnnotation;
+
+/**
+ * Represents an annotation declaration. For example a qualifier or a scope
+ * declaration of a bean/injection/produce method.
+ *
+ * @author Alexey Kazakov
+ */
+public interface IAnnotationDeclaration extends ITypeDeclaration {
+
+ /**
+ * Return the annotation declaration.
+ * @return the annotation declaration.
+ */
+ IAnnotation getDeclaration();
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-16 20:32:08 UTC (rev 18709)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -12,7 +12,6 @@
import java.util.Set;
-import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.common.text.ITextSourceReference;
@@ -21,41 +20,17 @@
*
* @author Alexey Kazakov
*/
-public interface IBean extends ICDIElement {
+public interface IBean extends IScoped, ICDIElement {
/**
- * Obtains the types of the bean.
+ * Returns the corresponding IType of the managed bean or session bean or of
+ * the bean that declares the producer method or field.
*
- * @return the bean types
+ * @return the bean class
*/
- Set<IType> getTypes();
+ IType getBeanClass();
/**
- * Returns the location of a type declaration of this bean. If the bean
- * doesn't have such declaration then null will be returned.
- *
- * @param type
- * @return the location of the type of this bean.
- */
- ITextSourceReference getTypeLocation(IType type);
-
- /**
- * Obtains the qualifiers of the bean.
- *
- * @return the qualifiers
- */
- Set<IAnnotation> getQualifiers();
-
- /**
- * Returns the location of a qualifier declaration of this bean. If the bean
- * doesn't have such declaration then null will be returned.
- *
- * @param qualifier
- * @return the location of the qualifier declaration of this bean.
- */
- ITextSourceReference getQualifierLocation(IType qualifier);
-
- /**
* Obtains the EL name of the bean, if it has one.
*
* @return the EL name
@@ -64,44 +39,54 @@
/**
* Returns the location of a name declaration of this bean. If the bean
- * doesn't have the name declaration then null will be returned.
+ * doesn't have the name declaration then null will be returned. May be
+ * declared in a stereotype. May be a declaration of @Name annotation or
+ * location of Java class name declaration.
*
* @return the location of a name declaration of this bean.
*/
ITextSourceReference getNameLocation();
/**
- * Obtains the scope of the bean.
+ * Obtains the legal types of the bean class or producer method or field.
*
- * @return the scope
+ * @return the legal types
*/
- IScope getScope();
+ Set<IType> getLegalTypes();
/**
- * Returns the location of a scope declaration of this bean. If the bean
- * doesn't have the scope declaration then null will be returned.
+ * Obtains the all type declarations of the bean class or producer method or
+ * field (legal types as well as illegal ones).
*
- * @return the location of a scope declaration of this bean.
+ * @return the type declarations
*/
- ITextSourceReference getScopeLocation();
+ Set<ITypeDeclaration> getAllTypeDeclarations();
/**
- * Obtains the stereotypes of the bean.
+ * Obtains the type declarations of the bean class or producer method or
+ * field (legal types as well as illegal ones) which are defined by @Typed
+ * annotation.
*
- * @return the set of stereotypes
+ * @return the type declarations
*/
- Set<IStereotype> getStereotypes();
+ Set<ITypeDeclaration> getRestrictedTypeDeclaratios();
/**
- * Returns the location of a stereotype declaration of this bean. If the
- * bean doesn't have such stereotype declaration then null will be returned.
+ * Obtains the qualifiers of the bean class or producer method or field.
*
- * @param qualifier
- * @return the location of the stereotype declaration of this bean.
+ * @return the qualifiers
*/
- ITextSourceReference getStereotypeLocation(IStereotype stereotype);
+ Set<IAnnotationDeclaration> getQualifierDeclarations();
/**
+ * Obtains the stereotype declarations of the bean class or producer method
+ * or field.
+ *
+ * @return the set of stereotype declarations
+ */
+ Set<IStereotypeDeclaration> getStereotypeDeclarations();
+
+ /**
* Determines if the bean is an alternative.
*
* @return <tt>true</tt> if the bean is an alternative, and <tt>false</tt>
@@ -110,10 +95,17 @@
boolean isAlternative();
/**
+ * Returns the location of @Alternative declaration of this bean. May be
+ * declared in a stereotype.
+ *
+ * @return the location of @Alternative declaration.
+ */
+ IAnnotationDeclaration getAlternativeDeclaration();
+
+ /**
* Obtains the injection points of the bean.
*
* @return the set of injection points of the bean
*/
Set<IInjectionPoint> getInjectionPoints();
-
}
\ 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-16 20:32:08 UTC (rev 18709)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -7,12 +7,11 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.cdi.core;
import java.util.Set;
-import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IType;
/**
@@ -20,23 +19,26 @@
*/
public interface IBeanManager {
- /**
- * Returns the set of beans which match the given EL name
- *
- * @param name the name used to restrict the beans matched
- * @return the matched beans
- */
- public Set<IBean> getBeans(String name);
+ /**
+ * Returns the set of beans which match the given EL name
+ *
+ * @param name
+ * the name used to restrict the beans matched
+ * @return the matched beans
+ */
+ Set<IBean> getBeans(String name);
- /**
- * Returns the set of beans which match the given required type and bindings.
- *
- * @param beanType the type of the beans to be resolved
- * @param bindings the bindings used to restrict the matched beans. If no
- * bindings are passed to getBeans(), the default binding @Current
- * is assumed.
- * @return the matched beans
- */
- public Set<IBean> getBeans(IType beanType, IAnnotation... bindings);
-
+ /**
+ * Returns the set of beans which have the given required type and qualifier type
+ * If no qualifiers are given, the
+ * {@linkplain javax.enterprise.inject.Default default qualifier} is
+ * assumed.
+ *
+ * @param beanType
+ * the required bean type
+ * @param qualifiers
+ * the required qualifiers
+ * @return the resulting set of beans
+ */
+ Set<IBean> getBeans(IType beanType, IType... qualifierTypes);
}
\ No newline at end of file
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInject.java 2009-11-16 20:32:08 UTC (rev 18709)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInject.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -1,18 +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;
-
-/**
- * @author Alexey Kazakov
- */
-public interface IInject {
-
-}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2009-11-16 20:32:08 UTC (rev 18709)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -7,9 +7,13 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.cdi.core;
+import java.util.Set;
+
+import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.IJavaElement;
import org.jboss.tools.common.text.ITextSourceReference;
/**
@@ -19,4 +23,37 @@
*/
public interface IInjectionPoint extends ICDIElement, ITextSourceReference {
+ /**
+ * Gets the required qualifiers of the injection point.
+ *
+ * @return the required qualifiers
+ */
+ Set<IAnnotation> getQualifiers();
+
+ /**
+ * Gets the object representing the bean that defines the injection point. If
+ * the injection point does not belong to a bean, return a null value.
+ *
+ * @return the object representing bean that defines the injection point, of
+ * null if the injection point does not belong to a bean
+ */
+ IBean getBean();
+
+ /**
+ * Obtains an instance of IMember or ITypeParameter, depending upon whether
+ * the injection point is an injected field or a constructor/method
+ * parameter.
+ *
+ * @return an IMember or ITypeParameter
+ */
+ IJavaElement getSourceElement();
+
+ /**
+ * Determines if the injection point is a decorator delegate injection
+ * point.
+ *
+ * @return <tt>true</tt> if the injection point is a decorator delegate
+ * injection point, and <tt>false</tt> otherwise
+ */
+ boolean isDelegate();
}
\ No newline at end of file
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBinding.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBinding.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBinding.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * 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;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface IInterceptorBinding {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBinding.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBindingDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBindingDeclaration.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBindingDeclaration.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * 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;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface IInterceptorBindingDeclaration extends IAnnotationDeclaration {
+
+ /**
+ * Returns the corresponding interceptor binding.
+ *
+ * @return the corresponding interceptor binding.
+ */
+ IInterceptorBinding getInterceptorBinding();
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBindingDeclaration.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/INamed.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/INamed.java 2009-11-16 20:32:08 UTC (rev 18709)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/INamed.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -1,18 +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;
-
-/**
- * @author Alexey Kazakov
- */
-public interface INamed {
-
-}
\ No newline at end of file
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProduces.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProduces.java 2009-11-16 20:32:08 UTC (rev 18709)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProduces.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -1,18 +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;
-
-/**
- * @author Alexey Kazakov
- */
-public interface IProduces {
-
-}
\ No newline at end of file
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java 2009-11-16 20:32:08 UTC (rev 18709)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -1,18 +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;
-
-/**
- * @author Alexey Kazakov
- */
-public interface IQualifier {
-
-}
\ No newline at end of file
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java 2009-11-16 20:32:08 UTC (rev 18709)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -1,18 +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;
-
-/**
- * @author Alexey Kazakov
- */
-public interface IScope {
-
-}
\ No newline at end of file
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScoped.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScoped.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScoped.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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;
+
+import org.eclipse.jdt.core.IType;
+
+/**
+ * This interface if common protocol to have access to scoped of bean class or
+ * producer method or field or stereotype.
+ *
+ * @author Alexey Kazakov
+ */
+public interface IScoped {
+
+ /**
+ * Obtains the scope type of the bean class or producer method or filed or
+ * stereotype annotation. The scope may or may not be declared in the
+ * object. It may be default one or come from stereotype of the object.
+ *
+ * @return the scope type
+ */
+ IType getScope();
+
+ /**
+ * Obtains all the scope declarations of the bean class or producer method
+ * or filed or stereotype annotation. This set doesn't contain scope
+ * declarations from stereotypes of this object.
+ *
+ * @return the scope
+ */
+ Set<IAnnotationDeclaration> getScopeDeclarations();
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScoped.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java 2009-11-16 20:32:08 UTC (rev 18709)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -7,12 +7,62 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.cdi.core;
+import java.util.Set;
+
+import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.IType;
+
/**
+ * Represents a stereotype.
+ *
* @author Alexey Kazakov
*/
-public interface IStereotype {
+public interface IStereotype extends IScoped, ICDIElement {
+ /**
+ * Returns the corresponding IType of the stereotype.
+ *
+ * @return the corresponding IType
+ */
+ IType getSourceType();
+
+ /**
+ * Returns the location of @Name declaration of this stereotype. If the bean
+ * doesn't have the @Name declaration then null will be returned.
+ *
+ * @return the location of @Name declaration of this bean.
+ */
+ IAnnotation getNameLocation();
+
+ /**
+ * Returns the interceptor binding declarations of the stereotype.
+ *
+ * @return the interceptor binding declarations.
+ */
+ Set<IInterceptorBindingDeclaration> getInterceptorBindingDeclarations();
+
+ /**
+ * Determines if the stereotype is an alternative.
+ *
+ * @return <tt>true</tt> if the stereotype is an alternative, and
+ * <tt>false</tt> otherwise.
+ */
+ boolean isAlternative();
+
+ /**
+ * Returns the location of @Alternative declaration of this stereotype.
+ *
+ * @return the location of @Alternative declaration.
+ */
+ IAnnotationDeclaration getAlternativeDeclaration();
+
+ /**
+ * Obtains the stereotype declarations of the stereotype.
+ *
+ * @return the set of stereotype declarations
+ */
+ Set<IStereotypeDeclaration> getStereotypeDeclarations();
}
\ No newline at end of file
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotypeDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotypeDeclaration.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotypeDeclaration.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * 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 stereotype declaration.
+ *
+ * @author Alexey Kazakov
+ */
+public interface IStereotypeDeclaration extends IAnnotationDeclaration {
+
+ /**
+ * Returns the corresponding stereotype.
+ *
+ * @return the corresponding stereotype.
+ */
+ IStereotype getStereotype();
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotypeDeclaration.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java 2009-11-16 22:50:05 UTC (rev 18710)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * 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 org.eclipse.jdt.core.IType;
+import org.jboss.tools.common.text.ITextSourceReference;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface ITypeDeclaration extends ITextSourceReference {
+
+ /**
+ * Returns the corresponding IType of the declaration.
+ *
+ * @return the corresponding IType of the declaration.
+ */
+ IType getType();
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18709 - trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-11-16 15:32:08 -0500 (Mon, 16 Nov 2009)
New Revision: 18709
Modified:
trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5178 instead of only building the SDK, have the SDK build the runtime feature (which includes its 3 child features) + source features
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml 2009-11-16 17:19:27 UTC (rev 18708)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml 2009-11-16 20:32:08 UTC (rev 18709)
@@ -22,26 +22,20 @@
</url>
<includes
- id="org.jboss.tools.jbpm.common.feature"
+ id="org.jboss.tools.jbpm4.feature"
version="0.0.0"/>
+
+ <!-- sources -->
<includes
id="org.jboss.tools.jbpm.common.source.feature"
version="0.0.0"/>
<includes
- id="org.jboss.tools.flow.common.feature"
- version="0.0.0"/>
-
- <includes
id="org.jboss.tools.flow.common.source.feature"
version="0.0.0"/>
<includes
- id="org.jboss.tools.flow.jpdl4.feature"
- version="0.0.0"/>
-
- <includes
id="org.jboss.tools.flow.jpdl4.source.feature"
version="0.0.0"/>
15 years, 1 month
- 1
- 0