JBoss Tools SVN: r19567 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-12-24 02:37:22 -0500 (Thu, 24 Dec 2009)
New Revision: 19567
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
Log:
JBIDE-5394: BPEL Plugin is not correctly initalizing variables(re-commit)
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java 2009-12-24 07:32:29 UTC (rev 19566)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java 2009-12-24 07:37:22 UTC (rev 19567)
@@ -778,5 +778,102 @@
}
createDefaultContent(document, rootCMElementDeclaration);
}
+
+
+ public void visitCMElementDeclaration(CMElementDeclaration ed) {
+ int min = ed.getMinOccur() > 0 ? ed.getMinOccur() : 1;
+
+ // Correct the min value if the element is contained in
+ // a group.
+ if (!cmGroupStack.isEmpty()) {
+ CMGroup group = (CMGroup) cmGroupStack.peek();
+ int gmin = group.getMinOccur();
+ if (gmin == 0)
+ if (buildOptionalElements(buildPolicy)) {
+ /* do nothing: min = min */
+ }
+ else {
+ min = min * gmin; // min = 0
+ }
+ else {
+ min = min * gmin;
+ }
+ }
+
+ int max = Math.min(ed.getMaxOccur(), getNumOfRepeatableElements());
+ if (max < min)
+ max = min;
+
+ alwaysVisit = false;
+
+ // Note - ed may not be abstract but has substitutionGroups
+ // involved.
+ if (buildFirstSubstitution(buildPolicy) || isAbstract(ed)) // leave
+ // this
+ // for
+ // backward
+ // compatibility
+ // for now
+ {
+ // Note - To change so that if ed is optional, we do not
+ // generate anything here.
+ ed = getSubstitution(ed);
+
+ // Note - the returned ed may be an abstract element in
+ // which case the xml will be invalid.
+ }
+
+ if (min > 0 && !visitedCMElementDeclarationList.contains(ed)) {
+ visitedCMElementDeclarationList.add(ed);
+ for (int i = 1; i <= max; i++) {
+ // create an Element for each
+ Element element = null;
+ if (rootElement != null) {
+ element = rootElement;
+ rootElement = null;
+ }
+ else {
+ element = createElement(ed, computeName(ed, currentParent), currentParent);
+ }
+
+ // visit the children of the GrammarElement
+ Node oldParent = currentParent;
+ currentParent = element;
+ handlePushParent(element, ed);
+
+ namespaceTable.addElement(element);
+
+ boolean oldAttachNodesToParent = attachNodesToParent;
+ attachNodesToParent = true;
+
+ // instead of calling super.visitCMElementDeclaration()
+ // we duplicate the code with some minor modifications
+ CMNamedNodeMap nodeMap = ed.getAttributes();
+ int size = nodeMap.getLength();
+ for (int j = 0; j < size; j++) {
+ visitCMNode(nodeMap.item(j));
+ }
+
+ CMContent content = ed.getContent();
+ if (content != null) {
+ visitCMNode(content);
+ }
+
+ if (ed.getContentType() == CMElementDeclaration.PCDATA) {
+ CMDataType dataType = ed.getDataType();
+ if (dataType != null) {
+ visitCMDataType(dataType);
+ }
+ }
+ // end duplication
+ attachNodesToParent = oldAttachNodesToParent;
+ handlePopParent(element, ed);
+ currentParent = oldParent;
+ linkNode(element);
+ }
+ int size = visitedCMElementDeclarationList.size();
+ visitedCMElementDeclarationList.remove(size - 1);
+ }
+ }
}
}
15 years, 9 months
JBoss Tools SVN: r19566 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-12-24 02:32:29 -0500 (Thu, 24 Dec 2009)
New Revision: 19566
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
Log:
JBIDE-5394: rollback the change
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java 2009-12-24 07:20:10 UTC (rev 19565)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java 2009-12-24 07:32:29 UTC (rev 19566)
@@ -778,102 +778,5 @@
}
createDefaultContent(document, rootCMElementDeclaration);
}
-
- public void visitCMElementDeclaration(CMElementDeclaration ed) {
- int forcedMin = (buildOptionalElements(buildPolicy) || alwaysVisit) ? 1 : 0;
- int min = 1;
-
- // Correct the min value if the element is contained in
- // a group.
- if (!cmGroupStack.isEmpty()) {
- CMGroup group = (CMGroup) cmGroupStack.peek();
- int gmin = group.getMinOccur();
- if (gmin == 0)
- if (buildOptionalElements(buildPolicy)) {
- /* do nothing: min = min */
- }
- else {
- min = min * gmin; // min = 0
- }
- else {
- min = min * gmin;
- }
- }
-
- int max = Math.min(ed.getMaxOccur(), getNumOfRepeatableElements());
- if (max < min)
- max = min;
-
- alwaysVisit = false;
-
- // Note - ed may not be abstract but has substitutionGroups
- // involved.
- if (buildFirstSubstitution(buildPolicy) || isAbstract(ed)) // leave
- // this
- // for
- // backward
- // compatibility
- // for now
- {
- // Note - To change so that if ed is optional, we do not
- // generate anything here.
- ed = getSubstitution(ed);
-
- // Note - the returned ed may be an abstract element in
- // which case the xml will be invalid.
- }
-
- if (min > 0 && !visitedCMElementDeclarationList.contains(ed)) {
- visitedCMElementDeclarationList.add(ed);
- for (int i = 1; i <= max; i++) {
- // create an Element for each
- Element element = null;
- if (rootElement != null) {
- element = rootElement;
- rootElement = null;
- }
- else {
- element = createElement(ed, computeName(ed, currentParent), currentParent);
- }
-
- // visit the children of the GrammarElement
- Node oldParent = currentParent;
- currentParent = element;
- handlePushParent(element, ed);
-
- namespaceTable.addElement(element);
-
- boolean oldAttachNodesToParent = attachNodesToParent;
- attachNodesToParent = true;
-
- // instead of calling super.visitCMElementDeclaration()
- // we duplicate the code with some minor modifications
- CMNamedNodeMap nodeMap = ed.getAttributes();
- int size = nodeMap.getLength();
- for (int j = 0; j < size; j++) {
- visitCMNode(nodeMap.item(j));
- }
-
- CMContent content = ed.getContent();
- if (content != null) {
- visitCMNode(content);
- }
-
- if (ed.getContentType() == CMElementDeclaration.PCDATA) {
- CMDataType dataType = ed.getDataType();
- if (dataType != null) {
- visitCMDataType(dataType);
- }
- }
- // end duplication
- attachNodesToParent = oldAttachNodesToParent;
- handlePopParent(element, ed);
- currentParent = oldParent;
- linkNode(element);
- }
- int size = visitedCMElementDeclarationList.size();
- visitedCMElementDeclarationList.remove(size - 1);
- }
- }
}
}
15 years, 9 months
JBoss Tools SVN: r19565 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-12-24 02:20:10 -0500 (Thu, 24 Dec 2009)
New Revision: 19565
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
Log:
JBIDE-5394: BPEL Plugin is not correctly initalizing variables
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java 2009-12-23 17:30:14 UTC (rev 19564)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java 2009-12-24 07:20:10 UTC (rev 19565)
@@ -57,8 +57,11 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.wsdl.Message;
import org.eclipse.wst.wsdl.Part;
+import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
+import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
+import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl;
@@ -71,6 +74,8 @@
import org.eclipse.xsd.XSDNamedComponent;
import org.eclipse.xsd.XSDTypeDefinition;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* An AssignCategory presenting a tree from which the user can select any of: -
@@ -773,5 +778,102 @@
}
createDefaultContent(document, rootCMElementDeclaration);
}
+
+ public void visitCMElementDeclaration(CMElementDeclaration ed) {
+ int forcedMin = (buildOptionalElements(buildPolicy) || alwaysVisit) ? 1 : 0;
+ int min = 1;
+
+ // Correct the min value if the element is contained in
+ // a group.
+ if (!cmGroupStack.isEmpty()) {
+ CMGroup group = (CMGroup) cmGroupStack.peek();
+ int gmin = group.getMinOccur();
+ if (gmin == 0)
+ if (buildOptionalElements(buildPolicy)) {
+ /* do nothing: min = min */
+ }
+ else {
+ min = min * gmin; // min = 0
+ }
+ else {
+ min = min * gmin;
+ }
+ }
+
+ int max = Math.min(ed.getMaxOccur(), getNumOfRepeatableElements());
+ if (max < min)
+ max = min;
+
+ alwaysVisit = false;
+
+ // Note - ed may not be abstract but has substitutionGroups
+ // involved.
+ if (buildFirstSubstitution(buildPolicy) || isAbstract(ed)) // leave
+ // this
+ // for
+ // backward
+ // compatibility
+ // for now
+ {
+ // Note - To change so that if ed is optional, we do not
+ // generate anything here.
+ ed = getSubstitution(ed);
+
+ // Note - the returned ed may be an abstract element in
+ // which case the xml will be invalid.
+ }
+
+ if (min > 0 && !visitedCMElementDeclarationList.contains(ed)) {
+ visitedCMElementDeclarationList.add(ed);
+ for (int i = 1; i <= max; i++) {
+ // create an Element for each
+ Element element = null;
+ if (rootElement != null) {
+ element = rootElement;
+ rootElement = null;
+ }
+ else {
+ element = createElement(ed, computeName(ed, currentParent), currentParent);
+ }
+
+ // visit the children of the GrammarElement
+ Node oldParent = currentParent;
+ currentParent = element;
+ handlePushParent(element, ed);
+
+ namespaceTable.addElement(element);
+
+ boolean oldAttachNodesToParent = attachNodesToParent;
+ attachNodesToParent = true;
+
+ // instead of calling super.visitCMElementDeclaration()
+ // we duplicate the code with some minor modifications
+ CMNamedNodeMap nodeMap = ed.getAttributes();
+ int size = nodeMap.getLength();
+ for (int j = 0; j < size; j++) {
+ visitCMNode(nodeMap.item(j));
+ }
+
+ CMContent content = ed.getContent();
+ if (content != null) {
+ visitCMNode(content);
+ }
+
+ if (ed.getContentType() == CMElementDeclaration.PCDATA) {
+ CMDataType dataType = ed.getDataType();
+ if (dataType != null) {
+ visitCMDataType(dataType);
+ }
+ }
+ // end duplication
+ attachNodesToParent = oldAttachNodesToParent;
+ handlePopParent(element, ed);
+ currentParent = oldParent;
+ linkNode(element);
+ }
+ int size = visitedCMElementDeclarationList.size();
+ visitedCMElementDeclarationList.remove(size - 1);
+ }
+ }
}
}
15 years, 9 months
JBoss Tools SVN: r19564 - in trunk: jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-12-23 12:30:14 -0500 (Wed, 23 Dec 2009)
New Revision: 19564
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4758
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java 2009-12-23 17:02:41 UTC (rev 19563)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java 2009-12-23 17:30:14 UTC (rev 19564)
@@ -78,7 +78,7 @@
for(ELSegment segment : segments){
if(segment.getSourceReference() != null &&
segment.getSourceReference().getStartPosition() <= offset &&
- segment.getSourceReference().getStartPosition()+segment.getSourceReference().getLength() >= offset)
+ segment.getSourceReference().getStartPosition()+segment.getSourceReference().getLength() > offset)
return segment;
}
return null;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2009-12-23 17:02:41 UTC (rev 19563)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2009-12-23 17:30:14 UTC (rev 19564)
@@ -99,7 +99,7 @@
for(ELReference reference : references){
for(ELExpression expression : reference.getEl()){
- if (reference.getStartPosition()+expression.getStartPosition() <= offset && reference.getStartPosition()+expression.getEndPosition() >= offset)
+ if (reference.getStartPosition()+expression.getStartPosition() <= offset && reference.getStartPosition()+expression.getEndPosition() > offset)
return new ExpressionStructure(reference, expression);
}
}
@@ -123,7 +123,7 @@
return null;
for(ELInvocationExpression ie : expression.getInvocations()){
- if (reference.getStartPosition()+ie.getStartPosition() <= offset && reference.getStartPosition()+ie.getEndPosition() >= offset) {
+ if (reference.getStartPosition()+ie.getStartPosition() <= offset && reference.getStartPosition()+ie.getEndPosition() > offset) {
return ie;
}
}
15 years, 9 months
JBoss Tools SVN: r19563 - trunk/bpel/releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-12-23 12:02:41 -0500 (Wed, 23 Dec 2009)
New Revision: 19563
Modified:
trunk/bpel/releng/build.properties
Log:
disable tests since them OOM/permgen fail
Modified: trunk/bpel/releng/build.properties
===================================================================
--- trunk/bpel/releng/build.properties 2009-12-23 17:01:43 UTC (rev 19562)
+++ trunk/bpel/releng/build.properties 2009-12-23 17:02:41 UTC (rev 19563)
@@ -12,7 +12,8 @@
mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature
testFeatureToBuildID=org.jboss.tools.bpel.tests.feature
-build.steps=buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup
+#build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
+build.steps=buildUpdate,generateDigests,publish,cleanup
JAVA14_HOME=${JAVA_HOME}
JAVA50_HOME=${JAVA_HOME}
15 years, 9 months
JBoss Tools SVN: r19562 - in trunk: jsf/plugins/org.jboss.tools.jsf.text.ext and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-12-23 12:01:43 -0500 (Wed, 23 Dec 2009)
New Revision: 19562
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java
Removed:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlink.java
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4758
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java 2009-12-23 16:56:39 UTC (rev 19561)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java 2009-12-23 17:01:43 UTC (rev 19562)
@@ -76,7 +76,9 @@
*/
public ELSegment findSegmentByOffset(int offset) {
for(ELSegment segment : segments){
- if(segment.getSourceReference() != null && segment.getSourceReference().getStartPosition() == offset)
+ if(segment.getSourceReference() != null &&
+ segment.getSourceReference().getStartPosition() <= offset &&
+ segment.getSourceReference().getStartPosition()+segment.getSourceReference().getLength() >= offset)
return segment;
}
return null;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF 2009-12-23 16:56:39 UTC (rev 19561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF 2009-12-23 17:01:43 UTC (rev 19562)
@@ -12,7 +12,8 @@
org.jboss.tools.common.text.ext,
org.jboss.tools.jst.text.ext,
org.jboss.tools.jsf,
- org.jboss.tools.common.el.core
+ org.jboss.tools.common.el.core,
+ org.eclipse.jdt.ui;bundle-version="3.5.0"
Export-Package: org.jboss.tools.jsf.text.ext,
org.jboss.tools.jsf.text.ext.hyperlink
Bundle-Version: 2.0.0
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2009-12-23 16:56:39 UTC (rev 19561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2009-12-23 17:01:43 UTC (rev 19562)
@@ -1019,6 +1019,41 @@
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" />
</contenttypeidentifier>
</hyperlink>
+
+ <hyperlink
+ class="org.jboss.tools.jsf.text.ext.hyperlink.ExpressionHyperlink"
+ id="org.jboss.tools.jsf.text.ext.hyperlink.ExpressionHyperlink">
+ <contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="org.eclipse.core.runtime.xml">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="org.jboss.tools.common.model.ui.xml">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="org.jboss.tools.seam.xml.ui.pages12xmlsource">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="org.jboss.tools.seam.xml.ui.page12xmlsource">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="org.jboss.tools.seam.xml.ui.page20xmlsource">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="org.jboss.tools.seam.xml.ui.pages21xmlsource">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
+ <contenttypeidentifier id="org.jboss.tools.seam.xml.ui.page21xmlsource">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
+ </hyperlink>
</extension>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java 2009-12-23 16:56:39 UTC (rev 19561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java 2009-12-23 17:01:43 UTC (rev 19562)
@@ -40,4 +40,5 @@
public static String OpenRenderKit;
public static String Validator;
public static String OpenValidatorForId;
+ public static String OpenJavaElement;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties 2009-12-23 16:56:39 UTC (rev 19561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties 2009-12-23 17:01:43 UTC (rev 19562)
@@ -23,3 +23,4 @@
OpenRenderKit=Open Render Kit ''{0}''
Validator=validator
OpenValidatorForId=Open a validator for ID ''{1}''
+OpenJavaElement=Open Java Element
Copied: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java (from rev 19486, trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlink.java)
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java 2009-12-23 17:01:43 UTC (rev 19562)
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.text.ext.hyperlink;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.ui.IEditorPart;
+import org.jboss.tools.common.el.core.model.ELInvocationExpression;
+import org.jboss.tools.common.el.core.resolver.ELContext;
+import org.jboss.tools.common.el.core.resolver.ELResolution;
+import org.jboss.tools.common.el.core.resolver.ELResolver;
+import org.jboss.tools.common.el.core.resolver.ELSegment;
+import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
+import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.jsf.text.ext.JSFTextExtMessages;
+import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner.ExpressionStructure;
+
+/**
+ * @author Daniel
+ */
+public class ExpressionHyperlink extends AbstractHyperlink{
+ private JavaMemberELSegment javaSegment=null;
+
+ protected IRegion doGetHyperlinkRegion(int offset) {
+ javaSegment = null;
+ ELContext context = JSPExprHyperlinkPartitioner.getELContext(getDocument());
+ ExpressionStructure eStructure = JSPExprHyperlinkPartitioner.getExpression(context, offset);
+ ELInvocationExpression invocationExpression = JSPExprHyperlinkPartitioner.getInvocationExpression(eStructure.reference, eStructure.expression, offset);
+ if(invocationExpression != null){
+ for(ELResolver resolver : context.getElResolvers()){
+ ELResolution resolution = resolver.resolve(context, eStructure.expression, invocationExpression.getStartPosition());
+ ELSegment segment = resolution.findSegmentByOffset(offset-eStructure.reference.getStartPosition());
+ if(segment != null){
+ if(segment instanceof JavaMemberELSegment){
+ javaSegment = (JavaMemberELSegment)segment;
+ if(javaSegment.getJavaElement() != null){
+ Region region = new Region(eStructure.reference.getStartPosition()+segment.getSourceReference().getStartPosition(), segment.getSourceReference().getLength());
+
+ return region;
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ protected void doHyperlink(IRegion region) {
+ IEditorPart part = null;
+
+ if(javaSegment != null){
+ IResource resource = javaSegment.getJavaElement().getResource();
+ if(resource != null && resource instanceof IFile)
+ part = openFileInEditor((IFile)javaSegment.getJavaElement().getResource());
+ if (part != null) {
+ if (javaSegment.getJavaElement() != null)
+ JavaUI.revealInEditor(part, javaSegment.getJavaElement());
+ }
+ }
+ if (part == null)
+ openFileFailed();
+ }
+
+ public String getHyperlinkText() {
+ return JSFTextExtMessages.OpenJavaElement;
+ }
+
+}
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlink.java 2009-12-23 16:56:39 UTC (rev 19561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlink.java 2009-12-23 17:01:43 UTC (rev 19562)
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Exadel, Inc. and 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jsf.text.ext.hyperlink;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.ui.IEditorPart;
-import org.jboss.tools.common.el.core.model.ELExpression;
-import org.jboss.tools.common.el.core.model.ELInvocationExpression;
-import org.jboss.tools.common.el.core.resolver.ELContext;
-import org.jboss.tools.common.el.core.resolver.ELResolution;
-import org.jboss.tools.common.el.core.resolver.ELResolver;
-import org.jboss.tools.common.el.core.resolver.ELSegment;
-import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
-import org.jboss.tools.common.text.ext.ExtensionsPlugin;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.web.kb.PageContextFactory;
-
-/**
- * @author Daniel
- */
-public class JSPExprHyperlink extends AbstractHyperlink{
- private String hyperlinkText = ""; //$NON-NLS-1$
- private ELExpression expression;
- ELInvocationExpression invocationExpression;
-
- protected IRegion doGetHyperlinkRegion(int offset) {
- expression = JSPExprHyperlinkPartitioner.getExpression(getDocument(), offset);
- invocationExpression = getInvocationExpression(expression, offset);
- if(invocationExpression != null){
- Region region = new Region(invocationExpression.getStartPosition(), invocationExpression.getLength());
- return region;
- }
- return null;
- }
-
- private ELInvocationExpression getInvocationExpression(ELExpression expression, int offset){
- if(expression == null)
- return null;
-
- for(ELInvocationExpression ie : expression.getInvocations()){
- if (expression.getStartPosition()+ie.getStartPosition() <= offset && expression.getStartPosition()+ie.getEndPosition() >= offset) {
- return ie;
- }
- }
- return null;
- }
-
- protected void doHyperlink(IRegion region) {
- IEditorPart part = null;
- if (region == null)
- return;
-
- try {
- IDocument document = getDocument();
- hyperlinkText = document
- .get(region.getOffset(), region.getLength());
- } catch (BadLocationException ex) {
- ExtensionsPlugin.getPluginLog().logError(ex);
- }
- if(invocationExpression != null){
- ELContext context = PageContextFactory.getInstance().createPageContext(getFile());
- if(context != null){
- for(ELResolver resolver : context.getElResolvers()){
- ELResolution resolution = resolver.resolve(context, expression, invocationExpression.getStartPosition());
- ELSegment segment = resolution.findSegmentByOffset(invocationExpression.getStartPosition());
- if(segment != null){
- if(segment instanceof JavaMemberELSegment){
- JavaMemberELSegment javaSegment = (JavaMemberELSegment)segment;
- if(javaSegment.getJavaElement() != null){
- try{
- IResource resource = javaSegment.getJavaElement().getCorrespondingResource();
- if(resource != null && resource instanceof IFile)
- part = openFileInEditor((IFile)javaSegment.getJavaElement().getCorrespondingResource());
- }catch(JavaModelException ex){
- JSFExtensionsPlugin.log(ex);
- }
- }
- }
- }
- }
- }
- }
- if (part == null)
- openFileFailed();
- }
-
- public String getHyperlinkText() {
- return hyperlinkText;
- }
-
-}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2009-12-23 16:56:39 UTC (rev 19561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2009-12-23 17:01:43 UTC (rev 19562)
@@ -11,16 +11,24 @@
package org.jboss.tools.jsf.text.ext.hyperlink;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.text.IDocument;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.model.ELExpression;
+import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.resolver.ELContext;
+import org.jboss.tools.common.el.core.resolver.ELResolution;
+import org.jboss.tools.common.el.core.resolver.ELResolver;
+import org.jboss.tools.common.el.core.resolver.ELSegment;
+import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitioner;
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion;
import org.jboss.tools.common.text.ext.hyperlink.IExclusiblePartitionerRecognition;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecognizer;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
import org.jboss.tools.jst.web.kb.PageContextFactory;
@@ -30,9 +38,15 @@
@SuppressWarnings("restriction")
public class JSPExprHyperlinkPartitioner extends AbstractHyperlinkPartitioner implements IHyperlinkPartitionRecognizer, IExclusiblePartitionerRecognition {
public static final String JSP_EXPRESSION_PARTITION = "org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION"; //$NON-NLS-1$
+ public static final String EXPRESSION_PARTITION = "org.jboss.tools.common.text.ext.jsp.EXPRESSION"; //$NON-NLS-1$
+
+ private boolean jspExpression = false;
protected String getPartitionType() {
- return JSP_EXPRESSION_PARTITION;
+ if(jspExpression)
+ return EXPRESSION_PARTITION;
+ else
+ return JSP_EXPRESSION_PARTITION;
}
/**
@@ -60,35 +74,76 @@
}
private IHyperlinkRegion getRegion(IDocument document, final int offset) {
- ELExpression expression = getExpression(document, offset);
- if(expression != null){
- IHyperlinkRegion region = new HyperlinkRegion(expression.getStartPosition(), expression.getLength(), null, null, null);
- return region;
+ jspExpression = false;
+ ELContext context = getELContext(document);
+ if(context != null){
+ ExpressionStructure eStructure = getExpression(context, offset);
+ if(eStructure != null){
+ ELInvocationExpression invocationExpression = getInvocationExpression(eStructure.reference, eStructure.expression, offset);
+ if(invocationExpression != null){
+ jspExpression = decide(context, eStructure.expression, invocationExpression, offset-eStructure.reference.getStartPosition());
+ if(jspExpression){
+ IHyperlinkRegion region = new HyperlinkRegion(invocationExpression.getStartPosition(), invocationExpression.getLength(), null, null, null);
+ return region;
+ }
+ }
+ IHyperlinkRegion region = new HyperlinkRegion(eStructure.expression.getStartPosition(), eStructure.expression.getLength(), null, null, null);
+ return region;
+ }
}
return null;
}
- public static ELExpression getExpression(IDocument document, final int offset){
+ public static ExpressionStructure getExpression(ELContext context, final int offset){
+ ELReference[] references = context.getELReferences();
+
+ for(ELReference reference : references){
+ for(ELExpression expression : reference.getEl()){
+ if (reference.getStartPosition()+expression.getStartPosition() <= offset && reference.getStartPosition()+expression.getEndPosition() >= offset)
+ return new ExpressionStructure(reference, expression);
+ }
+ }
+ return null;
+ }
+
+ public static ELContext getELContext(IDocument document){
StructuredModelWrapper smw = new StructuredModelWrapper();
smw.init(document);
try {
IFile file = smw.getFile();
ELContext context = PageContextFactory.getInstance().createPageContext(file);
- if(context != null){
-
- ELReference[] references = context.getELReferences();
-
- for(ELReference reference : references){
- for(ELExpression expression : reference.getEl()){
- if (reference.getStartPosition()+expression.getStartPosition() <= offset && reference.getStartPosition()+expression.getEndPosition() >= offset)
- return expression;
+ return context;
+ } finally {
+ smw.dispose();
+ }
+ }
+
+ public static ELInvocationExpression getInvocationExpression(ELReference reference, ELExpression expression, int offset){
+ if(expression == null || reference == null)
+ return null;
+
+ for(ELInvocationExpression ie : expression.getInvocations()){
+ if (reference.getStartPosition()+ie.getStartPosition() <= offset && reference.getStartPosition()+ie.getEndPosition() >= offset) {
+ return ie;
+ }
+ }
+ return null;
+ }
+
+ public boolean decide(ELContext context, ELExpression expression, ELInvocationExpression invocationExpression, int offset){
+ for(ELResolver resolver : context.getElResolvers()){
+ ELResolution resolution = resolver.resolve(context, expression, invocationExpression.getStartPosition());
+ ELSegment segment = resolution.findSegmentByOffset(offset);
+ if(segment != null){
+ if(segment instanceof JavaMemberELSegment){
+ JavaMemberELSegment javaSegment = (JavaMemberELSegment)segment;
+ if(javaSegment.getJavaElement() != null){
+ return true;
}
}
}
- return null;
- } finally {
- smw.dispose();
}
+ return false;
}
/**
@@ -107,5 +162,16 @@
public String getExclusionPartitionType() {
return getPartitionType();
}
+
+ public static class ExpressionStructure{
+ public ELReference reference;
+ public ELExpression expression;
+
+ public ExpressionStructure(ELReference reference, ELExpression expression){
+ this.reference = reference;
+ this.expression = expression;
+ }
+
+ }
}
15 years, 9 months
JBoss Tools SVN: r19561 - tags.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-12-23 11:56:39 -0500 (Wed, 23 Dec 2009)
New Revision: 19561
Added:
tags/jbosstools-3.1.0.M4/
Log:
tag as M4
Copied: tags/jbosstools-3.1.0.M4 (from rev 19560, branches/jbosstools-3.1.0.M4)
15 years, 9 months
JBoss Tools SVN: r19560 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-23 11:00:03 -0500 (Wed, 23 Dec 2009)
New Revision: 19560
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5485
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-12-23 15:54:11 UTC (rev 19559)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-12-23 16:00:03 UTC (rev 19560)
@@ -3156,9 +3156,25 @@
<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"/>
- <XActionItem displayName="Converters" group="1" kind="list" name="Converters">
+ <XActionItem displayName="BPM" group="1" kind="list" name="BPM">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="BPM Processor..." kind="action" name="AddBPMProcessor">
+ <EntityData EntityName="ESBPreActionBpmProcessor120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="command"/>
+ <AttributeData AttributeName="process definition name" Mandatory="no"/>
+ <AttributeData AttributeName="process definition id" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItemReference entity="ESBActions101"
+ name="AddBusinessRulesProcessor" path="CreateActions/PrePackedAction/AddBusinessRulesProcessor"/>
+ </XActionItem>
+ <XActionItem displayName="Converters/Transformers" group="1"
+ kind="list" name="Converters">
<XActionItemReference entity="ESBActions101" name="AddByteArrayToString"/>
+ <XActionItemReference entity="ESBActions101"
+ name="AddCommandInterpreter" path="CreateActions/PrePackedAction/AddCommandInterpreter"/>
<XActionItemReference entity="ESBActions101" name="AddLongToDate"/>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
@@ -3170,6 +3186,8 @@
<AttributeData AttributeName="terminal" Mandatory="no"/>
</EntityData>
</XActionItem>
+ <XActionItemReference entity="ESBActions101"
+ name="AddObjectInvoke" path="CreateActions/PrePackedAction/AddObjectInvoke"/>
<XActionItemReference entity="ESBActions101" name="AddObjectToCSVString"/>
<XActionItemReference entity="ESBActions101" name="AddObjectToXStream"/>
<XActionItemReference entity="ESBActions101" name="AddSmooksAction"/>
@@ -3186,45 +3204,22 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItemReference entity="ESBActions101" name="AddCommandInterpreter"/>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="BPM Processor..." kind="action" name="AddBPMProcessor">
- <EntityData EntityName="ESBPreActionBpmProcessor120">
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="command"/>
- <AttributeData AttributeName="process definition name" Mandatory="no"/>
- <AttributeData AttributeName="process definition id" Mandatory="no"/>
- </EntityData>
- </XActionItem>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="EJB Processor..." kind="action" name="AddEJBProcessor">
- <EntityData EntityName="ESBPreActionEJBProcessor120">
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="ejb3" Mandatory="no"/>
- <AttributeData AttributeName="ejb name" Mandatory="no"/>
- <AttributeData AttributeName="jndi name" Mandatory="no"/>
- <AttributeData AttributeName="initial context factory" Mandatory="no"/>
- <AttributeData AttributeName="provider url" Mandatory="no"/>
- <AttributeData AttributeName="method" Mandatory="no"/>
- </EntityData>
- </XActionItem>
- <XActionItem displayName="Scripting" kind="list" name="Scripting">
+ <XActionItem displayName="Miscellaneous" group="1" kind="list" name="Miscellaneous">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Scripting..." kind="action" name="AddScripting">
- <EntityData EntityName="ESBPreActionScripting120">
+ displayName="System Println..." kind="action" name="AddSystemPrintln">
+ <EntityData EntityName="ESBPreActionSystemPrintln101">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="script"/>
+ <AttributeData AttributeName="message"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Groovy Action Processor..." kind="action" name="AddGroovyProcessor">
- <EntityData EntityName="ESBPreActionGroovyProcessor101">
+ displayName="Schema Validation..." kind="action" name="AddSchemaValidation">
+ <EntityData EntityName="ESBPreActionSchemaValidator120">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="script"/>
+ <AttributeData AttributeName="schema"/>
+ <AttributeData AttributeName="schema language" Mandatory="no"/>
</EntityData>
</XActionItem>
</XActionItem>
@@ -3251,24 +3246,32 @@
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Static Router..." kind="action" name="AddStaticRouter">
- <EntityData EntityName="ESBPreActionStaticRouter101">
+ displayName="EMail Router..." kind="action" name="AddEMailRouter">
+ <EntityData EntityName="ESBPreActionEMailRouter120">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="process" Mandatory="no"/>
+ <AttributeData AttributeName="from" Mandatory="no"/>
+ <AttributeData AttributeName="send to" Mandatory="no"/>
+ <AttributeData AttributeName="subject" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Static Wiretap..." kind="action" name="AddStaticWiretap">
- <EntityData EntityName="ESBPreActionStaticWiretap101">
+ displayName="EMail Wiretap..." kind="action" name="AddEMailWiretap">
+ <EntityData EntityName="ESBPreActionEMailWiretap120">
<AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="from" Mandatory="no"/>
+ <AttributeData AttributeName="send to" Mandatory="no"/>
+ <AttributeData AttributeName="subject" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Notifier..." kind="action" name="AddNotifier">
- <EntityData EntityName="ESBPreActionNotifier101">
+ displayName="HTTP Router..." kind="action" name="AddHTTPRouter">
+ <EntityData EntityName="ESBPreActionHTTPRouter120">
<AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="endpoint url" Mandatory="no"/>
+ <AttributeData AttributeName="file" Mandatory="no"/>
+ <AttributeData AttributeName="method"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -3280,32 +3283,24 @@
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="EMail Router..." kind="action" name="AddEMailRouter">
- <EntityData EntityName="ESBPreActionEMailRouter120">
+ displayName="Notifier..." kind="action" name="AddNotifier">
+ <EntityData EntityName="ESBPreActionNotifier101">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="from" Mandatory="no"/>
- <AttributeData AttributeName="send to" Mandatory="no"/>
- <AttributeData AttributeName="subject" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="EMail Wiretap..." kind="action" name="AddEMailWiretap">
- <EntityData EntityName="ESBPreActionEMailWiretap120">
+ displayName="Static Router..." kind="action" name="AddStaticRouter">
+ <EntityData EntityName="ESBPreActionStaticRouter101">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="from" Mandatory="no"/>
- <AttributeData AttributeName="send to" Mandatory="no"/>
- <AttributeData AttributeName="subject" Mandatory="no"/>
+ <AttributeData AttributeName="process" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="HTTP Router..." kind="action" name="AddHTTPRouter">
- <EntityData EntityName="ESBPreActionHTTPRouter120">
+ displayName="Static Wiretap..." kind="action" name="AddStaticWiretap">
+ <EntityData EntityName="ESBPreActionStaticWiretap101">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="endpoint url" Mandatory="no"/>
- <AttributeData AttributeName="file" Mandatory="no"/>
- <AttributeData AttributeName="method"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -3318,9 +3313,42 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem displayName="SOAP" kind="list" name="SOAP">
+ <XActionItem displayName="Scripting" group="1" kind="list" name="Scripting">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Scripting..." kind="action" name="AddScripting">
+ <EntityData EntityName="ESBPreActionScripting120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="script"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Groovy Action Processor..." kind="action" name="AddGroovyProcessor">
+ <EntityData EntityName="ESBPreActionGroovyProcessor101">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="script"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem displayName="Services" group="1" kind="list" name="Services">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="EJB Processor..." kind="action" name="AddEJBProcessor">
+ <EntityData EntityName="ESBPreActionEJBProcessor120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="ejb3" Mandatory="no"/>
+ <AttributeData AttributeName="ejb name" Mandatory="no"/>
+ <AttributeData AttributeName="jndi name" Mandatory="no"/>
+ <AttributeData AttributeName="initial context factory" Mandatory="no"/>
+ <AttributeData AttributeName="provider url" Mandatory="no"/>
+ <AttributeData AttributeName="method" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem displayName="Webservices" group="1" 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"/>
@@ -3356,26 +3384,6 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItemReference entity="ESBActions101" name="AddBusinessRulesProcessor"/>
- <XActionItem displayName="Miscellaneous" group="1" kind="list" name="Miscellaneous">
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="System Println..." kind="action" name="AddSystemPrintln">
- <EntityData EntityName="ESBPreActionSystemPrintln101">
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="message"/>
- </EntityData>
- </XActionItem>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Schema Validation..." kind="action" name="AddSchemaValidation">
- <EntityData EntityName="ESBPreActionSchemaValidator120">
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="schema"/>
- <AttributeData AttributeName="schema language" Mandatory="no"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
</XActionItem>
</XActionItem>
</XActionItem>
15 years, 9 months
JBoss Tools SVN: r19559 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test: dialog and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-12-23 10:54:11 -0500 (Wed, 23 Dec 2009)
New Revision: 19559
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5470, JUnit test for VpeEditAnyDialog was added, not finished yet.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2009-12-23 15:19:18 UTC (rev 19558)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2009-12-23 15:54:11 UTC (rev 19559)
@@ -15,6 +15,7 @@
import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.editor.menu.VpePopupMenuTest;
+import org.jboss.tools.vpe.ui.test.dialog.VpeEditAnyDialogTest;
import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest;
import org.jboss.tools.vpe.ui.test.editor.CustomSashFormTest;
import org.jboss.tools.vpe.ui.test.preferences.VpeEditorPreferencesPageTest;
@@ -34,6 +35,7 @@
suite.addTestSuite(VpeEditorPreferencesPageTest.class);
suite.addTestSuite(CustomSashFormTest.class);
suite.addTestSuite(VpePopupMenuTest.class);
+ suite.addTestSuite(VpeEditAnyDialogTest.class);
/*
* Add projects that will be used in junit tests.
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java 2009-12-23 15:54:11 UTC (rev 19559)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.test.dialog;
+
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.vpe.editor.template.VpeAnyData;
+import org.jboss.tools.vpe.editor.template.VpeEditAnyDialog;
+import org.jboss.tools.vpe.editor.util.Constants;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+public class VpeEditAnyDialogTest extends VpeTest {
+
+ public VpeEditAnyDialogTest(String name) {
+ super(name);
+ }
+
+ public void testVpeEditAnyDialogOpen() throws Throwable {
+ /*
+ * Create empty data
+ */
+ VpeAnyData data = new VpeAnyData(Constants.EMPTY, Constants.EMPTY, Constants.EMPTY);
+ VpeEditAnyDialog dialog = new VpeEditAnyDialog(PlatformUI
+ .getWorkbench().getDisplay().getActiveShell(), data);
+ dialog.setBlockOnOpen(false);
+ int code = dialog.open();
+ /*
+ * Assert that window has been created.
+ */
+ assertEquals(0, code);
+
+ dialog.close();
+
+ /*
+ * Check that the dialog's fields are empty.
+ */
+
+ /*
+ * Check the dialog with filled in data.
+ * Dialog should display all the fields correctly.
+ */
+
+ /*
+ * Test the editing in the dialog if possible.
+ */
+
+ /*
+ * Test dialog validation.
+ */
+
+ }
+
+}
15 years, 9 months
JBoss Tools SVN: r19558 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-12-23 10:19:18 -0500 (Wed, 23 Dec 2009)
New Revision: 19558
Modified:
trunk/jsf/docs/userguide/en/images/visual_page/formatting_bar_icon.png
trunk/jsf/docs/userguide/en/images/visual_page/icon_1.png
trunk/jsf/docs/userguide/en/images/visual_page/icon_2.png
trunk/jsf/docs/userguide/en/images/visual_page/icon_3.png
trunk/jsf/docs/userguide/en/images/visual_page/show_border_button.png
trunk/jsf/docs/userguide/en/images/visual_page/show_bundles_mess_button.png
trunk/jsf/docs/userguide/en/images/visual_page/show_nonvisual.png
trunk/jsf/docs/userguide/en/images/visual_page/show_selection_bar.png
trunk/jsf/docs/userguide/en/images/visual_page/source_top.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_1.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_12.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_14.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_15.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_2.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23a.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23b.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_24.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_25.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_3.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4b.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4d.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4e.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_5.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7a.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
Log:
https://jira.jboss.org/jira/browse/JBDS-932
https://jira.jboss.org/jira/browse/JBDS-980
Modified: trunk/jsf/docs/userguide/en/images/visual_page/formatting_bar_icon.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/icon_1.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/icon_2.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/icon_3.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/show_border_button.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/show_bundles_mess_button.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/show_nonvisual.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/show_selection_bar.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/source_top.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_1.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_12.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_14.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_15.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_2.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23b.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_24.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_25.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_3.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4b.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4d.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4e.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_5.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
===================================================================
(Binary files differ)
15 years, 9 months