[savara-commits] savara SVN: r200 - in tools/eclipse/trunk/plugins: org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Mar 18 19:14:38 EDT 2010
Author: objectiser
Date: 2010-03-18 19:14:37 -0400 (Thu, 18 Mar 2010)
New Revision: 200
Modified:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/editor/BPELEditorManager.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElement.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Receive.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Sequence.java
tools/eclipse/trunk/plugins/org.scribble.conversation.comparator/META-INF/MANIFEST.MF
tools/eclipse/trunk/plugins/org.scribble.conversation.parser/META-INF/MANIFEST.MF
Log:
Added initial ability to focus on 'receive' tasks within sequence. Also removed remaining links to protocol based definitions.
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/editor/BPELEditorManager.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/editor/BPELEditorManager.java 2010-03-17 19:33:58 UTC (rev 199)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/editor/BPELEditorManager.java 2010-03-18 23:14:37 UTC (rev 200)
@@ -19,6 +19,7 @@
//import org.eclipse.emf.ecore.EValidator;
import org.jboss.savara.tools.bpel.model.BPELNotation;
+import org.jboss.savara.tools.bpel.model.component.BPELElement;
import org.scribble.extensions.RegistryInfo;
import org.scribble.model.ModelReference;
import org.scribble.model.SourceRef;
@@ -95,9 +96,23 @@
*/
@Override
public void enrich(ModelIssue issue) {
+ String uri=issue.getModelObject().getSource().getComponentURI();
+ issue.getProperties().put("address.model", uri);
+
+ /*
+ if (issue.getModelObject() instanceof BPELElement) {
+ String uri=((BPELElement)issue.getModelObject()).getURI();
+
+ if (uri != null) {
+ issue.getProperties().put("address.model", uri);
+ }
+ }
+ */
+
// Set the EMF URI attribute
//issue.getProperties().put(EValidator.URI_ATTRIBUTE, "//@activity/@activities.0");
+ //issue.getProperties().put("address.model", "//@activity/@activities.0");
// issue.getModelObject().getSource().getComponentURI());
}
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElement.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElement.java 2010-03-17 19:33:58 UTC (rev 199)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElement.java 2010-03-18 23:14:37 UTC (rev 200)
@@ -297,6 +297,85 @@
public abstract void convert(java.util.List<Activity> activities,
ConversionContext context);
+ /**
+ * This method returns the URI fragment to the activity within the
+ * BPEL model.
+ *
+ * @return The URI
+ */
+ public String getURI() {
+ String ret="";
+
+ BPELElement parent=null;
+
+ if (getParent() != null) {
+ if (getParent() instanceof BPELElement) {
+ parent = (BPELElement)getParent();
+ }
+ } else if (getDOMElement().getParentNode() instanceof org.w3c.dom.Element) {
+ parent = BPELElementFactory.createBPELElement(getModel(),
+ (org.w3c.dom.Element)getDOMElement().getParentNode());
+ }
+
+ if (parent != null) {
+ ret = parent.getParentURI(this);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method recursively builds up the URI using the local URI
+ * parts for each BPEL element up to the root node.
+ *
+ * @param elem The child element
+ * @return The URI for the parent element
+ */
+ protected String getParentURI(BPELElement elem) {
+ String ret="";
+
+ BPELElement parent=null;
+
+ if (getParent() != null) {
+ if (getParent() instanceof BPELElement) {
+ parent = (BPELElement)getParent();
+ }
+ } else if (elem.getDOMElement().getParentNode() instanceof org.w3c.dom.Element) {
+ parent = BPELElementFactory.createBPELElement(getModel(),
+ (org.w3c.dom.Element)getDOMElement().getParentNode());
+ }
+
+ if (parent != null) {
+ ret = parent.getParentURI(this)+"/"+getLocalURIPart(elem);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the URI part associated with the supplied child element.
+ *
+ * @param elem The child element
+ * @return The URI part
+ */
+ protected String getLocalURIPart(BPELElement elem) {
+ return("");
+ }
+
+ public int hashCode() {
+ return(m_element.hashCode());
+ }
+
+ public boolean equals(Object obj) {
+ boolean ret=false;
+
+ if (obj instanceof BPELElement) {
+ ret = m_element.equals(((BPELElement)obj).getDOMElement());
+ }
+
+ return(ret);
+ }
+
private static Log logger = LogFactory.getLog(BPELElement.class);
private BPELLanguageModel m_model=null;
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java 2010-03-17 19:33:58 UTC (rev 199)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java 2010-03-18 23:14:37 UTC (rev 200)
@@ -867,6 +867,16 @@
return(ret);
}
+ protected String getParentURI(BPELElement elem) {
+ String ret="//";
+
+ if (elem instanceof BPELActivity) {
+ ret += "@activity";
+ }
+
+ return(ret);
+ }
+
private static Log logger = LogFactory.getLog(Process.class);
private org.w3c.dom.Element m_partnerLinksElem=null;
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Receive.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Receive.java 2010-03-17 19:33:58 UTC (rev 199)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Receive.java 2010-03-18 23:14:37 UTC (rev 200)
@@ -130,6 +130,8 @@
*/
protected void convertActivity(java.util.List<Activity> activities,
ConversionContext context) {
+ getSource().setComponentURI(getURI());
+
ConversationInteraction interaction=new ConversationInteraction();
interaction.derivedFrom(this);
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Sequence.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Sequence.java 2010-03-17 19:33:58 UTC (rev 199)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Sequence.java 2010-03-18 23:14:37 UTC (rev 200)
@@ -144,6 +144,11 @@
}
}
+ protected String getLocalURIPart(BPELElement elem) {
+ int pos=getActivities().indexOf(elem);
+ return("@activities."+pos);
+ }
+
private java.util.List<BPELActivity> m_activities=
new java.util.Vector<BPELActivity>();
}
Modified: tools/eclipse/trunk/plugins/org.scribble.conversation.comparator/META-INF/MANIFEST.MF
===================================================================
--- tools/eclipse/trunk/plugins/org.scribble.conversation.comparator/META-INF/MANIFEST.MF 2010-03-17 19:33:58 UTC (rev 199)
+++ tools/eclipse/trunk/plugins/org.scribble.conversation.comparator/META-INF/MANIFEST.MF 2010-03-18 23:14:37 UTC (rev 200)
@@ -13,23 +13,14 @@
org.junit;resolution:=optional
Bundle-ActivationPolicy: lazy
Scribble-Extensions: org.scribble.conversation.comparator.ConversationComparatorRule,
- org.scribble.conversation.comparator.ConversationModelProtocolModelComparatorRule,
- org.scribble.conversation.comparator.IfChoiceComparatorRule,
org.scribble.conversation.comparator.IfComparatorRule,
org.scribble.conversation.comparator.ConditionalBlockComparatorRule,
org.scribble.conversation.comparator.ParallelComparatorRule,
- org.scribble.conversation.comparator.ParallelProtocolParallelComparatorRule,
org.scribble.conversation.comparator.SpawnComparatorRule,
- org.scribble.conversation.comparator.SpawnProtocolSpawnComparatorRule,
org.scribble.conversation.comparator.TryEscapeComparatorRule,
org.scribble.conversation.comparator.InterruptBlockComparatorRule,
org.scribble.conversation.comparator.CatchBlockComparatorRule,
- org.scribble.conversation.comparator.TryEscapeProtocolComparatorRule,
- org.scribble.conversation.comparator.InterruptBlockProtocolComparatorRule,
- org.scribble.conversation.comparator.CatchBlockProtocolComparatorRule,
org.scribble.conversation.comparator.RaiseComparatorRule,
- org.scribble.conversation.comparator.RaiseProtocolComparatorRule,
- org.scribble.conversation.comparator.WhenChoiceComparatorRule,
org.scribble.conversation.comparator.WhenComparatorRule,
org.scribble.conversation.comparator.WhileComparatorRule,
org.scribble.conversation.comparator.model.transform.ConversationStatelessTransformationRule,
Modified: tools/eclipse/trunk/plugins/org.scribble.conversation.parser/META-INF/MANIFEST.MF
===================================================================
--- tools/eclipse/trunk/plugins/org.scribble.conversation.parser/META-INF/MANIFEST.MF 2010-03-17 19:33:58 UTC (rev 199)
+++ tools/eclipse/trunk/plugins/org.scribble.conversation.parser/META-INF/MANIFEST.MF 2010-03-18 23:14:37 UTC (rev 200)
@@ -12,7 +12,6 @@
Scribble-Extensions: org.scribble.conversation.parser.ConversationKeyWordProvider,
org.scribble.conversation.parser.ConversationParserRule,
org.scribble.conversation.parser.ConversationReferenceParserRule,
- org.scribble.conversation.parser.ProtocolImplementsReferenceParserRule,
org.scribble.conversation.parser.ConversationInteractionParserRule,
org.scribble.conversation.parser.IfParserRule,
org.scribble.conversation.parser.WhenParserRule,
More information about the savara-commits
mailing list